merge of '1e83baccab5ff8f9286b326ca23932f59ccea5b0'
and '50f929f94594bd46c5cccc70110c1de0e52a0ee4'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7dcfdc2af0ae972634d8a71244289786c34a446b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7dcfdc2af0ae972634d8a71244289786c34a446b
Files:
1
packages/gpsd/gpsd.inc
packages/apex/apex-env_1.5.8.bb
classes/nslu2-image.bbclass
classes/rm_work.bbclass
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/meta/slugos-packages.bb
Diffs:
#
# mt diff -r1e83baccab5ff8f9286b326ca23932f59ccea5b0 -r7dcfdc2af0ae972634d8a71244289786c34a446b
#
#
#
# patch "packages/gpsd/gpsd.inc"
# from [bf39dceefc04642d65caefe9f5ad7660f44eb04a]
# to [6ccdc1d0e17c682348f2cf4bf46c24536c69178d]
#
============================================================
--- packages/gpsd/gpsd.inc bf39dceefc04642d65caefe9f5ad7660f44eb04a
+++ packages/gpsd/gpsd.inc 6ccdc1d0e17c682348f2cf4bf46c24536c69178d
@@ -7,7 +7,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
--x-libraries=${STAGING_LIBDIR} \
--enable-dbus \
- --disable-python"
+ --enable-python"
SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
file://gpsd-default \
@@ -23,6 +23,7 @@ do_compile_prepend() {
do_compile_prepend() {
export BUILD_SYS="${BUILD_SYS}"
export HOST_SYS="${HOST_SYS}"
+ find ${S} -name "*.so" -exec rm -f {} \;
}
do_install_prepend() {
@@ -48,7 +49,7 @@ FILES_${PN} += "${sysconfdir}"
PACKAGES =+ "libgps python-pygps"
FILES_${PN} += "${sysconfdir}"
-FILES_libgps = "${libdir}/*.so*"
+FILES_libgps = "${libdir}/*.so.*"
CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
DESCRIPTION_python-pygps = "Python bindings to gpsd"
#
# mt diff -r50f929f94594bd46c5cccc70110c1de0e52a0ee4 -r7dcfdc2af0ae972634d8a71244289786c34a446b
#
#
#
# add_file "packages/apex/apex-env_1.5.8.bb"
# content [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
#
# patch "classes/nslu2-image.bbclass"
# from [71b86c06661e4410945f4c6b9f042c09710e689b]
# to [a75b47c6e523125efc0f292c13f24e2059a58125]
#
# patch "classes/rm_work.bbclass"
# from [3c8ff49c617d0924fef4b991d29f8b91ab35b298]
# to [80b9b22e230989c7a6265d0b1860252d37fca5fb]
#
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
# from [b599ca5cfe1b41f4bc77f77d3387c5249106151f]
# to [f75223758a267c3ed4d7b73bcb5deb2688268664]
#
# patch "packages/meta/slugos-packages.bb"
# from [17945a027e80de4d6c5f734175f99298ef499727]
# to [e5f1bba85c8b995551d530e16be42c7fac65f8dd]
#
============================================================
--- packages/apex/apex-env_1.5.8.bb fdbc0b6132572b780b950c96db6cdd6c7f609f7d
+++ packages/apex/apex-env_1.5.8.bb fdbc0b6132572b780b950c96db6cdd6c7f609f7d
@@ -0,0 +1,22 @@
+DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
+SECTION = "util"
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+# PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz"
+S = ${WORKDIR}/apex-${PV}/usr
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+do_install() {
+ ${STRIP} ${S}/apex-env
+ install -d ${D}/${sbindir}
+ install -m 755 ${S}/apex-env ${D}/${sbindir}
+}
============================================================
--- classes/nslu2-image.bbclass 71b86c06661e4410945f4c6b9f042c09710e689b
+++ classes/nslu2-image.bbclass a75b47c6e523125efc0f292c13f24e2059a58125
@@ -6,7 +6,7 @@ nslu2_pack_image () {
${STAGING_LOADER_DIR}/apex-nslu2.bin \
${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \
${DEPLOY_DIR_IMAGE}/slug/
- install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-ixp4xx${SITEINFO_ENDIANESS} \
${DEPLOY_DIR_IMAGE}/slug/vmlinuz
install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
============================================================
--- classes/rm_work.bbclass 3c8ff49c617d0924fef4b991d29f8b91ab35b298
+++ classes/rm_work.bbclass 80b9b22e230989c7a6265d0b1860252d37fca5fb
@@ -7,7 +7,7 @@ RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
#
RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
-BB_DEFAULT_TASK = "rm_work"
+BB_DEFAULT_TASK = "rm_work_all"
do_rm_work () {
cd ${WORKDIR}
@@ -23,4 +23,9 @@ addtask rm_work after do_build
# Uncomment me when we can use bitbake 1.8.8
#addtask rm_work after do_${RMWORK_ORIG_TASK}
addtask rm_work after do_build
+
+do_rm_work_all () {
+ :
+}
+do_rm_work_all[recrdeptask] = "do_rm_work"
+addtask rm_work_all
-do_rm_work[recrdeptask] = "do_rm_work"
============================================================
--- packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b599ca5cfe1b41f4bc77f77d3387c5249106151f
+++ packages/linux/unslung-kernel_2.4.22.l2.3r63.bb f75223758a267c3ed4d7b73bcb5deb2688268664
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "Vendor-compatible Linux kernel for the Linksys NSLU2 device"
LICENSE = "GPL"
-PR = "r19"
+PR = "r20"
COMPATIBLE_HOST = 'arm.*-linux'
COMPATIBLE_MACHINE = "nslu2"
@@ -39,7 +39,7 @@ KERNEL_IMAGETYPE = "zImage"
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-KERNEL_SUFFIX = "${MACHINE}"
+KERNEL_SUFFIX = "ixp4xxbe"
CMDLINE_CONSOLE ?= "ttyS0,115200"
CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc mem=32M at 0x00000000"
CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_ROOT}"
============================================================
--- packages/meta/slugos-packages.bb 17945a027e80de4d6c5f734175f99298ef499727
+++ packages/meta/slugos-packages.bb e5f1bba85c8b995551d530e16be42c7fac65f8dd
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r33"
+PR = "r34"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -21,6 +21,7 @@ SLUGOS_PACKAGES = "\
SLUGOS_PACKAGES = "\
alsa-lib \
alsa-utils \
+ apex-env \
asterisk \
asterisk-sounds \
atftp \
@@ -59,9 +60,11 @@ SLUGOS_PACKAGES = "\
eciadsl \
expat \
ez-ipupdate \
+ fconfig \
fetchmail \
file \
findutils \
+ fis \
flac \
flex \
flite \