From b4cce23419175f56d1dd8a3f811a7f1aefcf25f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 11:32:10 +0000 Subject: linux.inc: use kernel decompressor (fast!) instead of uboot one (sloooooooow), closes #2925 --- packages/linux/linux.inc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 8a3a36a66b..05bfc2f472 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -71,16 +71,21 @@ do_deploy() { tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin - rm -f linux.bin.gz - fi + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + rm -f linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + rm -f linux.bin.gz + fi + fi } do_deploy[dirs] = "${S}" -addtask prepatch before do_patch after do_unpack addtask deploy before do_package after do_install -- cgit v1.2.3 From 542484b6578a337b5a61fac89b0c6c9b3ca75225 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 7 Sep 2007 11:41:01 +0000 Subject: devmem2: Simple program to read/write from/to any location in memory. --- packages/memdev2/.mtn2git_empty | 0 packages/memdev2/memdev2_1.0.0.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/memdev2/.mtn2git_empty create mode 100644 packages/memdev2/memdev2_1.0.0.bb diff --git a/packages/memdev2/.mtn2git_empty b/packages/memdev2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/memdev2/memdev2_1.0.0.bb b/packages/memdev2/memdev2_1.0.0.bb new file mode 100644 index 0000000000..5476069e5b --- /dev/null +++ b/packages/memdev2/memdev2_1.0.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Tool to read and write to arbitrary memory locations" +LICENSE = "GPL" +PR = "r0" + +SRC_URI="http://free-electrons.com/pub/mirror/devmem2.c" + +S = "${WORKDIR}" + +do_compile () { + ${CC} -o devmem2 devmem2.c +} + +do_install () { + install -d ${D}${sbindir} + install -m 0755 devmem2 ${D}${sbindir}/ +} -- cgit v1.2.3 From a92cb47e788b89c55d4c9b6d9e1d6f2f04ecb481 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 11:43:12 +0000 Subject: angstrom 2008: switch to xorg 7.3 --- conf/distro/angstrom-2008.1.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 34a1e54959..7d017b1e49 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -6,6 +6,11 @@ #@MAINTAINER: Michael 'Mickey' Lauer #@-------------------------------------------------------------------- + +# Use Xorg R7.3 release +require conf/distro/include/preferred-xorg-versions-X11R7.3.inc + + # This is a testbed for unstable and/or untested things, while angstrom-2007.1 # is aiming for stability and a release. # Use this at your own risk, we welcome bugreports filed at -- cgit v1.2.3 From 991b2eb3bd43dddfad9d377ec61ccdd954f455f0 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 7 Sep 2007 12:51:03 +0000 Subject: disapproval of revision '1e52f7b1fc531c1622587e798a3e97e77aa163c8' memdev2: revert add, devmem2 is already there. Apply coffee. --- packages/memdev2/.mtn2git_empty | 0 packages/memdev2/memdev2_1.0.0.bb | 16 ---------------- 2 files changed, 16 deletions(-) delete mode 100644 packages/memdev2/.mtn2git_empty delete mode 100644 packages/memdev2/memdev2_1.0.0.bb diff --git a/packages/memdev2/.mtn2git_empty b/packages/memdev2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/memdev2/memdev2_1.0.0.bb b/packages/memdev2/memdev2_1.0.0.bb deleted file mode 100644 index 5476069e5b..0000000000 --- a/packages/memdev2/memdev2_1.0.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Tool to read and write to arbitrary memory locations" -LICENSE = "GPL" -PR = "r0" - -SRC_URI="http://free-electrons.com/pub/mirror/devmem2.c" - -S = "${WORKDIR}" - -do_compile () { - ${CC} -o devmem2 devmem2.c -} - -do_install () { - install -d ${D}${sbindir} - install -m 0755 devmem2 ${D}${sbindir}/ -} -- cgit v1.2.3 From d8babc1e89beb0169e9fe0ec0a02d0078e448b89 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Fri, 7 Sep 2007 14:23:24 +0000 Subject: angstrom-minimal-image-with-mtd-utils: change RDEPENDS to IMAGE_INSTALL --- packages/images/angstrom-minimal-image-with-mtd-utils.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/images/angstrom-minimal-image-with-mtd-utils.bb b/packages/images/angstrom-minimal-image-with-mtd-utils.bb index 740c39126c..4fe33e9282 100644 --- a/packages/images/angstrom-minimal-image-with-mtd-utils.bb +++ b/packages/images/angstrom-minimal-image-with-mtd-utils.bb @@ -3,7 +3,7 @@ # to program the NAND flash. require angstrom-minimal-image.bb -RDEPENDS += "mtd-utils" +IMAGE_INSTALL += "mtd-utils" export IMAGE_BASENAME = "minimalist-image-mtdutils" -- cgit v1.2.3 From cb028129efb450efe57757b2ea73e8cd827bf59d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 7 Sep 2007 15:08:00 +0000 Subject: dbus: remove --reverse (yes, that is bad) to fix shutting down of dbus services on halt/reboot --- packages/dbus/dbus-1.0.2/dbus-1.init | 2 +- packages/dbus/dbus_1.0.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.2/dbus-1.init index 38e7574ad5..46e321860d 100644 --- a/packages/dbus/dbus-1.0.2/dbus-1.init +++ b/packages/dbus/dbus-1.0.2/dbus-1.init @@ -62,7 +62,7 @@ start_it_up() shut_it_down() { if [ -d $EVENTDIR ]; then - run-parts --reverse --arg=stop $EVENTDIR + run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " start-stop-daemon --stop --quiet --pidfile $PIDFILE \ diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.2.bb index a660eb1586..0c97e30406 100644 --- a/packages/dbus/dbus_1.0.2.bb +++ b/packages/dbus/dbus_1.0.2.bb @@ -2,4 +2,4 @@ require dbus.inc SRC_URI += " file://fix-waitpid.patch;patch=1" -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 5b01b27522b32b4ee14588764768a33ff7312a3a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 20:13:11 +0000 Subject: tcpdump: update to 3.9.7 whic do not need libpcap 0.9.3 but builds with 0.9.6 --- packages/tcpdump/tcpdump_3.9.3.bb | 21 --------------------- packages/tcpdump/tcpdump_3.9.7.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 packages/tcpdump/tcpdump_3.9.3.bb create mode 100644 packages/tcpdump/tcpdump_3.9.7.bb diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb deleted file mode 100644 index 7ffcc9a37f..0000000000 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -SECTION = "console/network" -PRIORITY = "optional" -DEPENDS = "libpcap-0.9.3" -PR = "r2" - -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--without-crypto" - -do_configure() { - gnu-configize - oe_runconf - sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile - sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile -} diff --git a/packages/tcpdump/tcpdump_3.9.7.bb b/packages/tcpdump/tcpdump_3.9.7.bb new file mode 100644 index 0000000000..ba9710d86a --- /dev/null +++ b/packages/tcpdump/tcpdump_3.9.7.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "libpcap" + +SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--without-crypto" + +do_configure() { + gnu-configize + oe_runconf + sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile + sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile +} -- cgit v1.2.3 From 8a00555b71e47ee86e8449a8f44b7e16c3cef1ae Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 20:22:38 +0000 Subject: base.bbclass: change message about lack of checksums.ini entry for URI to something easier to understand --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index d4b327e266..999d409914 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -487,9 +487,9 @@ python base_do_fetch() { try: if not base_chk_file(parser, pn, pv,uri, localpath, d): if type != "file": - bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) else: - bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) except Exception: raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } -- cgit v1.2.3