diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-11-21 14:36:48 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-11-21 14:36:48 +0000 |
| commit | 82569c48fe40088fbb8ae08a962c82aaa904ea05 (patch) | |
| tree | 5fc77e722710ea33c867d9a056fcfb41e52b5afb | |
| parent | 5d66e99e6cf1a2393de17e1d5a9753c3c1f0f621 (diff) | |
| download | buildroot-novena-82569c48fe40088fbb8ae08a962c82aaa904ea05.tar.gz buildroot-novena-82569c48fe40088fbb8ae08a962c82aaa904ea05.zip | |
busybox: fixup id applet on 1.13.0 for old uclibc versions
The id applet in 1.13.0 only compiles with uclibc < 0.9.30 if the
busybox internal passwd/grp functions are used.
Therefore, automatically enable CONFIG_USE_BB_PWD_GRP if that situation
is detected and warn the user.
| -rw-r--r-- | package/busybox/busybox-1.13.x.config | 2 | ||||
| -rw-r--r-- | package/busybox/busybox.mk | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/package/busybox/busybox-1.13.x.config b/package/busybox/busybox-1.13.x.config index 7888d9eb7..0846eaf80 100644 --- a/package/busybox/busybox-1.13.x.config +++ b/package/busybox/busybox-1.13.x.config @@ -171,7 +171,7 @@ CONFIG_FOLD=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y -# CONFIG_ID is not set +CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_LENGTH=y diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 969502bf8..dd120a881 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -60,6 +60,14 @@ ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y) $(SED) s,^PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ $(BUSYBOX_DIR)/.config endif +# id applet breaks on 1.13.0 with old uclibc unless the bb pwd routines are used +ifeq ($(BR2_BUSYBOX_VERSION_1_13_X)$(BR2_UCLIBC_VERSION_0_9_28_3)$(BR2_UCLIBC_VERSION_0_9_29),yy) + if grep -q 'CONFIG_ID=y' $(BUSYBOX_DIR)/.config; \ + then \ + echo 'warning: CONFIG_ID needs BB_PWD_GRP with old uclibc, enabling' >&2;\ + $(SED) "s/^.*CONFIG_USE_BB_PWD_GRP.*/CONFIG_USE_BB_PWD_GRP=y/;" $(BUSYBOX_DIR)/.config; \ + fi +endif ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y) $(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \ $(BUSYBOX_DIR)/.config |