Merge pull request #2 from eric-ch/oe-upgrade-pyro

OXT-880: OE upgrade to pyro
OpenXT · Mar 27, 2018 · 760f5b3 · 760f5b3
2 parents f7fd2c0 + 812059d
commit 760f5b3
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 283 deletions.
diff --git a/libicbinn/Makefile.am b/libicbinn/Makefile.am
@@ -33,21 +33,13 @@ SUBDIRS=. rpc src server client test
 
 BUILT_SOURCES=version.h
 
-bin_SCRIPTS = libicbinn-config 
-
 pkgconfigdir=${libdir}/pkgconfig
 pkgconfig_DATA= libicbinn.pc 
 
 libicbinn.pc.src:libicbinn.pc.src.in
-libicbinn.pc:libicbinn.pc.src
+libicbinn.pc:libicbinn.pc.src version.sed
 	@SED@ -f version.sed < libicbinn.pc.src > libicbinn.pc || rm -f libicbinn.pc
 
-
-libicbinn-config.src:libicbinn-config.src.in
-libicbinn-config:libicbinn-config.src version.sed
-	@SED@ -f version.sed < libicbinn-config.src > libicbinn-config || rm -f libicbinn-config
-	chmod +x $@
-
 VNUM=${shell git rev-parse HEAD}
 
 do_test: all

diff --git a/libicbinn/configure.in b/libicbinn/configure.in
@@ -152,7 +152,5 @@ AC_OUTPUT([Makefile
 	rpc/Makefile
 	server/Makefile
 	client/Makefile
-	libicbinn.pc.src
-	libicbinn-config.src],
-	[chmod +x libicbinn-config.src])
+	libicbinn.pc.src])
 
diff --git a/libicbinn/libicbinn-config.src.in b/libicbinn/libicbinn-config.src.in
diff --git a/libicbinn/libicbinn.pc.src.in b/libicbinn/libicbinn.pc.src.in
@@ -8,4 +8,4 @@ Description: libicbinn
 Requires: 
 Version: %VERSION%
 Libs: -L${libdir} -licbinn @LIBTIRPC_LIBS@ @LIBV4V_LIBS@ -ldl
-Cflags: -I${includedir} @LIBV4V_CFLAGS@ @LIBTIRPC_CFLAGS@ 
+Cflags: -I${includedir}
diff --git a/libicbinn/rpc/xdr_fixup.c b/libicbinn/rpc/xdr_fixup.c
diff --git a/libicbinn/server/Makefile.am b/libicbinn/server/Makefile.am
@@ -38,7 +38,7 @@ endif
 
 DBUS_CLIENT_H=${DBUS_CLIENT_IDLS:%=%_client.h}
 
-PROTOSRCS = server.c svc_main.c util.c dbusrpc.c version.c ../rpc/icbinn_prot_svc.c ../rpc/icbinn_prot_xdr.c ../rpc/xdr_fixup.c
+PROTOSRCS = server.c svc_main.c util.c dbusrpc.c version.c ../rpc/icbinn_prot_svc.c ../rpc/icbinn_prot_xdr.c
 
 bin_PROGRAMS = icbinn_svc 
 

diff --git a/libicbinn/server/prototypes.h b/libicbinn/server/prototypes.h
@@ -68,6 +68,3 @@ bool_t xdr_icbinn_prot_ftruncateargs(XDR *xdrs, icbinn_prot_ftruncateargs *objp)
 bool_t xdr_icbinn_prot_randargs(XDR *xdrs, icbinn_prot_randargs *objp);
 bool_t xdr_icbinn_prot_randokres(XDR *xdrs, icbinn_prot_randokres *objp);
 bool_t xdr_icbinn_prot_randres(XDR *xdrs, icbinn_prot_randres *objp);
-/* ../rpc/xdr_fixup.c */
-bool_t xdr_quad_t(XDR *x, quad_t *q);
-bool_t xdr_u_quad_t(XDR *x, u_quad_t *q);
diff --git a/libicbinn/src/Makefile.am b/libicbinn/src/Makefile.am
@@ -35,7 +35,7 @@ LIBV4V_LIBS_NO_DL=${LIBV4V_LIBS:-ldl=}
 
 PROTOSRCS=client.c close.c lock.c mkdir.c null.c open.c pread.c pwrite.c readdir.c rename.c rmdir.c stat.c unlink.c util.c version.c ftruncate.c fallocate.c rand.c readlink.c symlink.c statfs.c fsync.c canary.c
 
-ICBINNSRCS=../rpc/icbinn_prot_clnt.c ../rpc/icbinn_prot_xdr.c  ${PROTOSRCS} ../rpc/xdr_fixup.c
+ICBINNSRCS=../rpc/icbinn_prot_clnt.c ../rpc/icbinn_prot_xdr.c  ${PROTOSRCS}
 
 noinst_HEADERS=project.h prototypes.h icbinn-tail.h ext_prototypes.h 
 

diff --git a/libicbinn_resolved/Makefile.am b/libicbinn_resolved/Makefile.am
@@ -31,21 +31,13 @@
 SUBDIRS=. src
 BUILT_SOURCES=version.h
 
-bin_SCRIPTS = libicbinn_resolved-config 
-
 pkgconfigdir=${libdir}/pkgconfig
 pkgconfig_DATA= libicbinn_resolved.pc 
 
 libicbinn_resolved.pc.src:libicbinn_resolved.pc.src.in
-libicbinn_resolved.pc:libicbinn_resolved.pc.src
+libicbinn_resolved.pc:libicbinn_resolved.pc.src version.sed
 	@SED@ -f version.sed < libicbinn_resolved.pc.src > libicbinn_resolved.pc || rm -f libicbinn_resolved.pc
 
-
-libicbinn_resolved-config.src:libicbinn_resolved-config.src.in
-libicbinn_resolved-config:libicbinn_resolved-config.src version.sed
-	@SED@ -f version.sed < libicbinn_resolved-config.src > libicbinn_resolved-config || rm -f libicbinn_resolved-config
-	chmod +x $@
-
 VNUM=${shell git rev-parse HEAD}
 
 version.sed: never-happy

diff --git a/libicbinn_resolved/configure.in b/libicbinn_resolved/configure.in
@@ -104,7 +104,5 @@ AC_SUBST(RPCGEN_TEMPLATES)
 
 AC_OUTPUT([Makefile 
 	src/Makefile 
-	libicbinn_resolved.pc.src
-	libicbinn_resolved-config.src],
-	[chmod +x libicbinn_resolved-config.src])
+	libicbinn_resolved.pc.src])
 
diff --git a/libicbinn_resolved/libicbinn_resolved-config.src.in b/libicbinn_resolved/libicbinn_resolved-config.src.in
diff --git a/libicbinn_resolved/libicbinn_resolved.pc.src.in b/libicbinn_resolved/libicbinn_resolved.pc.src.in
@@ -8,4 +8,4 @@ Description: libicbinn_resolved
 Requires: 
 Version: %VERSION%
 Libs: -L${libdir} -licbinn_resolved -ldl
-Cflags: -I${includedir} @LIBICBINN_CFLAGS@ 
+Cflags: -I${includedir}