diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2009-02-16 10:03:32 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2009-02-16 10:03:32 -0500 |
| commit | d512927cbf42dc9a3302ecac790a18d397ea012f (patch) | |
| tree | 2d624d29a763e5f9ae9b618148cfc6063e6cd50e /packages/busybox/busybox_1.13.2.bb | |
| parent | 68e1ea7aeddc4f7efc621558dfd424cd2fe22674 (diff) | |
| parent | 3fe1150b7afa91ee59dfa6346c1f7387638b7817 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/busybox/busybox_1.13.2.bb')
| -rw-r--r-- | packages/busybox/busybox_1.13.2.bb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb index 5ae76b900d..e8f37a002b 100644 --- a/packages/busybox/busybox_1.13.2.bb +++ b/packages/busybox/busybox_1.13.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r12" +PR = "r15" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \ file://B921600.patch;patch=1 \ + file://get_header_tar.patch;patch=1 \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \ @@ -19,6 +20,7 @@ SRC_URI = "\ file://default.script \ file://hwclock.sh \ file://mount.busybox \ + file://mountall \ file://syslog \ file://syslog.conf \ file://umount.busybox \ @@ -31,6 +33,9 @@ EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config + if [ "${TARGET_ARCH}" = "avr32" ] ; then + sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${S}/.config + fi cml1_do_configure } |