summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/B921600.patch24
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch28
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch34
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch27
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch49
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch99
-rw-r--r--meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch30
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/busybox-list-suid-and-non-suid-app-configs.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/defconfig (renamed from meta/recipes-core/busybox/busybox-1.20.2/defconfig)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg (renamed from meta/recipes-core/busybox/busybox-1.20.2/login-utilities.cfg)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch)4
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch (renamed from meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch)0
-rw-r--r--meta/recipes-core/busybox/busybox_1.21.1.bb (renamed from meta/recipes-core/busybox/busybox_1.20.2.bb)13
20 files changed, 5 insertions, 303 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch b/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch
deleted file mode 100644
index c4d98e3a27..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/B921600.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3# copy commit message from OE as the patch comment:
4# commit 5b1ed09b1ab1a60a28a76e4658bc9957cd361b5d
5# Author: Valentin Longchamp <valentin.longchamp@epfl.ch>
6# Date: Mon Dec 8 14:43:23 2008 +0100
7
8# busybox: added support for 921600 speed of serial line
9#
10# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
11
12diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
13--- busybox-1.7.2/libbb/speed_table.c 2007-09-03 13:48:41.000000000 +0200
14+++ busybox-1.7.2-921600/libbb/speed_table.c 2008-10-09 16:23:26.269592899 +0200
15@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
16 #ifdef B460800
17 {B460800, 460800/256 + 0x8000U},
18 #endif
19+#ifdef B921600
20+ {B921600, 921600/256 + 0x8000U},
21+#endif
22 };
23
24 enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
deleted file mode 100644
index 69bbe73c64..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-1.20.2-kernel_ver.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Signed-off-by: Radu Moisan <radu.moisan@intel.com>
2Upstream-Status: Pending
3
4--- busybox-1.20.2/libbb/kernel_version.c
5+++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c
6@@ -20,18 +20,15 @@
7 int FAST_FUNC get_linux_version_code(void)
8 {
9 struct utsname name;
10- char *s;
11+ char *s, *t;
12 int i, r;
13
14- if (uname(&name) == -1) {
15- bb_perror_msg("can't get system information");
16- return 0;
17- }
18-
19+ uname(&name); /* never fails */
20 s = name.release;
21 r = 0;
22 for (i = 0; i < 3; i++) {
23- r = r * 256 + atoi(strtok(s, "."));
24+ t = strtok(s, ".");
25+ r = r * 256 + (t ? atoi(t) : 0);
26 s = NULL;
27 }
28 return r;
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch b/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch
deleted file mode 100644
index 089c5e039c..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-mkfs-minix-tests_bigendian.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1patch mkfs.minix.tests to have correct md5sum on big endian platform
2
3Upstream-Status: Accepted, expected in next release
4
5Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
6
7diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests
8index 8a33c16..7eecaf2 100755
9--- a/testsuite/mkfs.minix.tests
10+++ b/testsuite/mkfs.minix.tests
11@@ -8,6 +8,14 @@
12
13 # testing "test name" "options" "expected result" "file input" "stdin"
14
15+# '\n' produces 10 on little endian, but not on big endian
16+cr=`echo | od -i | sed 's/.* //g;2d'`
17+if [ x"$cr" = x"10" ]; then
18+ hash=4f35f7afeba07d56055bed1f29ae20b7
19+else
20+ hash=5adbc1b3ccd20ca5d0ab5bc1e13ac3fc
21+fi
22+
23 testing "mkfs.minix" \
24 "dd if=/dev/zero of=input bs=1k count=1024 2>/dev/null; mkfs.minix input; md5sum <input" \
25 "352 inodes\n"\
26@@ -15,7 +23,7 @@ testing "mkfs.minix" \
27 "Firstdatazone=15 (15)\n"\
28 "Zonesize=1024\n"\
29 "Maxsize=268966912\n"\
30-"4f35f7afeba07d56055bed1f29ae20b7 -\n" \
31+"$hash -\n" \
32 "" \
33 ""
34
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch b/meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch
deleted file mode 100644
index b75eaacd29..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/fix-for-spurious-testsuite-failure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Backport the patch from:
2http://git.busybox.net/busybox/commit/?id=a5ee090e8651692545514a81a16c6cde3a2dc577
3
4From a5ee090e8651692545514a81a16c6cde3a2dc577 Mon Sep 17 00:00:00 2001
5From: Denys Vlasenko <vda.linux@googlemail.com>
6Date: Thu, 10 May 2012 19:26:37 +0200
7Subject: [PATCH] fix for spurious testsuite failure
8
9Upstream-Status: Backport
10Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
11---
12 testsuite/du/du-k-works | 1 +
13 1 files changed, 1 insertions(+), 0 deletions(-)
14
15diff --git a/testsuite/du/du-k-works b/testsuite/du/du-k-works
16index 229a948..36dcaa8 100644
17--- a/testsuite/du/du-k-works
18+++ b/testsuite/du/du-k-works
19@@ -3,4 +3,5 @@ cd du.testdir
20 dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
21 dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
22 test x"`busybox du -k .`" = x"80 ." \
23+ -o x"`busybox du -k .`" = x"84 ." \
24 -o x"`busybox du -k .`" = x"88 ."
25--
261.7.4.1
27
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch b/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch
deleted file mode 100644
index 8696427ee8..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/strict-atime.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Add support for the "strictatime" mount option.
2
3Upstream-Status: Backport [9ad8979ff15e1b894ee1f4bb6a2535a1a2c20d65]
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6Index: busybox-1.20.2/util-linux/mount.c
7===================================================================
8--- busybox-1.20.2.orig/util-linux/mount.c 2012-07-02 15:08:25.000000000 +0100
9+++ busybox-1.20.2/util-linux/mount.c 2013-03-22 15:37:31.340277463 +0000
10@@ -113,6 +113,12 @@
11 #ifndef MS_RELATIME
12 # define MS_RELATIME (1 << 21)
13 #endif
14+#ifndef MS_STRICTATIME
15+# define MS_STRICTATIME (1 << 24)
16+#endif
17+
18+/* Any ~MS_FOO value has this bit set: */
19+#define BB_MS_INVERTED_VALUE (1u << 31)
20
21 #include "libbb.h"
22 #if ENABLE_FEATURE_MOUNT_LABEL
23@@ -239,6 +245,7 @@
24 /* "nomand" */ ~MS_MANDLOCK,
25 /* "relatime" */ MS_RELATIME,
26 /* "norelatime" */ ~MS_RELATIME,
27+ /* "strictatime" */ MS_STRICTATIME,
28 /* "loud" */ ~MS_SILENT,
29 /* "rbind" */ MS_BIND|MS_RECURSIVE,
30
31@@ -295,6 +302,7 @@
32 "nomand\0"
33 "relatime\0"
34 "norelatime\0"
35+ "strictatime\0"
36 "loud\0"
37 "rbind\0"
38
39@@ -466,8 +474,8 @@
40 // Find this option in mount_options
41 for (i = 0; i < ARRAY_SIZE(mount_options); i++) {
42 if (strcasecmp(option_str, options) == 0) {
43- long fl = mount_options[i];
44- if (fl < 0)
45+ unsigned long fl = mount_options[i];
46+ if (fl & BB_MS_INVERTED_VALUE)
47 flags &= fl;
48 else
49 flags |= fl;
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch b/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch
deleted file mode 100644
index bd55961c1b..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/sys_resource.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1Signed-off-by: Khem Raj <raj.khem@gmail.com>
2
3Upstream-Status: Pending
4
5From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
6From: Mike Frysinger <vapier@gentoo.org>
7Date: Fri, 06 Jul 2012 03:19:09 +0000
8Subject: include sys/resource.h where needed
9
10We use functions from sys/resource.h in misc applets, but don't include
11the header. This breaks building with newer glibc versions, so add the
12include where needed.
13
14Signed-off-by: Mike Frysinger <vapier@gentoo.org>
15---
16Index: busybox-1.19.4/loginutils/passwd.c
17===================================================================
18--- busybox-1.19.4.orig/loginutils/passwd.c 2012-02-04 11:34:24.000000000 -0800
19+++ busybox-1.19.4/loginutils/passwd.c 2012-07-06 17:48:27.388096092 -0700
20@@ -15,6 +15,7 @@
21
22 #include "libbb.h"
23 #include <syslog.h>
24+#include <sys/resource.h> /* setrlimit */
25
26 static void nuke_str(char *str)
27 {
28Index: busybox-1.19.4/miscutils/time.c
29===================================================================
30--- busybox-1.19.4.orig/miscutils/time.c 2012-02-04 11:24:55.000000000 -0800
31+++ busybox-1.19.4/miscutils/time.c 2012-07-06 17:48:27.388096092 -0700
32@@ -16,6 +16,7 @@
33 //usage: "\n -v Verbose"
34
35 #include "libbb.h"
36+#include <sys/resource.h> /* getrusage */
37
38 /* Information on the resources used by a child process. */
39 typedef struct {
40Index: busybox-1.19.4/networking/inetd.c
41===================================================================
42--- busybox-1.19.4.orig/networking/inetd.c 2012-02-04 11:34:24.000000000 -0800
43+++ busybox-1.19.4/networking/inetd.c 2012-07-06 17:48:54.852097259 -0700
44@@ -165,6 +165,7 @@
45 //usage: "\n (default: 0 - disabled)"
46
47 #include <syslog.h>
48+#include <sys/resource.h> /* setrlimit */
49 #include <sys/un.h>
50
51 #include "libbb.h"
52Index: busybox-1.19.4/networking/ntpd.c
53===================================================================
54--- busybox-1.19.4.orig/networking/ntpd.c 2012-02-04 11:24:55.000000000 -0800
55+++ busybox-1.19.4/networking/ntpd.c 2012-07-06 17:48:27.392096048 -0700
56@@ -46,6 +46,7 @@
57 #include "libbb.h"
58 #include <math.h>
59 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
60+#include <sys/resource.h> /* setpriority */
61 #include <sys/timex.h>
62 #ifndef IPTOS_LOWDELAY
63 # define IPTOS_LOWDELAY 0x10
64Index: busybox-1.19.4/networking/ntpd_simple.c
65===================================================================
66--- busybox-1.19.4.orig/networking/ntpd_simple.c 2012-02-04 11:24:55.000000000 -0800
67+++ busybox-1.19.4/networking/ntpd_simple.c 2012-07-06 17:48:27.400095949 -0700
68@@ -7,6 +7,7 @@
69 */
70 #include "libbb.h"
71 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
72+#include <sys/resource.h> /* setpriority */
73 #ifndef IPTOS_LOWDELAY
74 # define IPTOS_LOWDELAY 0x10
75 #endif
76Index: busybox-1.19.4/runit/chpst.c
77===================================================================
78--- busybox-1.19.4.orig/runit/chpst.c 2012-02-04 11:34:24.000000000 -0800
79+++ busybox-1.19.4/runit/chpst.c 2012-07-06 17:48:27.400095949 -0700
80@@ -91,6 +91,7 @@
81 //usage: "\n a SIGXCPU after N seconds"
82
83 #include "libbb.h"
84+#include <sys/resource.h> /* getrlimit */
85
86 /*
87 Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
88Index: busybox-1.19.4/shell/shell_common.c
89===================================================================
90--- busybox-1.19.4.orig/shell/shell_common.c 2012-02-04 11:34:24.000000000 -0800
91+++ busybox-1.19.4/shell/shell_common.c 2012-07-06 17:48:27.400095949 -0700
92@@ -18,6 +18,7 @@
93 */
94 #include "libbb.h"
95 #include "shell_common.h"
96+#include <sys/resource.h> /* getrlimit */
97
98 const char defifsvar[] ALIGN1 = "IFS= \t\n";
99
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch b/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch
deleted file mode 100644
index 3003965d8c..0000000000
--- a/meta/recipes-core/busybox/busybox-1.20.2/wget_dl_dir_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1In cases where busybox wget is invoked with -P <...> and the url ends
2in "/", the download directory is ignored (ie the file index.html is
3implied), this change enables the -P option for those urls.
4
5Signed-off-by: Amy Fong <amy.fong@windriver.com>
6Upstream-Status: Submitted
7---
8 networking/wget.c | 10 +++++++---
9 1 file changed, 7 insertions(+), 3 deletions(-)
10
11--- a/networking/wget.c
12+++ b/networking/wget.c
13@@ -589,10 +589,14 @@
14 if (!(option_mask32 & WGET_OPT_OUTNAME)) {
15 G.fname_out = bb_get_last_path_component_nostrip(target.path);
16 /* handle "wget http://kernel.org//" */
17- if (G.fname_out[0] == '/' || !G.fname_out[0])
18- G.fname_out = (char*)"index.html";
19+ if (G.fname_out[0] == '/' || !G.fname_out[0]) {
20+ /* bug: if we provide a default name, we should still look at -P option */
21+ if (G.dir_prefix)
22+ G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, "index.html");
23+ else
24+ G.fname_out = (char*)"index.html";
25 /* -P DIR is considered only if there was no -O FILE */
26- else {
27+ } else {
28 if (G.dir_prefix)
29 G.fname_out = fname_out_alloc = concat_path_file(G.dir_prefix, G.fname_out);
30 else {
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch
index de2dbcceb1..de2dbcceb1 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-appletlib-dependency.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/busybox-appletlib-dependency.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-list-suid-and-non-suid-app-configs.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch
index 753a044481..753a044481 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-list-suid-and-non-suid-app-configs.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/busybox-list-suid-and-non-suid-app-configs.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch
index baad298a3f..baad298a3f 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-sulogin-empty-root-password.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/busybox-sulogin-empty-root-password.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch b/meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch
index 4c9ce3b711..4c9ce3b711 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/busybox-udhcpc-no_deconfig.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/busybox-udhcpc-no_deconfig.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/defconfig b/meta/recipes-core/busybox/busybox-1.21.1/defconfig
index bdfdadf0eb..bdfdadf0eb 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.21.1/defconfig
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
index 6745f169fe..6745f169fe 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/fail_on_no_media.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/fail_on_no_media.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch b/meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch
index 0e528ff91f..0e528ff91f 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/get_header_tar.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/get_header_tar.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/login-utilities.cfg b/meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg
index cc9b2db502..cc9b2db502 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/login-utilities.cfg
+++ b/meta/recipes-core/busybox/busybox-1.21.1/login-utilities.cfg
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch
index 1fe20d4b0f..45f69a937c 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/run-parts.in.usr-bin.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/run-parts.in.usr-bin.patch
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration]
18diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h 18diff -uNr busybox-1.15.3.orig//include/applets.src.h busybox-1.15.3/include/applets.src.h
19--- busybox-1.15.3.orig//include/applets.src.h 2009-12-12 22:13:28.000000000 +0100 19--- busybox-1.15.3.orig//include/applets.src.h 2009-12-12 22:13:28.000000000 +0100
20+++ busybox-1.15.3/include/applets.src.h 2010-04-30 15:35:40.000000000 +0200 20+++ busybox-1.15.3/include/applets.src.h 2010-04-30 15:35:40.000000000 +0200
21@@ -323,7 +323,7 @@ 21@@ -304,7 +304,7 @@
22 IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP)) 22 IF_RPM(APPLET(rpm, BB_DIR_BIN, BB_SUID_DROP))
23 IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP)) 23 IF_RPM2CPIO(APPLET(rpm2cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
24 IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_BIN, BB_SUID_DROP)) 24 IF_RTCWAKE(APPLET(rtcwake, BB_DIR_USR_SBIN, BB_SUID_DROP))
25-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts)) 25-IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
26+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_USR_BIN, BB_SUID_DROP, run_parts)) 26+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_USR_BIN, BB_SUID_DROP, run_parts))
27 IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP)) 27 IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch
index 4049324e8b..4049324e8b 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/stat-usr-bin.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/stat-usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch b/meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch
index 070c41be07..070c41be07 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/testsuite-du-du-k-works-fix-false-positive.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/testsuite-du-du-k-works-fix-false-positive.patch
diff --git a/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
index e8e1edfb7e..e8e1edfb7e 100644
--- a/meta/recipes-core/busybox/busybox-1.20.2/watch.in.usr-bin.patch
+++ b/meta/recipes-core/busybox/busybox-1.21.1/watch.in.usr-bin.patch
diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.21.1.bb
index c854f0b2bd..d702f7e61d 100644
--- a/meta/recipes-core/busybox/busybox_1.20.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.21.1.bb
@@ -1,15 +1,12 @@
1require busybox.inc 1require busybox.inc
2PR = "r7" 2PR = "r0"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://B921600.patch \
6 file://get_header_tar.patch \ 5 file://get_header_tar.patch \
7 file://busybox-appletlib-dependency.patch \ 6 file://busybox-appletlib-dependency.patch \
8 file://run-parts.in.usr-bin.patch \ 7 file://run-parts.in.usr-bin.patch \
9 file://watch.in.usr-bin.patch \ 8 file://watch.in.usr-bin.patch \
10 file://busybox-udhcpc-no_deconfig.patch \ 9 file://busybox-udhcpc-no_deconfig.patch \
11 file://sys_resource.patch \
12 file://wget_dl_dir_fix.patch \
13 file://find-touchscreen.sh \ 10 file://find-touchscreen.sh \
14 file://busybox-cron \ 11 file://busybox-cron \
15 file://busybox-httpd \ 12 file://busybox-httpd \
@@ -24,14 +21,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
24 file://mdev.conf \ 21 file://mdev.conf \
25 file://umount.busybox \ 22 file://umount.busybox \
26 file://defconfig \ 23 file://defconfig \
27 file://busybox-mkfs-minix-tests_bigendian.patch \
28 file://fix-for-spurious-testsuite-failure.patch \
29 file://busybox-1.20.2-kernel_ver.patch \
30 file://stat-usr-bin.patch \ 24 file://stat-usr-bin.patch \
31 file://busybox-syslog.service.in \ 25 file://busybox-syslog.service.in \
32 file://busybox-klogd.service.in \ 26 file://busybox-klogd.service.in \
33 file://testsuite-du-du-k-works-fix-false-positive.patch \ 27 file://testsuite-du-du-k-works-fix-false-positive.patch \
34 file://strict-atime.patch \
35 file://fail_on_no_media.patch \ 28 file://fail_on_no_media.patch \
36 file://busybox-sulogin-empty-root-password.patch \ 29 file://busybox-sulogin-empty-root-password.patch \
37 file://run-ptest \ 30 file://run-ptest \
@@ -40,8 +33,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
40 file://login-utilities.cfg \ 33 file://login-utilities.cfg \
41 file://busybox-list-suid-and-non-suid-app-configs.patch" 34 file://busybox-list-suid-and-non-suid-app-configs.patch"
42 35
43SRC_URI[tarball.md5sum] = "e025414bc6cd79579cc7a32a45d3ae1c" 36SRC_URI[tarball.md5sum] = "795394f83903b5eec6567d51eebb417e"
44SRC_URI[tarball.sha256sum] = "eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882" 37SRC_URI[tarball.sha256sum] = "cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303"
45 38
46EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" 39EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
47 40
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 23:12:33 +0000