[oe-commits] org.oe.dev merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Mar 3 22:50:14 UTC 2008
merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'
and '728bbddd3caaaeb9c83d85b9eb213042e12070bb'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: fe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce
ViewMTN: http://monotone.openembedded.org/revision/info/fe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce
Files:
1
packages/klibc/klibc-utils-fstype_1.1.1.bb
packages/klibc/klibc-utils-fstype-static_1.1.1.bb
packages/python/python-pyode
packages/ode/files/install.patch
packages/python/python-pyode/install.patch
packages/gsm/files/gsmd
packages/images/initramfs-bootmenu-image.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/linux/linux-hackndev-2.6_git.bb
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/ode/ode_0.9.bb
packages/ukeyboard
packages/maemo4/hildon-control-panel_2.0.1.bb
packages/ukeyboard/ukeyboard_1.2.bb
Diffs:
#
# mt diff -r242a466ed405559b9394dbf1b3a8678ba25cf86f -rfe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce
#
#
#
# rename "packages/klibc/klibc-utils-fstype_1.1.1.bb"
# to "packages/klibc/klibc-utils-fstype-static_1.1.1.bb"
#
# add_dir "packages/python/python-pyode"
#
# add_file "packages/ode/files/install.patch"
# content [4f38131e748d12735fd8e0ff2584b29849042043]
#
# add_file "packages/python/python-pyode/install.patch"
# content [48652407b71e015af38e2aa3188e7b94ea0d4476]
#
# patch "packages/gsm/files/gsmd"
# from [7f2f07eee1fb5bb619f6b15e537a70b9ba9c8107]
# to [a69e07c69d9829380159b5196cda1f68221a0f1a]
#
# patch "packages/images/initramfs-bootmenu-image.bb"
# from [38ef36eabeee024e8db27348adc48b175a697764]
# to [4053cc6f61cb414749eb9f5ec9f956af0718fd07]
#
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
# from [ed86798f2ad4cb2713e525c7939d02a161e7465a]
# to [27d39223d054aa99a8841d826eb7ca36685347e2]
#
# patch "packages/linux/linux-hackndev-2.6_git.bb"
# from [0efc887915e68753331c63d6ebe5327163f232d4]
# to [64dc1851d5ce9033729f0f42a60d0fd078db1f7e]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [b7a768d6bfd621b3a76b6f638707ea8a6dd5fec9]
# to [319b768a94bcc0a36290ba995d6ed819cff470fd]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [3889ec5d5287ff88902fa3d5cc7a4c87cdfde3c7]
# to [990246037c7f5a834e1563e53eb572f4331d7b43]
#
# 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/python/python-pyode/install.patch 48652407b71e015af38e2aa3188e7b94ea0d4476
+++ packages/python/python-pyode/install.patch 48652407b71e015af38e2aa3188e7b94ea0d4476
@@ -0,0 +1,16 @@
+Index: PyODE-1.2.0/setup.py
+===================================================================
+--- PyODE-1.2.0.orig/setup.py
++++ PyODE-1.2.0/setup.py
+@@ -39,11 +39,6 @@ if sys.platform=="win32":
+ # Linux (and other) specific settings
+ ######################################################################
+ else:
+-
+- for base in ["/usr", "/usr/local", "/opt/local"]:
+- INC_DIRS += [os.path.join(base, "include")]
+- LIB_DIRS += [os.path.join(base, "lib")]
+-
+ LIBS += ["ode", "stdc++"]
+
+
============================================================
--- 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/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
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb ed86798f2ad4cb2713e525c7939d02a161e7465a
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb 27d39223d054aa99a8841d826eb7ca36685347e2
@@ -1,7 +1,7 @@ SRC_URI = "file://30-bootmenu.sh"
SRC_URI = "file://30-bootmenu.sh"
-PR = "r11"
+PR = "r12"
DESCRIPTION = "An initramfs module with UI for selection of boot device."
-RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
+RDEPENDS = "klibc-utils-fstype-static initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
# For VFAT mounting.
RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1"
============================================================
--- packages/linux/linux-hackndev-2.6_git.bb 0efc887915e68753331c63d6ebe5327163f232d4
+++ packages/linux/linux-hackndev-2.6_git.bb 64dc1851d5ce9033729f0f42a60d0fd078db1f7e
@@ -1,12 +1,12 @@ LICENSE = "GPL"
DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
HOMEPAGE = "http://www.hackndev.com/"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
COMPATIBLE_MACHINE = "(palmld|palmtc|palmtt3|palmtt5|palmtx|palmz31|palmz72|palmt650)"
-SRC_URI = "git://git.hackndev.com/git/linux-hnd;protocol=git \
+SRC_URI = "git://git.hackndev.com/linux-hnd;protocol=git \
file://defconfig"
SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \
============================================================
--- packages/linux/linux-handhelds-2.6.inc b7a768d6bfd621b3a76b6f638707ea8a6dd5fec9
+++ packages/linux/linux-handhelds-2.6.inc 319b768a94bcc0a36290ba995d6ed819cff470fd
@@ -67,12 +67,17 @@ do_deploy() {
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
-
+ tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
+
#reflash.ctl is required to reflash using bootldr
# format:
# name file md5sumfile destination
echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
gen_haret_startup
+
+ if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
+ cp ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-$(basename ${KERNEL_INITRAMFS_PATH} | awk -F. '{print $1}')-${PV}-${PR}-${MACHINE}.bin
+ fi
}
do_deploy[dirs] = "${S}"
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 3889ec5d5287ff88902fa3d5cc7a4c87cdfde3c7
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 990246037c7f5a834e1563e53eb572f4331d7b43
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
DEFAULT_PREFERENCE = "-1"
============================================================
--- 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 -r728bbddd3caaaeb9c83d85b9eb213042e12070bb -rfe8b28a7f3024d34b8b9f58aa0fd46de16f7d5ce
#
#
#
# add_dir "packages/ukeyboard"
#
# add_file "packages/maemo4/hildon-control-panel_2.0.1.bb"
# content [c2572281931a66acc90d4b4c3c3212fdd1737139]
#
# add_file "packages/ukeyboard/ukeyboard_1.2.bb"
# content [ab17c5b3a026da8529eb94196385eebddf5be60b]
#
============================================================
--- packages/maemo4/hildon-control-panel_2.0.1.bb c2572281931a66acc90d4b4c3c3212fdd1737139
+++ packages/maemo4/hildon-control-panel_2.0.1.bb c2572281931a66acc90d4b4c3c3212fdd1737139
@@ -0,0 +1,20 @@
+LICENSE = "GPL"
+
+DEPENDS = "libosso libhildon gnome-vfs libhildonhelp"
+
+SRC_URI = "http://repository.maemo.org/pool/os2008/free/source/h/hildon-control-panel/hildon-control-panel_2.0.1-1.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/dbus-1.0 ${datadir}/applications"
+
+do_stage() {
+ autotools_stage_all
+}
+
+# pkg-config file will get broken after pkgconfig.bbclass work
+#
+# This code will fix it
+#
+# sed -i -e 's:${STAGING_LIBDIR}/hildon:${libdir}/hildon:g' -e 's:${STAGING_DATADIR}/applications/hildon:${datadir}/applications/hildon:g' ${PKG_CONFIG_DIR}/hildon-control-panel.pc
+#
============================================================
--- packages/ukeyboard/ukeyboard_1.2.bb ab17c5b3a026da8529eb94196385eebddf5be60b
+++ packages/ukeyboard/ukeyboard_1.2.bb ab17c5b3a026da8529eb94196385eebddf5be60b
@@ -0,0 +1,14 @@
+DESCRIPTION = "Additional keyboard layouts for Nokia N800/N810"
+SECTION = "user/other"
+DEPENDS = "gtk+ libosso gconf hildon-control-panel"
+
+SRC_URI = "http://upir.cz/maemo/dists/chinook/main/source/ukeyboard_${PV}.tar.gz "
+
+do_install() {
+ oe_runmake install DESTDIR=${D}
+}
+
+FILES_${PN} += "${datadir}/X11/xkb \
+ ${datadir}/scv_layouts \
+ ${libdir}/hildon-control-panel/libukeyboard-prefs.so"
+FILES_${PN}-dbg += "${libdir}/hildon-control-panel/.debug/"
More information about the Openembedded-commits
mailing list