Modify

Opened 9 years ago

Closed 9 years ago

Last modified 4 years ago

#4279 closed enhancement (fixed)

busybox 1.13.4 and 1.12.4 are out

Reported by: raphael.huck@… Owned by: nico
Priority: normal Milestone: Barrier Breaker 14.07
Component: packages Version: Trunk
Keywords: busybox Cc:

Attachments (14)

busybox-1.12.3-update1.diff (117.4 KB) - added by nico 9 years ago.
BusyBox update to 1.12.3
busybox-1.12.3-update2.diff (118.7 KB) - added by nico 9 years ago.
BusyBox v1.12.3 update, v2, added upstream patches
busybox-1.12.4-update1.diff (117.0 KB) - added by nico 9 years ago.
Busybox v1.12.4 update v1
busybox-1.12.4-update2.diff (111.8 KB) - added by nico 9 years ago.
Busybox v1.12.4 update v2 (against r14744)
busybox-1.13.2-update.diff (173.6 KB) - added by markus 9 years ago.
busybox upgrade to 1.13.2
busybox-1.13.3.patch (155.8 KB) - added by M.R. Fremouw 9 years ago.
Update to busybox 1.13.3, some patches are not needed anymore.
busybox-1.13.2.patch (173.9 KB) - added by markus 9 years ago.
ported 470-insmod patch
busybox-1.13.2-update2.patch (168.6 KB) - added by nico 9 years ago.
BusyBox v1.13.2 update v2 (against r15055), combined all work above (thanks!) and misc fixes
busybox-1.13.3-update2.patch (169.9 KB) - added by nico 9 years ago.
BusyBox v1.13.3 update v2 (against r15055), combined all work above (thanks!) and misc fixes
busybox-1.12.4-update3.patch (114.2 KB) - added by nico 9 years ago.
BusyBox v1.12.4 update v3 (against r15055), fixed
busybox-1.12.4-update4.patch (115.0 KB) - added by nico 9 years ago.
BusyBox v1.12.4 update v4 (against r15120), fixed
busybox-1.13.3-update3.patch (173.2 KB) - added by nico 9 years ago.
BusyBox v1.13.3 update v3 (against r15120), fixed
busybox-1.13.4.patch (153.1 KB) - added by markus 9 years ago.
busybox upgrade to 1.13.4
busybox-1.13.4-update1.patch (154.2 KB) - added by nico 9 years ago.
BusyBox v1.13.4 update v1 (against r15231), based on above, fixed defaults in various Config.in

Download all attachments as: .zip

Change History (33)

Changed 9 years ago by nico

BusyBox update to 1.12.3

comment:1 Changed 9 years ago by anonymous

Obsoletes #4190.

Changed 9 years ago by nico

BusyBox v1.12.3 update, v2, added upstream patches

comment:2 Changed 9 years ago by nico

  • Owner changed from developers to nico
  • Status changed from new to assigned

Changed 9 years ago by nico

Busybox v1.12.4 update v1

comment:3 Changed 9 years ago by nico

  • Description modified (diff)
  • Summary changed from busybox 1.13.1 and 1.12.3 are out to busybox 1.13.2 and 1.12.4 are out

comment:4 Changed 9 years ago by anonymous

1.13.2 where ???

comment:5 Changed 9 years ago by markus

These patches do not apply anymore:

D      package/busybox/patches/002-darwin_compile_fix.patch
D      package/busybox/patches/480-vi_search.patch
D      package/busybox/patches/450-httpd_accept_header.patch
D      package/busybox/patches/470-insmod_search.patch
D      package/busybox/patches/530-unsigned_bitwise_ops.patch

These are new upstream bugfixes for 1.13.2:

A      package/busybox/patches/000-busybox-1.13.2-killall.patch
A      package/busybox/patches/000-busybox-1.13.2-unzip.patch
A      package/busybox/patches/000-busybox-1.13.2-depmod.patch
A      package/busybox/patches/000-busybox-1.13.2-awk.patch
A      package/busybox/patches/000-busybox-1.13.2-tar.patch
A      package/busybox/patches/000-busybox-1.13.2-mdev.patch
A      package/busybox/patches/000-busybox-1.13.2-init.patch
A      package/busybox/patches/000-busybox-1.13.2-modprobe.patch

And what is "000-autoconf.patch" good for? It applies, but busybox builds fine without it?

Changed 9 years ago by nico

Busybox v1.12.4 update v2 (against r14744)

Changed 9 years ago by markus

busybox upgrade to 1.13.2

comment:6 Changed 9 years ago by markus

I forgot some config options, so here is another try...

Changed 9 years ago by M.R. Fremouw

Update to busybox 1.13.3, some patches are not needed anymore.

Changed 9 years ago by markus

ported 470-insmod patch

comment:7 Changed 9 years ago by markus

with the latest patch I ported the 470-insmod_search patch to the current busybox version. now modules are loaded again on 2.6 kernels ;-)

Changed 9 years ago by nico

BusyBox v1.13.2 update v2 (against r15055), combined all work above (thanks!) and misc fixes

Changed 9 years ago by nico

BusyBox v1.13.3 update v2 (against r15055), combined all work above (thanks!) and misc fixes

Changed 9 years ago by nico

BusyBox v1.12.4 update v3 (against r15055), fixed

comment:8 Changed 9 years ago by nico

  • Description modified (diff)
  • Summary changed from busybox 1.13.2 and 1.12.4 are out to busybox 1.13.3 and 1.12.4 are out

Patches for v1.12.4, v1.13.2 & v1.13.3 have been updated, please test them and report success/failure here, thanks!

Note: busybox-1.13.x needs an uClibc-0.9.30+ based toolchain

Changed 9 years ago by nico

BusyBox v1.12.4 update v4 (against r15120), fixed

Changed 9 years ago by nico

BusyBox v1.13.3 update v3 (against r15120), fixed

comment:9 Changed 9 years ago by markus

  • Keywords busybox added

I recently tried the 1.13.3 patch and it seems to work quite well.

Changed 9 years ago by markus

busybox upgrade to 1.13.4

comment:10 Changed 9 years ago by markus

I upgraded the last 1.13.3 patch to 1.13.4.

comment:11 follow-up: Changed 9 years ago by anonymous

it does not apply against 8.09 [15228]

comment:12 in reply to: ↑ 11 Changed 9 years ago by markus

Replying to anonymous:

it does not apply against 8.09 [15228]

because it should apply to SVN trunk...

comment:13 Changed 9 years ago by nico

  • Description modified (diff)
  • Milestone set to Kamikaze
  • Summary changed from busybox 1.13.3 and 1.12.4 are out to busybox 1.13.4 and 1.12.4 are out
  • Version set to Trunk

Changed 9 years ago by nico

BusyBox v1.13.4 update v1 (against r15231), based on above, fixed defaults in various Config.in

comment:14 Changed 9 years ago by anonymous

you sure this patch is agains 15231 ?
i downloaded 15231:
svn -r 15231 co svn://svn.openwrt.org/openwrt/branches/8.09 15231

then:
cd 15231/package
patch -p1 --dry-run < /tmp/busybox-1.13.4-update1.patch
patching file busybox/config/ipsvd/Config.in
patching file busybox/config/networking/udhcp/Config.in
patching file busybox/config/networking/Config.in
Hunk #1 FAILED at 66.
1 out of 18 hunks FAILED -- saving rejects to file busybox/config/networking/Config.in.rej
patching file busybox/config/selinux/Config.in
patching file busybox/config/loginutils/Config.in
patching file busybox/config/archival/Config.in
patching file busybox/config/sysklogd/Config.in
patching file busybox/config/modutils/Config.in
patching file busybox/config/console-tools/Config.in
patching file busybox/config/findutils/Config.in
patching file busybox/config/runit/Config.in
patching file busybox/config/init/Config.in
patching file busybox/config/debianutils/Config.in
patching file busybox/config/mailutils/Config.in
patching file busybox/config/procps/Config.in
patching file busybox/config/shell/Config.in
patching file busybox/config/coreutils/Config.in
patching file busybox/config/editors/Config.in
patching file busybox/config/libbb/Config.in
patching file busybox/config/e2fsprogs/old_e2fsprogs/Config.in
patching file busybox/config/e2fsprogs/Config.in
patching file busybox/config/util-linux/Config.in
patching file busybox/config/Config.in
patching file busybox/config/miscutils/Config.in
patching file busybox/config/printutils/Config.in
patching file busybox/patches/310-passwd_access.patch
patching file busybox/patches/470-insmod_search.patch
Hunk #3 FAILED at 97.
1 out of 3 hunks FAILED -- saving rejects to file busybox/patches/470-insmod_search.patch.rej
patching file busybox/patches/510-awk_include.patch
patching file busybox/patches/530-unsigned_bitwise_ops.patch
Reversed (or previously applied) patch detected! Assume -R? [n] C

comment:15 Changed 9 years ago by anonymous

sorry

patching file busybox/config/ipsvd/Config.in
patching file busybox/config/networking/udhcp/Config.in
patching file busybox/config/networking/Config.in
Hunk #1 FAILED at 66.
1 out of 18 hunks FAILED -- saving rejects to file busybox/config/networking/Config.in.rej
patching file busybox/config/selinux/Config.in
patching file busybox/config/loginutils/Config.in
patching file busybox/config/archival/Config.in
patching file busybox/config/sysklogd/Config.in
patching file busybox/config/modutils/Config.in
patching file busybox/config/console-tools/Config.in
patching file busybox/config/findutils/Config.in
patching file busybox/config/runit/Config.in
patching file busybox/config/init/Config.in
patching file busybox/config/debianutils/Config.in
patching file busybox/config/mailutils/Config.in
patching file busybox/config/procps/Config.in
patching file busybox/config/shell/Config.in
patching file busybox/config/coreutils/Config.in
patching file busybox/config/editors/Config.in
patching file busybox/config/libbb/Config.in
patching file busybox/config/e2fsprogs/old_e2fsprogs/Config.in
patching file busybox/config/e2fsprogs/Config.in
patching file busybox/config/util-linux/Config.in
patching file busybox/config/Config.in
patching file busybox/config/miscutils/Config.in
patching file busybox/config/printutils/Config.in
patching file busybox/patches/310-passwd_access.patch
patching file busybox/patches/470-insmod_search.patch
Hunk #3 FAILED at 97.
1 out of 3 hunks FAILED -- saving rejects to file busybox/patches/470-insmod_search.patch.rej
patching file busybox/patches/510-awk_include.patch
patching file busybox/patches/530-unsigned_bitwise_ops.patch
Reversed (or previously applied) patch detected!  Assume -R? [n] ^C

comment:16 Changed 9 years ago by nico

The patches are against trunk, busybox won't be upgraded on 8.09 branch

comment:17 Changed 9 years ago by nico

Update to v1.12.4 applied in [16053]

comment:18 Changed 9 years ago by nico

  • Resolution set to fixed
  • Status changed from assigned to closed

Update to v1.13.4 applied in [16063]

comment:19 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.