diff options
| -rw-r--r-- | classes/base.bbclass | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 5 | ||||
| -rw-r--r-- | packages/dbus/dbus-1.0.2/dbus-1.init | 2 | ||||
| -rw-r--r-- | packages/dbus/dbus_1.0.2.bb | 2 | ||||
| -rw-r--r-- | packages/images/angstrom-minimal-image-with-mtd-utils.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux.inc | 19 | ||||
| -rw-r--r-- | packages/tcpdump/tcpdump_3.9.7.bb (renamed from packages/tcpdump/tcpdump_3.9.3.bb) | 3 |
7 files changed, 23 insertions, 14 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) } 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 <mickey@Vanille-media.de> #@-------------------------------------------------------------------- + +# 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 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" 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" 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 diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.7.bb index 7ffcc9a37f..ba9710d86a 100644 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ b/packages/tcpdump/tcpdump_3.9.7.bb @@ -3,8 +3,7 @@ HOMEPAGE = "http://www.tcpdump.org/" LICENSE = "BSD" SECTION = "console/network" PRIORITY = "optional" -DEPENDS = "libpcap-0.9.3" -PR = "r2" +DEPENDS = "libpcap" SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ file://tcpdump_configure_no_-O2.patch;patch=1" |