From 9995a4e0ba564a6dfd834f3edb124679af87c0f6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Jul 2010 08:00:49 +0200 Subject: [PATCH] busybox: update upstream patches Signed-off-by: Stephan Raue --- .../patches/busybox-1.17.0-build_system.diff | 74 +++ .../patches/busybox-1.17.0-volumeid.diff | 450 ++++++++++++++++++ 2 files changed, 524 insertions(+) create mode 100644 packages/sysutils/busybox/patches/busybox-1.17.0-volumeid.diff diff --git a/packages/sysutils/busybox/patches/busybox-1.17.0-build_system.diff b/packages/sysutils/busybox/patches/busybox-1.17.0-build_system.diff index 2112644987..76c3829391 100644 --- a/packages/sysutils/busybox/patches/busybox-1.17.0-build_system.diff +++ b/packages/sysutils/busybox/patches/busybox-1.17.0-build_system.diff @@ -11,6 +11,17 @@ diff -urpN busybox-1.17.0/applets/usage_compressed busybox-1.17.0-build_system/a - mv -- "$target.$$" "$target" -fi +mv -- "$target.$$" "$target" +diff -urpN busybox-1.17.0/Config.in busybox-1.17.0-build_system/Config.in +--- busybox-1.17.0/Config.in 2010-06-24 04:40:43.000000000 +0200 ++++ busybox-1.17.0-build_system/Config.in 2010-07-14 08:14:26.000000000 +0200 +@@ -138,6 +138,7 @@ config UNICODE_USING_LOCALE + help + With this option on, Unicode support is implemented using libc + routines. Otherwise, internal implementation is used. ++ Internal implementation is smaller. + + config FEATURE_CHECK_UNICODE_IN_ENV + bool "Check $LANG environment variable" diff -urpN busybox-1.17.0/init/bootchartd.c busybox-1.17.0-build_system/init/bootchartd.c --- busybox-1.17.0/init/bootchartd.c 2010-07-04 15:32:24.000000000 +0200 +++ busybox-1.17.0-build_system/init/bootchartd.c 2010-07-10 01:31:14.000000000 +0200 @@ -32,6 +43,69 @@ diff -urpN busybox-1.17.0/init/bootchartd.c busybox-1.17.0-build_system/init/boo //config: default y //config: depends on BOOTCHARTD //config: help +diff -urpN busybox-1.17.0/miscutils/Config.src busybox-1.17.0-build_system/miscutils/Config.src +--- busybox-1.17.0/miscutils/Config.src 2010-06-24 04:40:43.000000000 +0200 ++++ busybox-1.17.0-build_system/miscutils/Config.src 2010-07-14 08:04:35.000000000 +0200 +@@ -276,28 +276,28 @@ config FBSPLASH + + config FLASHCP + bool "flashcp" +- default y ++ default n # doesn't build on Ubuntu 8.04 + help + The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7. + This utility is used to copy images into a MTD device. + + config FLASH_LOCK + bool "flash_lock" +- default y ++ default n # doesn't build on Ubuntu 8.04 + help + The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This + utility locks part or all of the flash device. + + config FLASH_UNLOCK + bool "flash_unlock" +- default y ++ default n # doesn't build on Ubuntu 8.04 + help + The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This + utility unlocks part or all of the flash device. + + config FLASH_ERASEALL + bool "flash_eraseall" +- default y ++ default n # doesn't build on Ubuntu 8.04 + help + The flash_eraseall binary from mtd-utils as of git head c4c6a59eb. + This utility is used to erase the whole MTD device. +@@ -311,7 +311,7 @@ config IONICE + + config INOTIFYD + bool "inotifyd" +- default y ++ default n # doesn't build on Knoppix 5 + help + Simple inotify daemon. Reports filesystem changes. Requires + kernel >= 2.6.13 +@@ -549,7 +549,7 @@ config READAHEAD + + config RFKILL + bool "rfkill" +- default n ++ default n # doesn't build on Ubuntu 9.04 + help + Enable/disable wireless devices. + +@@ -588,7 +588,7 @@ config STRINGS + + config TASKSET + bool "taskset" +- default y ++ default n # doesn't build on some non-x86 targets (m68k) + help + Retrieve or set a processes's CPU affinity. + This requires sched_{g,s}etaffinity support in your libc. diff -urpN busybox-1.17.0/scripts/gen_build_files.sh busybox-1.17.0-build_system/scripts/gen_build_files.sh --- busybox-1.17.0/scripts/gen_build_files.sh 2010-06-26 00:42:29.000000000 +0200 +++ busybox-1.17.0-build_system/scripts/gen_build_files.sh 2010-07-10 01:31:38.000000000 +0200 diff --git a/packages/sysutils/busybox/patches/busybox-1.17.0-volumeid.diff b/packages/sysutils/busybox/patches/busybox-1.17.0-volumeid.diff new file mode 100644 index 0000000000..5fc0cf06c8 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.17.0-volumeid.diff @@ -0,0 +1,450 @@ +diff -urpN busybox-1.17.0/util-linux/Config.src busybox-1.17.0-volumeid/util-linux/Config.src +--- busybox-1.17.0/util-linux/Config.src 2010-06-24 04:40:43.000000000 +0200 ++++ busybox-1.17.0-volumeid/util-linux/Config.src 2010-07-14 07:12:19.000000000 +0200 +@@ -470,221 +470,6 @@ config FEATURE_USE_TERMIOS + will be unable to determine the current screen size, and will be + unable to move the cursor. + +-config VOLUMEID +- bool #No description makes it a hidden option +- default n +- +-config FEATURE_VOLUMEID_EXT +- bool "Ext filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_BTRFS +- bool "btrfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_REISERFS +- bool "Reiser filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_FAT +- bool "fat filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_HFS +- bool "hfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_JFS +- bool "jfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-### config FEATURE_VOLUMEID_UFS +-### bool "ufs filesystem" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-config FEATURE_VOLUMEID_XFS +- bool "xfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_NTFS +- bool "ntfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_ISO9660 +- bool "iso9660 filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_UDF +- bool "udf filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_LUKS +- bool "luks filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_LINUXSWAP +- bool "linux swap filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-### config FEATURE_VOLUMEID_LVM +-### bool "lvm" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-config FEATURE_VOLUMEID_CRAMFS +- bool "cramfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-### config FEATURE_VOLUMEID_HPFS +-### bool "hpfs filesystem" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-config FEATURE_VOLUMEID_ROMFS +- bool "romfs filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-config FEATURE_VOLUMEID_SYSV +- bool "sysv filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-### config FEATURE_VOLUMEID_MINIX +-### bool "minix filesystem" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### These only detect partition tables - not used (yet?) +-### config FEATURE_VOLUMEID_MAC +-### bool "mac filesystem" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +-### +-### config FEATURE_VOLUMEID_MSDOS +-### bool "msdos filesystem" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-config FEATURE_VOLUMEID_OCFS2 +- bool "ocfs2 filesystem" +- default y +- depends on VOLUMEID +- help +- TODO +- +-### config FEATURE_VOLUMEID_HIGHPOINTRAID +-### bool "highpoint raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_ISWRAID +-### bool "intel raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_LSIRAID +-### bool "lsi raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_VIARAID +-### bool "via raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_SILICONRAID +-### bool "silicon raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_NVIDIARAID +-### bool "nvidia raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-### config FEATURE_VOLUMEID_PROMISERAID +-### bool "promise raid" +-### default y +-### depends on VOLUMEID +-### help +-### TODO +- +-config FEATURE_VOLUMEID_LINUXRAID +- bool "linuxraid" +- default y +- depends on VOLUMEID +- help +- TODO +- + config MOUNT + bool "mount" + default y +@@ -937,4 +722,224 @@ config FEATURE_MTAB_SUPPORT + About the only reason to use this is if you've removed /proc from + your kernel. + ++config VOLUMEID ++ bool #No description makes it a hidden option ++ default n ++ ++menu "Filesystem/Volume identification" ++ depends on VOLUMEID ++ ++config FEATURE_VOLUMEID_EXT ++ bool "Ext filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_BTRFS ++ bool "btrfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_REISERFS ++ bool "Reiser filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_FAT ++ bool "fat filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_HFS ++ bool "hfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_JFS ++ bool "jfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++### config FEATURE_VOLUMEID_UFS ++### bool "ufs filesystem" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++config FEATURE_VOLUMEID_XFS ++ bool "xfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_NTFS ++ bool "ntfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_ISO9660 ++ bool "iso9660 filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_UDF ++ bool "udf filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_LUKS ++ bool "luks filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_LINUXSWAP ++ bool "linux swap filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++### config FEATURE_VOLUMEID_LVM ++### bool "lvm" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++config FEATURE_VOLUMEID_CRAMFS ++ bool "cramfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++### config FEATURE_VOLUMEID_HPFS ++### bool "hpfs filesystem" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++config FEATURE_VOLUMEID_ROMFS ++ bool "romfs filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++config FEATURE_VOLUMEID_SYSV ++ bool "sysv filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++### config FEATURE_VOLUMEID_MINIX ++### bool "minix filesystem" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### These only detect partition tables - not used (yet?) ++### config FEATURE_VOLUMEID_MAC ++### bool "mac filesystem" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++### ++### config FEATURE_VOLUMEID_MSDOS ++### bool "msdos filesystem" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++config FEATURE_VOLUMEID_OCFS2 ++ bool "ocfs2 filesystem" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++### config FEATURE_VOLUMEID_HIGHPOINTRAID ++### bool "highpoint raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_ISWRAID ++### bool "intel raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_LSIRAID ++### bool "lsi raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_VIARAID ++### bool "via raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_SILICONRAID ++### bool "silicon raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_NVIDIARAID ++### bool "nvidia raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++### config FEATURE_VOLUMEID_PROMISERAID ++### bool "promise raid" ++### default y ++### depends on VOLUMEID ++### help ++### TODO ++ ++config FEATURE_VOLUMEID_LINUXRAID ++ bool "linuxraid" ++ default y ++ depends on VOLUMEID ++ help ++ TODO ++ ++endmenu ++ + endmenu