[oe-commits] org.oe.dev merge of '45bb832d6d0ed21a2ec91685ceb9dd7f847010bd'

[mickeyl commit]

merge of '45bb832d6d0ed21a2ec91685ceb9dd7f847010bd'
     and 'fbe4ca1964daebea4d7ba83733214f1cfa937b5b'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7e16199d85a13b01bf285fe540d9da9f69dd4237
ViewMTN: http://monotone.openembedded.org/revision/info/7e16199d85a13b01bf285fe540d9da9f69dd4237
Files:
1
packages/ode/files/install.patch
packages/gsm/files/gsmd
packages/ode/ode_0.9.bb
packages/images/initramfs-bootmenu-image.bb
Diffs:

#
# mt diff -r45bb832d6d0ed21a2ec91685ceb9dd7f847010bd -r7e16199d85a13b01bf285fe540d9da9f69dd4237
#
# 
# 
# add_file "packages/ode/files/install.patch"
#  content [4f38131e748d12735fd8e0ff2584b29849042043]
# 
# patch "packages/gsm/files/gsmd"
#  from [7f2f07eee1fb5bb619f6b15e537a70b9ba9c8107]
#    to [a69e07c69d9829380159b5196cda1f68221a0f1a]
# 
# patch "packages/ode/ode_0.9.bb"
#  from [c374097c73abc403e4ef197689b6a674215f8b17]
#    to [3a094e3149860cac66dec360e6c33d34417198f5]
# 
============================================================
--- packages/ode/files/install.patch	4f38131e748d12735fd8e0ff2584b29849042043
+++ packages/ode/files/install.patch	4f38131e748d12735fd8e0ff2584b29849042043
@@ -0,0 +1,22 @@
+Index: ode-0.9/Makefile.am
+===================================================================
+--- ode-0.9.orig/Makefile.am
++++ ode-0.9/Makefile.am
+@@ -25,13 +25,13 @@ dist-zip: ${PACKAGE}-${VERSION}.tar.gz
+ 
+ if USE_SONAME
+ install-exec-hook:
+-	ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+ 	$(libdir)/libode.so
+-	ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+ 	$(libdir)/@ODE_SONAME@
+-	ln -s $(libdir)/@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
++	ln -sf ./@ODE_SONAME at .@ODE_REVISION at .@ODE_AGE@ \
+ 	$(libdir)/@ODE_SONAME at .@ODE_REVISION@
+-	/sbin/ldconfig
++	echo /sbin/ldconfig
+ else
+ install-exec-hook:
+ endif
============================================================
--- packages/gsm/files/gsmd	7f2f07eee1fb5bb619f6b15e537a70b9ba9c8107
+++ packages/gsm/files/gsmd	a69e07c69d9829380159b5196cda1f68221a0f1a
@@ -20,7 +20,7 @@ case "$1" in
         [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
 
         echo -n "Starting GSM daemon: "
-        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -d -l syslog
 
         if [ $? = 0 ]; then
             echo "gsmd."
============================================================
--- packages/ode/ode_0.9.bb	c374097c73abc403e4ef197689b6a674215f8b17
+++ packages/ode/ode_0.9.bb	3a094e3149860cac66dec360e6c33d34417198f5
@@ -5,26 +5,30 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/opende/
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-src-${PV}.zip \
-           file://config.h"
+           file://install.patch;patch=1"
 
-inherit autotools
+inherit autotools binconfig
 
-#do_configure() {
-#	touch configurator.exe
-#	chmod a+rx configurator.exe
-#	install -m 0644 ${WORKDIR}/config.h include/ode/
-#}
+EXTRA_OECONF = "--disable-demos --enable-soname"
 
-#do_compile() {
-#	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" RANLIB="${RANLIB}" AR="${AR} qf " ode-lib
-#}
+do_configure_append() {
+	echo "#define dInfinity DBL_MAX" >>include/ode/config.h
+}
 
-#do_stage() {
-#	install -d ${STAGING_INCDIR}/ode/
-#	install -m 0644 include/ode/*.h ${STAGING_INCDIR}/ode/
-#	oe_libinstall -C lib -a libode ${STAGING_LIBDIR}
-#}
+do_stage() {
+	oe_runmake install \
+		bindir=${STAGING_BINDIR_CROSS} \
+		libdir=${STAGING_LIBDIR} \
+		includedir=${STAGING_INCDIR} \
+		datadir=${STAGING_DATADIR}
+}
 
+do_install() {
+	oe_runmake install \
+		bindir=${D}${bindir} \
+		libdir=${D}${libdir} \
+		includedir=${D}${incdir} \
+		datadir=${D}${datadir}
+}
+
+FILES_${PN} = "${libdir}/lib*.so*"
-#do_install() {
-#	:
-#}


#
# mt diff -rfbe4ca1964daebea4d7ba83733214f1cfa937b5b -r7e16199d85a13b01bf285fe540d9da9f69dd4237
#
# 
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [38ef36eabeee024e8db27348adc48b175a697764]
#    to [4053cc6f61cb414749eb9f5ec9f956af0718fd07]
# 
============================================================
--- packages/images/initramfs-bootmenu-image.bb	38ef36eabeee024e8db27348adc48b175a697764
+++ packages/images/initramfs-bootmenu-image.bb	4053cc6f61cb414749eb9f5ec9f956af0718fd07
@@ -1,12 +1,15 @@ IMAGE_LINGUAS = ""
 # initramfs image with interactive boot menu allowing to select rootfs location
 # from choices of block devices, loopback images and NFS.
 
 IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot"
 IMAGE_LINGUAS = ""
 
+
 # Remove any kernel-image that the kernel-module-* packages may have pulled in.
 PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
 ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
                                 remove ${PACKAGE_REMOVE};"
 
+IMAGE_FSTYPES += " cpio.gz "
+
 inherit image