diff options
author | Oliver Tappe | 2007-11-29 21:37:20 +0100 |
---|---|---|
committer | Oliver Tappe | 2007-11-29 21:37:20 +0100 |
commit | 7fd4e674a071911989cf106ecddd6e1c782d5afa (patch) | |
tree | 3139099347d8c56d75b18d581c28f52be92f74aa /tools | |
parent | * replaced 64-bit busybox with a version that actually supports rpm2cpio (diff) | |
download | core-7fd4e674a071911989cf106ecddd6e1c782d5afa.tar.gz core-7fd4e674a071911989cf106ecddd6e1c782d5afa.tar.xz core-7fd4e674a071911989cf106ecddd6e1c782d5afa.zip |
* replaced busybox.i586 with a version that actually contains the required
support for RPMs with bzip2-payload in rpm2cpio applet
* updated quilt series file
* removed old (unqualified) unionfs patch
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1415 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'tools')
-rw-r--r-- | tools/busybox-patches/series | 4 | ||||
-rw-r--r-- | tools/busybox-patches/unionfs-run-init.diff | 14 | ||||
-rwxr-xr-x | tools/busybox.i586 | bin | 324396 -> 324524 bytes |
3 files changed, 3 insertions, 15 deletions
diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series index cefbae71..52424afc 100644 --- a/tools/busybox-patches/series +++ b/tools/busybox-patches/series @@ -1,2 +1,4 @@ # series file useable by quilt -unionfs-run-init.diff +bzip2-payload-1.7.1.diff +cryptpw-blowfish-1.7.1.diff +unionfs-run-init-1.7.1.diff diff --git a/tools/busybox-patches/unionfs-run-init.diff b/tools/busybox-patches/unionfs-run-init.diff deleted file mode 100644 index 14df85b8..00000000 --- a/tools/busybox-patches/unionfs-run-init.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru ../busybox-1.6.0.orig/util-linux/switch_root.c ./util-linux/switch_root.c ---- ../busybox-1.6.0.orig/util-linux/switch_root.c 2007-06-01 13:48:41.000000000 +0200 -+++ ./util-linux/switch_root.c 2007-06-15 12:31:40.000000000 +0200 -@@ -105,6 +105,10 @@ - // Overmount / with newdir and chroot into it. The chdir is needed to - // recalculate "." and ".." links. - -+ if ( !lstat("/rorootfs", &st1 ) ) -+ if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) ) -+ bb_error_msg_and_die("moving rorootfs"); -+ - if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".")) - bb_error_msg_and_die("error moving root"); - xchdir("/"); diff --git a/tools/busybox.i586 b/tools/busybox.i586 Binary files differindex 1ce81d40..a7916059 100755 --- a/tools/busybox.i586 +++ b/tools/busybox.i586 |