[oe-commits] org.oe.dev busybox 1.9.1 one defconfig to rule them all, add patch for long options. fixes #3781 -- thanks
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Feb 16 13:07:16 UTC 2008
busybox 1.9.1 one defconfig to rule them all, add patch for long options. fixes #3781 -- thanks
Andrew Paulsen!
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: fa4b0c913d988874d96657fb66fe7a423e557fe6
ViewMTN: http://monotone.openembedded.org/revision/info/fa4b0c913d988874d96657fb66fe7a423e557fe6
Files:
1
packages/busybox/busybox-1.9.1/angstrom
packages/busybox/busybox-1.9.1/angstrom/defconfig
packages/busybox/busybox-1.9.1/defconfig
packages/busybox/busybox-1.9.1/adduser-longops.patch
packages/busybox/busybox_1.9.1.bb
Diffs:
#
# mt diff -r88db39591488bde3e6384c9ec8fdbcea6e7b755a -rfa4b0c913d988874d96657fb66fe7a423e557fe6
#
#
#
# delete "packages/busybox/busybox-1.9.1/angstrom"
#
# rename "packages/busybox/busybox-1.9.1/angstrom/defconfig"
# to "packages/busybox/busybox-1.9.1/defconfig"
#
# add_file "packages/busybox/busybox-1.9.1/adduser-longops.patch"
# content [661b2538eda36e581314cde361bb3efe6411959b]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [302bb125b48c659e36990a60ce62686437da9ab4]
# to [f9c49ff1e22a8954779029451df51773b51ed09f]
#
# patch "packages/busybox/busybox_1.9.1.bb"
# from [c8311698ef9ec25768ea49185d010c66448e5a0d]
# to [3a914925d1165b2233a86cff45de9256eb4eb9d3]
#
============================================================
--- packages/busybox/busybox-1.9.1/adduser-longops.patch 661b2538eda36e581314cde361bb3efe6411959b
+++ packages/busybox/busybox-1.9.1/adduser-longops.patch 661b2538eda36e581314cde361bb3efe6411959b
@@ -0,0 +1,51 @@
+diff -Nuar busybox-1.9.1.old/loginutils/Config.in busybox-1.9.1/loginutils/Config.in
+--- busybox-1.9.1.old/loginutils/Config.in Tue Feb 12 10:03:11 2008
++++ busybox-1.9.1/loginutils/Config.in Thu Feb 14 11:48:31 2008
+@@ -88,6 +88,13 @@
+ help
+ Utility for creating a new user account.
+
++config FEATURE_ADDUSER_LONG_OPTIONS
++ bool "Enable long options"
++ default n
++ depends on ADDUSER && GETOPT_LONG
++ help
++ Support long options for the adduser applet.
++
+ config DELUSER
+ bool "deluser"
+ default n
+diff -Nuar busybox-1.9.1.old/loginutils/adduser.c busybox-1.9.1/loginutils/adduser.c
+--- busybox-1.9.1.old/loginutils/adduser.c Thu Feb 14 10:25:33 2008
++++ busybox-1.9.1/loginutils/adduser.c Thu Feb 14 13:32:47 2008
+@@ -66,6 +66,19 @@
+ bb_error_msg_and_die("cannot execute %s, you must set password manually", prog);
+ }
+
++#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
++static const char adduser_longopts[] ALIGN1 =
++ "home\0" Required_argument "h"
++ "gecos\0" Required_argument "g"
++ "shell\0" Required_argument "s"
++ "ingroup\0" Required_argument "G"
++ "disabled-password\0" No_argument "D"
++ "empty-password\0" No_argument "D"
++ "system\0" No_argument "S"
++ "no-create-home\0" No_argument "H"
++ ;
++#endif
++
+ /*
+ * adduser will take a login_name as its first parameter.
+ * home, shell, gecos:
+@@ -77,6 +90,10 @@
+ struct passwd pw;
+ const char *usegroup = NULL;
+ FILE *file;
++
++#if ENABLE_FEATURE_ADDUSER_LONG_OPTIONS
++ applet_long_options = adduser_longopts;
++#endif
+
+ /* got root? */
+ if (geteuid()) {
============================================================
--- packages/busybox/busybox-1.9.1/angstrom/defconfig 302bb125b48c659e36990a60ce62686437da9ab4
+++ packages/busybox/busybox-1.9.1/defconfig f9c49ff1e22a8954779029451df51773b51ed09f
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.7.2
-# Wed Feb 13 13:31:37 2008
+# Busybox version: 1.9.1
+# Thu Feb 14 11:54:00 2008
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -40,10 +40,9 @@ CONFIG_FEATURE_HAVE_RPC=y
#
# CONFIG_STATIC is not set
# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
CONFIG_LFS=y
-CONFIG_BUILD_AT_ONCE=y
#
# Debugging Options
@@ -61,7 +60,11 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_NO_USR is not set
CONFIG_INSTALL_APPLET_SYMLINKS=y
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
CONFIG_PREFIX="./_install"
#
@@ -73,13 +76,14 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024
# CONFIG_FEATURE_ETC_NETWORKS is not set
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
# CONFIG_FEATURE_EDITING_VI is not set
CONFIG_FEATURE_EDITING_HISTORY=15
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
CONFIG_FEATURE_TAB_COMPLETION=y
CONFIG_FEATURE_USERNAME_COMPLETION=y
CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_COPYBUF_KB=4
CONFIG_MONOTONIC_SYSCALL=y
CONFIG_IOCTL_HEX2STR_ERROR=y
@@ -93,6 +97,7 @@ CONFIG_BUNZIP2=y
CONFIG_AR=y
# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
CONFIG_CPIO=y
# CONFIG_DPKG is not set
# CONFIG_DPKG_DEB is not set
@@ -148,6 +153,7 @@ CONFIG_DF=y
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
# CONFIG_FEATURE_DD_IBS_OBS is not set
CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
CONFIG_DIRNAME=y
# CONFIG_DOS2UNIX is not set
# CONFIG_UNIX2DOS is not set
@@ -264,6 +270,7 @@ CONFIG_DUMPKMAP=y
CONFIG_CLEAR=y
CONFIG_DEALLOCVT=y
CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
CONFIG_LOADFONT=y
CONFIG_LOADKMAP=y
CONFIG_OPENVT=y
@@ -281,7 +288,7 @@ CONFIG_RUN_PARTS=y
CONFIG_MKTEMP=y
# CONFIG_PIPE_PROGRESS is not set
CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
CONFIG_START_STOP_DAEMON=y
CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
@@ -303,6 +310,7 @@ CONFIG_FEATURE_VI_MAX_LEN=1024
CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
@@ -375,6 +383,7 @@ CONFIG_ADDUSER=y
CONFIG_DELGROUP=y
CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
CONFIG_DELUSER=y
CONFIG_GETTY=y
CONFIG_FEATURE_UTMP=y
@@ -453,6 +462,8 @@ CONFIG_HEXDUMP=y
CONFIG_FEATURE_MINIX2=y
# CONFIG_GETOPT is not set
CONFIG_HEXDUMP=y
+# CONFIG_HD is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
@@ -468,6 +479,7 @@ CONFIG_MOUNT=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
CONFIG_FEATURE_MOUNT_NFS=y
# CONFIG_FEATURE_MOUNT_CIFS is not set
CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -522,6 +534,7 @@ CONFIG_FEATURE_LESS_FLAGS=y
# CONFIG_MAKEDEVS is not set
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MICROCOM is not set
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_RAIDAUTORUN is not set
@@ -540,6 +553,7 @@ CONFIG_FEATURE_IPV6=y
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
@@ -551,6 +565,7 @@ CONFIG_HOSTNAME=y
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
CONFIG_HOSTNAME=y
# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
# CONFIG_FEATURE_HTTPD_SETUID is not set
@@ -562,6 +577,7 @@ CONFIG_HOSTNAME=y
# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
CONFIG_IFCONFIG=y
CONFIG_FEATURE_IFCONFIG_STATUS=y
# CONFIG_FEATURE_IFCONFIG_SLIP is not set
@@ -591,6 +607,7 @@ CONFIG_FEATURE_IP_TUNNEL=y
CONFIG_FEATURE_IP_TUNNEL=y
# CONFIG_FEATURE_IP_RULE is not set
# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
# CONFIG_IPADDR is not set
# CONFIG_IPLINK is not set
# CONFIG_IPROUTE is not set
@@ -600,6 +617,7 @@ CONFIG_FEATURE_IP_TUNNEL=y
# CONFIG_FEATURE_IPCALC_FANCY is not set
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
CONFIG_NC=y
# CONFIG_NC_SERVER is not set
# CONFIG_NC_EXTRA is not set
@@ -631,8 +649,10 @@ CONFIG_APP_UDHCPC=y
CONFIG_APP_DUMPLEASES=y
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
# CONFIG_FEATURE_UDHCP_DEBUG is not set
# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
# CONFIG_VCONFIG is not set
CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -649,9 +669,11 @@ CONFIG_KILLALL=y
CONFIG_KILLALL=y
# CONFIG_KILLALL5 is not set
# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
CONFIG_PS=y
CONFIG_FEATURE_PS_WIDE=y
CONFIG_RENICE=y
@@ -660,6 +682,7 @@ CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
CONFIG_UPTIME=y
CONFIG_WATCH=y
@@ -668,7 +691,6 @@ CONFIG_FEATURE_SH_IS_ASH=y
#
CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_LASH is not set
# CONFIG_FEATURE_SH_IS_MSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set
CONFIG_ASH=y
@@ -745,6 +767,8 @@ CONFIG_LOGGER=y
# CONFIG_SETENFORCE is not set
# CONFIG_SETFILES is not set
# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
#
# ipsvd utilities
============================================================
--- packages/busybox/busybox_1.9.1.bb c8311698ef9ec25768ea49185d010c66448e5a0d
+++ packages/busybox/busybox_1.9.1.bb 3a914925d1165b2233a86cff45de9256eb4eb9d3
@@ -1,5 +1,5 @@ require busybox.inc
require busybox.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
@@ -11,6 +11,7 @@ SRC_URI = "http://www.busybox.net/downlo
file://syslog \
file://syslog.conf \
file://udhcpscript.patch;patch=1 \
+ file://adduser-longops.patch;patch=1 \
file://umount.busybox \
file://run_parts.c \
file://defconfig"
More information about the Openembedded-commits
mailing list