diff options
| -rw-r--r-- | classes/image.bbclass | 6 | ||||
| -rw-r--r-- | conf/bitbake.conf | 4 | ||||
| -rw-r--r-- | packages/cairo/cairo_git.bb | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel/2.6.20/series | 8 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.20.bb | 2 | ||||
| -rw-r--r-- | packages/ntfs-3g/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/ntfs-3g/ntfs-3g_1.0.bb | 12 | ||||
| -rw-r--r-- | packages/ntpclient/ntpclient_2003_194.bb | 8 |
8 files changed, 32 insertions, 10 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 69d7fb2e9b..83aa80a97e 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -4,7 +4,7 @@ PACKAGES = "" # We need to recursively follow RDEPENDS and RRECOMMENDS for images BUILD_ALL_DEPS = "1" -do_rootfs[recrdeptask] = "do_package_write do_deploy" +do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" @@ -91,6 +91,10 @@ fakeroot do_rootfs () { else bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi + + cd ${DEPLOY_DIR_IMAGE}/ + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.* + ln -s ${IMAGE_NAME}.rootfs.$type ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.$type done ${IMAGE_POSTPROCESS_COMMAND} diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 0294eb981e..9f6814e526 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -169,6 +169,8 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" +DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools" ################################################################## # Kernel info. @@ -181,10 +183,10 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel" # Specific image creation and rootfs population info. ################################################################## -DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images" IMAGE_ROOTFS = "${TMPDIR}/rootfs" IMAGE_BASENAME = "rootfs" IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" +IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" IMAGE_CMD = "" IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime \ --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb index 26eaf78879..a2a6448565 100644 --- a/packages/cairo/cairo_git.bb +++ b/packages/cairo/cairo_git.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PV = "1.3.13+git${SRCDATE}" +PV = "1.3.17+git${SRCDATE}" SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \ " diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index ddbc2da1a3..6ceb7622ac 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -10,7 +10,9 @@ squashfs/squashfs-lzma.patch squashfs/squashfs-Kconfig.patch squashfs/squashfs-Makefile.patch 00-linux-2.6.20.1.patch -01-fix-redboot-bad-code.patch +01-fix-redboot-parse-oops.patch +02-fix-redboot-parse-regression.patch +03-improve-byteswap-redboot-parse.patch 07-remove-avila-ixdp425-setup.patch 08-avila-loft-setup.patch 09-avila-setup-pata.patch @@ -32,10 +34,12 @@ squashfs/squashfs-Makefile.patch 75-dsmg600-support.patch 76-dsmg600-pwrbtn.patch 78-velocity-BE.patch -80-kexec-arm-r3.patch +80-kexec-arm-upstream.patch 85-nslu2-rtc-fixup.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch +89-dsmg600-mv-freq-fixup.patch +89-nslu2-mv-freq-fixup.patch 96-fsg3-support.patch 98-sata_via-pata-support-upstream.patch 99-avila-mtd-microcode.patch diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 193e82f518..94a08509a7 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "704" +IXP4XX_KERNEL_SVN_REV = "768" # # The directory containing the patches to be applied is # specified below diff --git a/packages/ntfs-3g/.mtn2git_empty b/packages/ntfs-3g/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ntfs-3g/.mtn2git_empty diff --git a/packages/ntfs-3g/ntfs-3g_1.0.bb b/packages/ntfs-3g/ntfs-3g_1.0.bb new file mode 100644 index 0000000000..7d73b79ac9 --- /dev/null +++ b/packages/ntfs-3g/ntfs-3g_1.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "The NTFS-3G driver is an open source, freely available NTFS driver for Linux with read and write support." +HOMEPAGE = "http://www.ntfs-3g.org/" +LICENSE = "GPLv2" +DEPENDS = "fuse" +RDEPENDS = "fuse" +PR = "r0" + +SRC_URI = http://www.ntfs-3g.org/ntfs-3g-${PV}.tgz + +inherit autotools + +EXTRA_OEMAKE = "LDCONFIG=echo" diff --git a/packages/ntpclient/ntpclient_2003_194.bb b/packages/ntpclient/ntpclient_2003_194.bb index e2f58631bd..52143baee0 100644 --- a/packages/ntpclient/ntpclient_2003_194.bb +++ b/packages/ntpclient/ntpclient_2003_194.bb @@ -4,7 +4,7 @@ AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>" RDEPENDS = "busybox" SECTION = "admin" LICENSE = "GPL/v2" -PR = "r0" +PR = "r1" # The ntpclient package uses version numbers that include an underscore :( PV = "2003_194" # ntpclient unpacks into a directory that doesn't include version info :( @@ -24,9 +24,9 @@ do_compile() { do_install () { # Install the binary and tools - install -D -s -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient - install -D -s -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex + install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient + install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient + install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient } |