--- trunk/mkinitrd-magellan/busybox/scripts/kconfig/Makefile 2010/04/29 20:38:48 983 +++ trunk/mkinitrd-magellan/busybox/scripts/kconfig/Makefile 2010/05/30 11:32:42 984 @@ -17,11 +17,28 @@ config: $(obj)/conf $< Config.in +# Mtime granularity problem. +# It was observed that these commands: +# make allnoconfig; sed -i -e '/CONFIG_TRUE/s/.*/CONFIG_TRUE=y/' .config; make +# sometimes produce busybox with "true" applet still disabled. +# This is caused by .config updated by sed having mtime which is still +# equal to (not bigger than) include/autoconf.h's mtime, +# and thus 2nd make does not regenerate include/autoconf.h. +# Waiting for 1 second after non-interactive "make XXXXconfig" +# prevents this from happening. +# +# We'd like to detect whether filesystem we are on has coarse mtimes, +# but can't do it yet, bbox ls hasn't got --full-time. +#MTIME_IS_COARSE:=@ls --full-time -ld | grep -F .000 >/dev/null +MTIME_IS_COARSE:=@true + oldconfig: $(obj)/conf $< -o Config.in + $(MTIME_IS_COARSE) && sleep 1 silentoldconfig: $(obj)/conf $< -s Config.in + $(MTIME_IS_COARSE) && sleep 1 update-po-config: $(obj)/kxgettext xgettext --default-domain=linux \ @@ -46,15 +63,19 @@ randconfig: $(obj)/conf $< -r Config.in + $(MTIME_IS_COARSE) && sleep 1 allyesconfig: $(obj)/conf $< -y Config.in + $(MTIME_IS_COARSE) && sleep 1 allnoconfig: $(obj)/conf $< -n Config.in + $(MTIME_IS_COARSE) && sleep 1 allmodconfig: $(obj)/conf $< -m Config.in + $(MTIME_IS_COARSE) && sleep 1 defconfig: $(obj)/conf ifeq ($(KBUILD_DEFCONFIG),) @@ -63,9 +84,11 @@ @echo *** Default configuration is based on '$(KBUILD_DEFCONFIG)' $(Q)$< -D $(KBUILD_DEFCONFIG) Config.in endif + $(MTIME_IS_COARSE) && sleep 1 %_defconfig: $(obj)/conf $(Q)$< -D $@ Config.in + $(MTIME_IS_COARSE) && sleep 1 # Help text used by make help help: