From ab39952506a64a2f7f8c6cb2b19e282d87d500e3 Mon Sep 17 00:00:00 2001
From: Richard Dale <richard.dale@codethink.co.uk>
Date: Wed, 17 Jun 2015 10:27:06 +0100
Subject: Upgrade busybox to 1.23.2 and apply OpenWrt patches

---
 strata/build-essential.morph         |  8 +++---
 strata/build-essential/busybox.morph | 51 +-----------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 7d325a21..0c0aebbc 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -146,8 +146,8 @@ chunks:
 - name: stage2-busybox
   morph: strata/build-essential/stage2-busybox.morph
   repo: upstream:busybox
-  ref: 54b710b9dec6ccf7556d971ee12f87c314bdee3a
-  unpetrify-ref: baserock/1.22.1-openwrt
+  ref: 91b0c141c6b1ef78d94e567296c968e0dac2d395
+  unpetrify-ref: baserock/1.23.2-openwrt
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -305,8 +305,8 @@ chunks:
 - name: busybox
   morph: strata/build-essential/busybox.morph
   repo: upstream:busybox
-  ref: 54b710b9dec6ccf7556d971ee12f87c314bdee3a
-  unpetrify-ref: baserock/1.22.1-openwrt
+  ref: 91b0c141c6b1ef78d94e567296c968e0dac2d395
+  unpetrify-ref: baserock/1.23.2-openwrt
   build-depends:
   - stage2-binutils
   - stage2-busybox
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index 3ec196ca..6fd21fa0 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -2,22 +2,11 @@ name: busybox
 kind: chunk
 
 configure-commands:
-# Busybox's default config has everything enabled.
 - make defconfig
 
-#- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
-#- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
-
 # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
 - '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
 
-# Depends on stuff that was removed since eglibc 2.14.
-- sed -e 's/CONFIG_INETD=y.*/# CONFIG_INETD is not set/' -i .config
-
-# Busybox Patch is incompatible enough with GNU Patch that it can't be
-# used for GNULib projects built from Git.
-#- sed -e 's/CONFIG_PATCH=y.*/# CONFIG_PATCH is not set/' -i .config
-
 # None of this is needed because we have kmod; and it actually breaks the
 # Linux build because depmod isn't compatible enough with util-linux's.
 - sed -e 's/CONFIG_DEPMOD=y.*/# CONFIG_DEPMOD is not set/' -i .config
@@ -27,53 +16,15 @@ configure-commands:
 - sed -e 's/CONFIG_LSMOD=y.*/# CONFIG_LSMOD is not set/' -i .config
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
-# General features that we don't need.
-#- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-#- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
-#- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
-#- sed -e 's/CONFIG_LOSETUP=y.*/# CONFIG_LOSETUP is not set/' -i .config
-#- sed -e 's/CONFIG_LSUSB=y.*/# CONFIG_LSUSB is not set/' -i .config
-#- sed -e 's/CONFIG_LSPCI=y.*/# CONFIG_LSPCI is not set/' -i .config
-#- sed -e 's/CONFIG_LZMA=y.*/# CONFIG_LZMA is not set/' -i .config
-#- sed -e 's/CONFIG_MKFS_EXT2=y.*/# CONFIG_MKFS_EXT2 is not set/' -i .config
-#- sed -e 's/CONFIG_MKFS_MINIX=y.*/# CONFIG_MKFS_MINIX is not set/' -i .config
-#- sed -e 's/CONFIG_STRINGS=y.*/# CONFIG_STRINGS is not set/' -i .config
-#- sed -e 's/CONFIG_UNLZMA=y.*/# CONFIG_UNLZMA is not set/' -i .config
-#- sed -e 's/CONFIG_UNXZ=y.*/# CONFIG_UNXZ is not set/' -i .config
-#- sed -e 's/CONFIG_XZ=y.*/# CONFIG_XZ is not set/' -i .config
-
 # Now turn on some little bits we do need
-- sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
 - sed -e 's/# CONFIG_LOCK is not set/CONFIG_LOCK=y/' -i .config
 - sed -e 's/# CONFIG_NETMSG is not set/CONFIG_NETMSG=y/' -i .config
 
 build-commands:
-- make
+- make busybox
 
 install-commands:
 - |
   if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
     make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
     chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-
-# Set up man environment variables
-- mkdir -p "$DESTDIR"/etc
-- |
-  cat << EOF > "$DESTDIR/etc/man.conf"
-  # This file is used by man to provide a manpath for those without one by
-  # examining their PATH environment variable.
-  #
-  # Lines beginning with `#' are comments and are ignored. Any combination of
-  # tabs or spaces may be used as `whitespace' separators.
-
-  MANDATORY_MANPATH                       /usr/man
-  MANDATORY_MANPATH                       /usr/share/man
-  MANDATORY_MANPATH                       /usr/local/share/man
-  EOF
-- 
cgit v1.2.1