diff options
author | Amarnath Valluri <amarnath.valluri@intel.com> | 2015-04-17 15:02:21 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-24 15:11:25 +0200 |
commit | 4429a3250f8a993fcce55eab44a9b3d413ab86c0 (patch) | |
tree | f8f135b63e54be50b7fee63457390a702a09ce16 /meta-oe/recipes-core | |
parent | c346f605766754c02004478371f22609f15ecd1a (diff) | |
download | meta-openembedded-4429a3250f8a993fcce55eab44a9b3d413ab86c0.tar.gz |
toybox: Upgrade to v0.5.2
The patch applied to toybox is rebased onto the new release and updated.
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch | 67 | ||||
-rw-r--r-- | meta-oe/recipes-core/toybox/toybox_0.5.2.bb (renamed from meta-oe/recipes-core/toybox/toybox_0.5.0.bb) | 6 |
2 files changed, 39 insertions, 34 deletions
diff --git a/meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch b/meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch index e071f22b1..9eb965d32 100644 --- a/meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch +++ b/meta-oe/recipes-core/toybox/toybox/0001-Match-paths-with-busybox.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 27f5ca9f1e212e5ab00cde0bfc91282fc7ff5e16 Mon Sep 17 00:00:00 2001 | 1 | From 9b37b45067677563dc8daa73d73a015c20ad6222 Mon Sep 17 00:00:00 2001 |
2 | From: Paul Barker <paul@paulbarker.me.uk> | 2 | From: Paul Barker <paul@paulbarker.me.uk> |
3 | Date: Mon, 18 Aug 2014 12:18:16 +0000 | 3 | Date: Mon, 18 Aug 2014 12:18:16 +0000 |
4 | Subject: [PATCH] Match paths with busybox | 4 | Subject: [PATCH] Match paths with busybox |
@@ -8,6 +8,9 @@ update-alternatives, the paths of the links installed by toybox should match | |||
8 | those installed by busybox. This is accomplished by changing the flags of a few | 8 | those installed by busybox. This is accomplished by changing the flags of a few |
9 | tools within toybox. | 9 | tools within toybox. |
10 | 10 | ||
11 | v3: | ||
12 | - Forward ported from v0.5.0 to v0.5.2 | ||
13 | |||
11 | v2: | 14 | v2: |
12 | - Forward ported from v0.4.9 to v0.5.0 | 15 | - Forward ported from v0.4.9 to v0.5.0 |
13 | - Move new 'mount' command | 16 | - Move new 'mount' command |
@@ -16,6 +19,8 @@ Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | |||
16 | 19 | ||
17 | Upstream-status: Inappropriate | 20 | Upstream-status: Inappropriate |
18 | (specific to update-alternatives use in OpenEmbedded) | 21 | (specific to update-alternatives use in OpenEmbedded) |
22 | |||
23 | Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> | ||
19 | --- | 24 | --- |
20 | toys/lsb/mount.c | 2 +- | 25 | toys/lsb/mount.c | 2 +- |
21 | toys/lsb/pidof.c | 2 +- | 26 | toys/lsb/pidof.c | 2 +- |
@@ -45,7 +50,7 @@ Upstream-status: Inappropriate | |||
45 | 25 files changed, 29 insertions(+), 29 deletions(-) | 50 | 25 files changed, 29 insertions(+), 29 deletions(-) |
46 | 51 | ||
47 | diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c | 52 | diff --git a/toys/lsb/mount.c b/toys/lsb/mount.c |
48 | index 01f5c32..65a5aa2 100644 | 53 | index c334681..b076ca1 100644 |
49 | --- a/toys/lsb/mount.c | 54 | --- a/toys/lsb/mount.c |
50 | +++ b/toys/lsb/mount.c | 55 | +++ b/toys/lsb/mount.c |
51 | @@ -6,7 +6,7 @@ | 56 | @@ -6,7 +6,7 @@ |
@@ -54,7 +59,7 @@ index 01f5c32..65a5aa2 100644 | |||
54 | 59 | ||
55 | -USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) | 60 | -USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) |
56 | +USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_BIN|TOYFLAG_STAYROOT)) | 61 | +USE_MOUNT(NEWTOY(mount, "?O:afnrvwt:o*[-rw]", TOYFLAG_BIN|TOYFLAG_STAYROOT)) |
57 | USE_NFSMOUNT(NEWTOY(nfsmount, "?<2>2", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) | 62 | //USE_NFSMOUNT(NEWTOY(nfsmount, "?<2>2", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_STAYROOT)) |
58 | 63 | ||
59 | config MOUNT | 64 | config MOUNT |
60 | diff --git a/toys/lsb/pidof.c b/toys/lsb/pidof.c | 65 | diff --git a/toys/lsb/pidof.c b/toys/lsb/pidof.c |
@@ -84,20 +89,20 @@ index 6544265..a93327f 100644 | |||
84 | config CHVT | 89 | config CHVT |
85 | bool "chvt" | 90 | bool "chvt" |
86 | diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c | 91 | diff --git a/toys/other/ifconfig.c b/toys/other/ifconfig.c |
87 | index f5d4215..5e7c54c 100644 | 92 | index 8db3ff0..445799d 100644 |
88 | --- a/toys/other/ifconfig.c | 93 | --- a/toys/other/ifconfig.c |
89 | +++ b/toys/other/ifconfig.c | 94 | +++ b/toys/other/ifconfig.c |
90 | @@ -6,7 +6,7 @@ | 95 | @@ -6,7 +6,7 @@ |
91 | * | 96 | * |
92 | * Not in SUSv4. | 97 | * Not in SUSv4. |
93 | 98 | ||
94 | -USE_IFCONFIG(NEWTOY(ifconfig, "?a", TOYFLAG_BIN)) | 99 | -USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_BIN)) |
95 | +USE_IFCONFIG(NEWTOY(ifconfig, "?a", TOYFLAG_SBIN)) | 100 | +USE_IFCONFIG(NEWTOY(ifconfig, "^?a", TOYFLAG_SBIN)) |
96 | 101 | ||
97 | config IFCONFIG | 102 | config IFCONFIG |
98 | bool "ifconfig" | 103 | bool "ifconfig" |
99 | diff --git a/toys/other/insmod.c b/toys/other/insmod.c | 104 | diff --git a/toys/other/insmod.c b/toys/other/insmod.c |
100 | index 8aa959a..75fd7cd 100644 | 105 | index 81721a3..cb222a5 100644 |
101 | --- a/toys/other/insmod.c | 106 | --- a/toys/other/insmod.c |
102 | +++ b/toys/other/insmod.c | 107 | +++ b/toys/other/insmod.c |
103 | @@ -2,7 +2,7 @@ | 108 | @@ -2,7 +2,7 @@ |
@@ -123,20 +128,20 @@ index b8f5d82..4d16048 100644 | |||
123 | config LSMOD | 128 | config LSMOD |
124 | bool "lsmod" | 129 | bool "lsmod" |
125 | diff --git a/toys/other/netcat.c b/toys/other/netcat.c | 130 | diff --git a/toys/other/netcat.c b/toys/other/netcat.c |
126 | index 3c6f630..188c3d1 100644 | 131 | index d27aa88..0fd26f7 100644 |
127 | --- a/toys/other/netcat.c | 132 | --- a/toys/other/netcat.c |
128 | +++ b/toys/other/netcat.c | 133 | +++ b/toys/other/netcat.c |
129 | @@ -4,7 +4,7 @@ | 134 | @@ -4,7 +4,7 @@ |
130 | * | 135 | * |
131 | * TODO: udp, ipv6, genericize for telnet/microcom/tail-f | 136 | * TODO: udp, ipv6, genericize for telnet/microcom/tail-f |
132 | 137 | ||
133 | -USE_NETCAT(OLDTOY(nc, netcat, USE_NETCAT_LISTEN("tl^L^")"w#p#s:q#f:", TOYFLAG_BIN)) | 138 | -USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_BIN)) |
134 | +USE_NETCAT(OLDTOY(nc, netcat, USE_NETCAT_LISTEN("tl^L^")"w#p#s:q#f:", TOYFLAG_USR|TOYFLAG_BIN)) | 139 | +USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN)) |
135 | USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("tl^L^")"w#p#s:q#f:", TOYFLAG_BIN)) | 140 | USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#p#s:q#f:", TOYFLAG_BIN)) |
136 | 141 | ||
137 | config NETCAT | 142 | config NETCAT |
138 | diff --git a/toys/other/pivot_root.c b/toys/other/pivot_root.c | 143 | diff --git a/toys/other/pivot_root.c b/toys/other/pivot_root.c |
139 | index 3e4beac..ce3d3a8 100644 | 144 | index 9a1f56c..7748032 100644 |
140 | --- a/toys/other/pivot_root.c | 145 | --- a/toys/other/pivot_root.c |
141 | +++ b/toys/other/pivot_root.c | 146 | +++ b/toys/other/pivot_root.c |
142 | @@ -2,7 +2,7 @@ | 147 | @@ -2,7 +2,7 @@ |
@@ -162,7 +167,7 @@ index 1c33362..fecd1ef 100644 | |||
162 | config READLINK | 167 | config READLINK |
163 | bool "readlink" | 168 | bool "readlink" |
164 | diff --git a/toys/other/reboot.c b/toys/other/reboot.c | 169 | diff --git a/toys/other/reboot.c b/toys/other/reboot.c |
165 | index 5cbc4f8..f8baafc 100644 | 170 | index 8baa4d8..a135888 100644 |
166 | --- a/toys/other/reboot.c | 171 | --- a/toys/other/reboot.c |
167 | +++ b/toys/other/reboot.c | 172 | +++ b/toys/other/reboot.c |
168 | @@ -2,9 +2,9 @@ | 173 | @@ -2,9 +2,9 @@ |
@@ -170,11 +175,11 @@ index 5cbc4f8..f8baafc 100644 | |||
170 | * Copyright 2013 Elie De Brauwer <eliedebrauwer@gmail.com> | 175 | * Copyright 2013 Elie De Brauwer <eliedebrauwer@gmail.com> |
171 | 176 | ||
172 | -USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) | 177 | -USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) |
173 | -USE_REBOOT(OLDTOY(halt, reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) | 178 | -USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) |
174 | -USE_REBOOT(OLDTOY(poweroff, reboot, "n", TOYFLAG_BIN|TOYFLAG_NEEDROOT)) | 179 | -USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_BIN|TOYFLAG_NEEDROOT)) |
175 | +USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) | 180 | +USE_REBOOT(NEWTOY(reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) |
176 | +USE_REBOOT(OLDTOY(halt, reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) | 181 | +USE_REBOOT(OLDTOY(halt, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) |
177 | +USE_REBOOT(OLDTOY(poweroff, reboot, "n", TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) | 182 | +USE_REBOOT(OLDTOY(poweroff, reboot, TOYFLAG_SBIN|TOYFLAG_NEEDROOT)) |
178 | 183 | ||
179 | config REBOOT | 184 | config REBOOT |
180 | bool "reboot" | 185 | bool "reboot" |
@@ -257,15 +262,15 @@ index 7f10c5e..1ab3ce8 100644 | |||
257 | config CUT | 262 | config CUT |
258 | bool "cut" | 263 | bool "cut" |
259 | diff --git a/toys/posix/df.c b/toys/posix/df.c | 264 | diff --git a/toys/posix/df.c b/toys/posix/df.c |
260 | index afb296b..6296dc9 100644 | 265 | index 141e8e5..5d37b45 100644 |
261 | --- a/toys/posix/df.c | 266 | --- a/toys/posix/df.c |
262 | +++ b/toys/posix/df.c | 267 | +++ b/toys/posix/df.c |
263 | @@ -4,7 +4,7 @@ | 268 | @@ -4,7 +4,7 @@ |
264 | * | 269 | * |
265 | * See http://opengroup.org/onlinepubs/9699919799/utilities/df.html | 270 | * See http://opengroup.org/onlinepubs/9699919799/utilities/df.html |
266 | 271 | ||
267 | -USE_DF(NEWTOY(df, "Pkt*a", TOYFLAG_USR|TOYFLAG_SBIN)) | 272 | -USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_USR|TOYFLAG_SBIN)) |
268 | +USE_DF(NEWTOY(df, "Pkt*a", TOYFLAG_BIN)) | 273 | +USE_DF(NEWTOY(df, "Pkt*a[-Pk]", TOYFLAG_BIN)) |
269 | 274 | ||
270 | config DF | 275 | config DF |
271 | bool "df" | 276 | bool "df" |
@@ -283,20 +288,20 @@ index e8517d4..3ac4373 100644 | |||
283 | config HEAD | 288 | config HEAD |
284 | bool "head" | 289 | bool "head" |
285 | diff --git a/toys/posix/id.c b/toys/posix/id.c | 290 | diff --git a/toys/posix/id.c b/toys/posix/id.c |
286 | index b4d9c00..df79419 100644 | 291 | index 353aa04..7ab489e 100644 |
287 | --- a/toys/posix/id.c | 292 | --- a/toys/posix/id.c |
288 | +++ b/toys/posix/id.c | 293 | +++ b/toys/posix/id.c |
289 | @@ -6,10 +6,10 @@ | 294 | @@ -6,10 +6,10 @@ |
290 | * | 295 | * |
291 | * See http://opengroup.org/onlinepubs/9699919799/utilities/id.html | 296 | * See http://opengroup.org/onlinepubs/9699919799/utilities/id.html |
292 | 297 | ||
293 | -USE_ID(NEWTOY(id, ">1nGgru[!Ggu]", TOYFLAG_BIN)) | 298 | -USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_BIN)) |
294 | +USE_ID(NEWTOY(id, ">1nGgru[!Ggu]", TOYFLAG_USR|TOYFLAG_BIN)) | 299 | +USE_ID(NEWTOY(id, ">1"USE_ID_SELINUX("Z")"nGgru[!"USE_ID_SELINUX("Z")"Ggu]", TOYFLAG_USR|TOYFLAG_BIN)) |
295 | USE_GROUPS(OLDTOY(groups, id, NULL, TOYFLAG_USR|TOYFLAG_BIN)) | 300 | USE_GROUPS(NEWTOY(groups, NULL, TOYFLAG_USR|TOYFLAG_BIN)) |
296 | -USE_LOGNAME(OLDTOY(logname, id, ">0", TOYFLAG_BIN)) | 301 | -USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_BIN)) |
297 | -USE_LOGNAME(OLDTOY(whoami, id, ">0", TOYFLAG_BIN)) | 302 | -USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_BIN)) |
298 | +USE_LOGNAME(OLDTOY(logname, id, ">0", TOYFLAG_USR|TOYFLAG_BIN)) | 303 | +USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN)) |
299 | +USE_LOGNAME(OLDTOY(whoami, id, ">0", TOYFLAG_USR|TOYFLAG_BIN)) | 304 | +USE_WHOAMI(OLDTOY(whoami, logname, TOYFLAG_USR|TOYFLAG_BIN)) |
300 | 305 | ||
301 | config ID | 306 | config ID |
302 | bool "id" | 307 | bool "id" |
@@ -327,7 +332,7 @@ index 8c20644..489eb13 100644 | |||
327 | config RENICE | 332 | config RENICE |
328 | bool "renice" | 333 | bool "renice" |
329 | diff --git a/toys/posix/tail.c b/toys/posix/tail.c | 334 | diff --git a/toys/posix/tail.c b/toys/posix/tail.c |
330 | index e1048be..ba0a55a 100644 | 335 | index e92c044..ba1d311 100644 |
331 | --- a/toys/posix/tail.c | 336 | --- a/toys/posix/tail.c |
332 | +++ b/toys/posix/tail.c | 337 | +++ b/toys/posix/tail.c |
333 | @@ -4,7 +4,7 @@ | 338 | @@ -4,7 +4,7 @@ |
@@ -366,7 +371,7 @@ index 3cfdb94..c127cfe 100644 | |||
366 | config UNIQ | 371 | config UNIQ |
367 | bool "uniq" | 372 | bool "uniq" |
368 | diff --git a/toys/posix/who.c b/toys/posix/who.c | 373 | diff --git a/toys/posix/who.c b/toys/posix/who.c |
369 | index 2c8a2e6..d5cd001 100644 | 374 | index 876a562..414cdfc 100644 |
370 | --- a/toys/posix/who.c | 375 | --- a/toys/posix/who.c |
371 | +++ b/toys/posix/who.c | 376 | +++ b/toys/posix/who.c |
372 | @@ -9,7 +9,7 @@ | 377 | @@ -9,7 +9,7 @@ |
@@ -379,5 +384,5 @@ index 2c8a2e6..d5cd001 100644 | |||
379 | config WHO | 384 | config WHO |
380 | bool "who" | 385 | bool "who" |
381 | -- | 386 | -- |
382 | 2.1.2 | 387 | 1.8.1.2 |
383 | 388 | ||
diff --git a/meta-oe/recipes-core/toybox/toybox_0.5.0.bb b/meta-oe/recipes-core/toybox/toybox_0.5.2.bb index 9bdba4da5..bcd6a7255 100644 --- a/meta-oe/recipes-core/toybox/toybox_0.5.0.bb +++ b/meta-oe/recipes-core/toybox/toybox_0.5.2.bb | |||
@@ -1,10 +1,10 @@ | |||
1 | SUMMARY = "Toybox combines common utilities together into a single executable." | 1 | SUMMARY = "Toybox combines common utilities together into a single executable." |
2 | HOMEPAGE = "http://www.landley.net/toybox/" | 2 | HOMEPAGE = "http://www.landley.net/toybox/" |
3 | 3 | ||
4 | SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.bz2 \ | 4 | SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ |
5 | file://0001-Match-paths-with-busybox.patch" | 5 | file://0001-Match-paths-with-busybox.patch" |
6 | SRC_URI[md5sum] = "2cb6e8b34134038d86048e117f77765f" | 6 | SRC_URI[md5sum] = "b5d1242767c411b69dcd717da1c218b2" |
7 | SRC_URI[sha256sum] = "2718b42154be041435df48d5b5140f4e307767c36b1017e0c8d0da7f75b327a7" | 7 | SRC_URI[sha256sum] = "dec7f6433ee0e130f224fc63760b347ad0572280c4de32f1aaefbee813a79a00" |
8 | 8 | ||
9 | LICENSE = "BSD-0-Clause" | 9 | LICENSE = "BSD-0-Clause" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" |