aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/busybox/busybox-1.15.3
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/busybox/busybox-1.15.3')
-rw-r--r--recipes/busybox/busybox-1.15.3/fdisk_nios2.patch13
-rw-r--r--recipes/busybox/busybox-1.15.3/micro/defconfig2
-rw-r--r--recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch12
3 files changed, 14 insertions, 13 deletions
diff --git a/recipes/busybox/busybox-1.15.3/fdisk_nios2.patch b/recipes/busybox/busybox-1.15.3/fdisk_nios2.patch
new file mode 100644
index 0000000000..648e68e9da
--- /dev/null
+++ b/recipes/busybox/busybox-1.15.3/fdisk_nios2.patch
@@ -0,0 +1,13 @@
+Index: busybox-1.15.3/util-linux/fdisk_osf.c
+===================================================================
+--- busybox-1.15.3.orig/util-linux/fdisk_osf.c
++++ busybox-1.15.3/util-linux/fdisk_osf.c
+@@ -44,7 +44,7 @@
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+
+ #if defined(i386) || defined(__sparc__) || defined(__arm__) \
+- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
++ || defined(__m68k__) || defined(__mips__) || defined(__nios2__) \
+ || defined(__s390__) || defined(__s390x__) \
+ || defined(__sh__) || defined(__x86_64__) || defined(__avr32__)
+ # define BSD_LABELSECTOR 1
diff --git a/recipes/busybox/busybox-1.15.3/micro/defconfig b/recipes/busybox/busybox-1.15.3/micro/defconfig
index 8431d19702..f6eaa6df6c 100644
--- a/recipes/busybox/busybox-1.15.3/micro/defconfig
+++ b/recipes/busybox/busybox-1.15.3/micro/defconfig
@@ -608,7 +608,7 @@ CONFIG_TIME=y
#
# Networking Utilities
#
-CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_IPV6 is not set
CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
# CONFIG_ARP is not set
diff --git a/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch b/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
deleted file mode 100644
index 6f209ce571..0000000000
--- a/recipes/busybox/busybox-1.15.3/run-parts.in.usr-bin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr busybox-1.15.3.orig//include/applets.h busybox-1.15.3/include/applets.h
---- busybox-1.15.3.orig//include/applets.h 2009-12-12 22:13:28.000000000 +0100
-+++ busybox-1.15.3/include/applets.h 2010-04-30 15:35:40.000000000 +0200
-@@ -323,7 +323,7 @@
- IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP))
- IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RTCWAKE(APPLET(rtcwake, _BB_DIR_USR_BIN, _BB_SUID_DROP))
--IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_BIN, _BB_SUID_DROP, run_parts))
-+IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, _BB_DIR_USR_BIN, _BB_SUID_DROP, run_parts))
- IF_RUNCON(APPLET(runcon, _BB_DIR_USR_BIN, _BB_SUID_DROP))
- IF_RUNLEVEL(APPLET(runlevel, _BB_DIR_SBIN, _BB_SUID_DROP))
- IF_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_DROP))