From 81c2c012c6672d58309033e0e6fa03cb9abb45d8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 1 Mar 2008 23:57:59 +0000 Subject: klibc-utils-fstype 1.1.1: Rename to klibc-utils-fstype-static. * Dirty rename games until we'll have klibc-utils buildable and working. --- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 4 ++-- packages/klibc/klibc-utils-fstype-static_1.1.1.bb | 14 ++++++++++++++ packages/klibc/klibc-utils-fstype_1.1.1.bb | 14 -------------- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 packages/klibc/klibc-utils-fstype-static_1.1.1.bb delete mode 100644 packages/klibc/klibc-utils-fstype_1.1.1.bb diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 8c66521f30..02d696aa2e 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,7 +1,7 @@ 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" diff --git a/packages/klibc/klibc-utils-fstype-static_1.1.1.bb b/packages/klibc/klibc-utils-fstype-static_1.1.1.bb new file mode 100644 index 0000000000..2bcc0f6085 --- /dev/null +++ b/packages/klibc/klibc-utils-fstype-static_1.1.1.bb @@ -0,0 +1,14 @@ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" +SRC_URI += "file://fstype-sane-and-vfat-jffs2.patch;patch=1" +PR = "r1" + +S = "${WORKDIR}/klibc-${PV}" + +do_compile() { + ${CC} -o fstype utils/fstype.c -static +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 fstype ${D}${bindir}/ +} diff --git a/packages/klibc/klibc-utils-fstype_1.1.1.bb b/packages/klibc/klibc-utils-fstype_1.1.1.bb deleted file mode 100644 index 2bcc0f6085..0000000000 --- a/packages/klibc/klibc-utils-fstype_1.1.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2" -SRC_URI += "file://fstype-sane-and-vfat-jffs2.patch;patch=1" -PR = "r1" - -S = "${WORKDIR}/klibc-${PV}" - -do_compile() { - ${CC} -o fstype utils/fstype.c -static -} - -do_install () { - install -d ${D}${bindir} - install -m 0755 fstype ${D}${bindir}/ -} -- cgit v1.2.3 From fd03b5166557844135feef144c2d78470f71f7e6 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Mon, 3 Mar 2008 11:18:58 +0000 Subject: linux-hackndev: Changed repo location. Should fix kernel fetch bugs. --- packages/linux/linux-hackndev-2.6_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb index 2d2a37f716..7fdf94f3ac 100644 --- a/packages/linux/linux-hackndev-2.6_git.bb +++ b/packages/linux/linux-hackndev-2.6_git.bb @@ -2,11 +2,11 @@ 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 \ -- cgit v1.2.3 From 97dc4e52619da90ed223801527847b843e55c5cc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Mar 2008 12:30:27 +0000 Subject: initramfs-bootmenu-image: add cpio.gz forcefully to IMAGE_FSTYPES --- packages/images/initramfs-bootmenu-image.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb index 6a4974fa9d..dd4f4d8ef6 100644 --- a/packages/images/initramfs-bootmenu-image.bb +++ b/packages/images/initramfs-bootmenu-image.bb @@ -4,9 +4,12 @@ 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 -- cgit v1.2.3 From da9e9fc5a8680a831b5bbcb6370946e984cbbf4f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Mar 2008 13:12:32 +0000 Subject: ode 0.9 fix install.patch --- packages/ode/files/install.patch | 22 ++++++++++++++++++++++ packages/ode/ode_0.9.bb | 40 ++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 packages/ode/files/install.patch diff --git a/packages/ode/files/install.patch b/packages/ode/files/install.patch new file mode 100644 index 0000000000..d63229f8ec --- /dev/null +++ b/packages/ode/files/install.patch @@ -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@.@ODE_REVISION@.@ODE_AGE@ \ ++ ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ + $(libdir)/libode.so +- ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ ++ ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ + $(libdir)/@ODE_SONAME@ +- ln -s $(libdir)/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ ++ ln -sf ./@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \ + $(libdir)/@ODE_SONAME@.@ODE_REVISION@ +- /sbin/ldconfig ++ echo /sbin/ldconfig + else + install-exec-hook: + endif diff --git a/packages/ode/ode_0.9.bb b/packages/ode/ode_0.9.bb index 9055681a36..31eed3b884 100644 --- a/packages/ode/ode_0.9.bb +++ b/packages/ode/ode_0.9.bb @@ -5,26 +5,30 @@ LICENSE = "LGPL" 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() { -# : -#} +do_install() { + oe_runmake install \ + bindir=${D}${bindir} \ + libdir=${D}${libdir} \ + includedir=${D}${incdir} \ + datadir=${D}${datadir} +} + +FILES_${PN} = "${libdir}/lib*.so*" -- cgit v1.2.3 From d7db9fd89a49a92f2fceab4ac24ee2f047ebe86b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Mar 2008 13:14:51 +0000 Subject: gsmd svn log to syslog --- packages/gsm/files/gsmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index fadae76aee..31dbd34caf 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -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." -- cgit v1.2.3 From 0b3c10f1622bdecbb67801fef89ad4081d840205 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 3 Mar 2008 13:21:24 +0000 Subject: python-pyode 1.2.0 needs an install.patch --- packages/python/python-pyode/.mtn2git_empty | 0 packages/python/python-pyode/install.patch | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/python/python-pyode/.mtn2git_empty create mode 100644 packages/python/python-pyode/install.patch diff --git a/packages/python/python-pyode/.mtn2git_empty b/packages/python/python-pyode/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-pyode/install.patch b/packages/python/python-pyode/install.patch new file mode 100644 index 0000000000..6f230972c7 --- /dev/null +++ b/packages/python/python-pyode/install.patch @@ -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++"] + + -- cgit v1.2.3 From 2585b92eee7b07381c45cc8fcb37eb2440663bda Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Mar 2008 13:50:56 +0000 Subject: linux-handhelds: deploy tweaks: * copy zImage to zImage- to allow changing of INITRAMFS_PATH * make a modules.tgz tarball --- packages/linux/linux-handhelds-2.6.inc | 7 ++++++- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index c6bb6bae69..3bd9f78ea2 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -67,12 +67,17 @@ do_compile_prepend() { 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}" diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 8e3ab4d06d..066c17faed 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ 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" -- cgit v1.2.3