mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
busybox: drop patches that are not valid anymore
1. Removed following patches
a) busybox-appletlib-dependency.patch
- Kbuild rules handles that dependency
b) get_header_tar.patch
- tar applet uses a different code path to handle that scenario now.
2. Updated the upstream-status of fail_on_no_media.patch as Denied.
(From OE-Core rev: 48f5c2962a4121ba6172b535c90eaa16e8afa538)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
47d011963b
commit
c7355b90d0
@@ -1,37 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
# copy commit message from OE as the patch comment:
|
||||
# commit 98c24291aa165f53423c27ae033831ce0b3bb676
|
||||
# Author: Roman I Khimov <khimov@altell.ru>
|
||||
# Date: Thu Mar 26 23:03:58 2009 +0000
|
||||
#
|
||||
# busybox: update appletlib dependency patch
|
||||
#
|
||||
# Previous version still failed from time to time on clean-start builds
|
||||
# with 4 bitbake threads and '-j16'. Building busybox as sole target worked
|
||||
# well.
|
||||
#
|
||||
# The reason is that previous version introduced a race between applets make
|
||||
# processes spawned from top-level Makefile and from libbb Makefile.
|
||||
#
|
||||
# Fix it with high-level dependency that doesn't create races.
|
||||
#
|
||||
# Signed-off-by: Koen Kooi <koen@openembedded.org>
|
||||
#
|
||||
# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
|
||||
|
||||
Index: busybox-1.13.2/Makefile
|
||||
===================================================================
|
||||
--- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300
|
||||
+++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300
|
||||
@@ -471,6 +471,10 @@
|
||||
util-linux/ \
|
||||
util-linux/volume_id/ \
|
||||
|
||||
+# Lib interdeps
|
||||
+# libbb uses headers generated in applets
|
||||
+libbb: applets
|
||||
+
|
||||
endif # KBUILD_EXTMOD
|
||||
|
||||
ifeq ($(dot-config),1)
|
||||
@@ -1,4 +1,5 @@
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Denied
|
||||
[https://www.mail-archive.com/busybox@busybox.net/msg22354.html]
|
||||
|
||||
The current behaviour of busybox is to try all fstype when automounting
|
||||
even when no media exists. The util-linux mount command bails when no
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
# copy commit message from OE as the patch comment:
|
||||
# commit 5a0e1d473ca7aca5ffefffe9a2ec44ae7a1f35bc
|
||||
# Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
|
||||
# Date: Wed Feb 11 22:40:21 2009 +0100
|
||||
#
|
||||
# busybox: fix tar problem with filenames that are exactly 100 bytes
|
||||
#
|
||||
# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
|
||||
|
||||
--- busybox-1.13.2/archival/libarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100
|
||||
+++ busybox-1.13.2/archival/libarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100
|
||||
@@ -252,6 +252,8 @@
|
||||
file_header->name = concat_path_file(tar.prefix, tar.name);
|
||||
} else
|
||||
file_header->name = xstrdup(tar.name);
|
||||
+ if (strlen(file_header->name) > 100)
|
||||
+ file_header->name[100] = 0;
|
||||
}
|
||||
|
||||
/* Set bits 12-15 of the files mode */
|
||||
@@ -1,8 +1,6 @@
|
||||
require busybox.inc
|
||||
|
||||
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
||||
file://get_header_tar.patch \
|
||||
file://busybox-appletlib-dependency.patch \
|
||||
file://busybox-udhcpc-no_deconfig.patch \
|
||||
file://find-touchscreen.sh \
|
||||
file://busybox-cron \
|
||||
|
||||
@@ -7,8 +7,6 @@ PV = "1.25.0+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRC_URI = "git://busybox.net/busybox.git \
|
||||
file://get_header_tar.patch \
|
||||
file://busybox-appletlib-dependency.patch \
|
||||
file://busybox-udhcpc-no_deconfig.patch \
|
||||
file://find-touchscreen.sh \
|
||||
file://busybox-cron \
|
||||
|
||||
Reference in New Issue
Block a user