Skip to content

Commit

Permalink
Revert busybox unzip patch, fixed upstream. #30
Browse files Browse the repository at this point in the history
  • Loading branch information
edannenberg committed Mar 26, 2016
1 parent e8c5067 commit a11707c
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions dock/gentoobb/images/busybox/Buildconfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#
PACKAGES="sys-apps/busybox"
EMERGE_BIN="emerge-${BOB_BUSYBOX_CHOST}"
# fix digest of busybox ebuild in musl overlay after patching
EMERGE_OPT="--digest"

#
# this method runs in the bb builder container just before starting the build of the rootfs
Expand All @@ -13,23 +11,6 @@ configure_rootfs_build()
{
export CHOST=${BOB_BUSYBOX_CHOST}
echo "sys-apps/busybox make-symlinks static" > /usr/${BOB_BUSYBOX_CHOST}/etc/portage/package.use/busybox
# add missing busybox unzip regression patch to musl overlay and fix patch order in ebuild
# https://bugs.gentoo.org/show_bug.cgi?id=567340
cp /usr/portage/sys-apps/busybox/files/busybox-1.24.1-unzip-regression.patch /var/lib/layman/musl/sys-apps/busybox/files/
cat << 'EOP' | patch -p1 --ignore-whitespace /var/lib/layman/musl/sys-apps/busybox/busybox-1.24.1-r99.ebuild
--- var/lib/layman/musl/sys-apps/busybox/busybox-1.24.1-r99.ebuild 2016-03-21 03:52:08.000000000 +0000
+++ usr/portage/sys-apps/busybox/busybox-1.24.1.ebuild 2015-12-31 05:51:48.000000000 +0000
@@ -67,7 +67,8 @@
# patches go here!
epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- epatch "${FILESDIR}"/${P}-*.patch
+ epatch "${FILESDIR}"/busybox-1.24.1-unzip.patch
+ epatch "${FILESDIR}"/busybox-1.24.1-unzip-regression.patch
cp "${FILESDIR}"/ginit.c init/ || die
# flag cleanup
EOP
}

#
Expand Down

0 comments on commit a11707c

Please sign in to comment.