From 7b403ada3715d1d6e510abbb6b4ccf89b2c09167 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 21 Aug 2007 11:25:30 +0000 Subject: [PATCH] - sed -i -e "/\-[[:space:]]*mkdir[[:space:]][[:space:]]*-p/s/-[[:space:]]*mkdir/mkdir/g" (want to know about errors if mkdir failed). Thanks to Cristian Ionescu-Idbohrn for pointing this out --- Makefile | 14 +++++++------- package/hostap/hostap.mk | 4 ++-- package/liblockfile/liblockfile.mk | 2 +- package/libusb/libusb.mk | 2 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- package/ncurses/ncurses.mk | 2 +- package/udev/udev.mk | 2 +- package/xorg/xorg.mk | 6 +++--- target/device/Sharp/LNode80/linux.mk | 4 ++-- target/device/Soekris/net4521/linux.mk | 4 ++-- target/device/Via/epia-mii/linux.mk | 4 ++-- target/device/jp/q5/linux.mk | 4 ++-- toolchain/gcc/gcc-uclibc-3.x.mk | 6 +++--- toolchain/gcc/gcc-uclibc-4.x.mk | 2 +- toolchain/sstrip/sstrip.mk | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 9b1b56bb8..9a52b0b8d 100644 --- a/Makefile +++ b/Makefile @@ -321,7 +321,7 @@ $(CONFIG)/mconf: fi menuconfig: $(CONFIG)/mconf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/mconf $(CONFIG_CONFIG_IN); then \ @@ -329,39 +329,39 @@ menuconfig: $(CONFIG)/mconf fi config: $(CONFIG)/conf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf $(CONFIG_CONFIG_IN) oldconfig: $(CONFIG)/conf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -o $(CONFIG_CONFIG_IN) randconfig: $(CONFIG)/conf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -r $(CONFIG_CONFIG_IN) allyesconfig: $(CONFIG)/conf cat $(CONFIG_DEFCONFIG) > .config - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -y $(CONFIG_CONFIG_IN) #sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config allnoconfig: $(CONFIG)/conf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -n $(CONFIG_CONFIG_IN) defconfig: $(CONFIG)/conf - @-mkdir -p $(CONFIG)/buildroot-config + @mkdir -p $(CONFIG)/buildroot-config @KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \ KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \ $(CONFIG)/conf -d $(CONFIG_CONFIG_IN) diff --git a/package/hostap/hostap.mk b/package/hostap/hostap.mk index 6a49f588d..7a2acf2e8 100644 --- a/package/hostap/hostap.mk +++ b/package/hostap/hostap.mk @@ -31,9 +31,9 @@ $(HOSTAP_DIR)/utils/hostap_crypt_conf: $(HOSTAP_DIR)/.configured $(TARGET_DIR)//usr/bin/hostap_crypt_conf: $(HOSTAP_DIR)/utils/hostap_crypt_conf # Make the dir -rm -rf $(HOSTAP_TARGET_MODULE_DIR) - -mkdir -p $(HOSTAP_TARGET_MODULE_DIR) + mkdir -p $(HOSTAP_TARGET_MODULE_DIR) # Copy the pcmcia-cs conf file - -mkdir -p $(TARGET_DIR)/etc/pcmcia + mkdir -p $(TARGET_DIR)/etc/pcmcia cp -af $(HOSTAP_DIR)/driver/etc/hostap_cs.conf $(TARGET_DIR)/etc/pcmcia/ # Copy The Utils cp -af $(HOSTAP_DIR)/utils/hostap_crypt_conf $(TARGET_DIR)/usr/bin/ diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index a6e562a26..99ddd9d8c 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -39,7 +39,7 @@ $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY) - -mkdir -p $(TARGET_DIR)/usr/lib + mkdir -p $(TARGET_DIR)/usr/lib cp -a $(STAGING_DIR)/lib/liblockfile.so* $(TARGET_DIR)/usr/lib $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 2a1179284..d50c29cf5 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -40,7 +40,7 @@ $(STAGING_DIR)/lib/libusb.so: $(LIBUSB_DIR)/.configured $(MAKE) -C $(LIBUSB_DIR) DESTDIR=$(STAGING_DIR) install $(TARGET_DIR)/$(LIBUSB_BINARY): $(STAGING_DIR)/lib/libusb.so - -mkdir -p $(TARGET_DIR)/usr/lib + mkdir -p $(TARGET_DIR)/usr/lib cp -a $(STAGING_DIR)/lib/libusb* $(TARGET_DIR)/usr/lib rm -f $(TARGET_DIR)/usr/lib/*.a $(TARGET_DIR)/usr/lib/*.la diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 706787fbf..2dc4d68eb 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -33,7 +33,7 @@ $(DL_DIR)/$(LTP_TESTSUITE_SOURCE): ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) $(LTP_TESTSUITE_DIR)/Makefile: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) - -mkdir -p $(LTP_TESTSUITE_ROOT) + mkdir -p $(LTP_TESTSUITE_ROOT) $(LTP_TESTSUITE_CAT) $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) | tar -C $(LTP_TESTSUITE_ROOT) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ $(LTP_PATCHES) touch -c $@ diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index b9fee9c82..a1730f679 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -122,7 +122,7 @@ $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurse touch -c $@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a - -mkdir -p $(TARGET_DIR)/usr/include + mkdir -p $(TARGET_DIR)/usr/include cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.h cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/ diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 718169a9a..e5560353c 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -40,7 +40,7 @@ $(UDEV_DIR)/$(UDEV_BINARY): $(UDEV_DIR)/.unpacked touch -c $@ $(TARGET_DIR)/$(UDEV_TARGET_BINARY): $(UDEV_DIR)/$(UDEV_BINARY) - -mkdir -p $(TARGET_DIR)/sys + mkdir -p $(TARGET_DIR)/sys $(MAKE) $(TARGET_CONFIGURE_OPTS) \ DESTDIR=$(TARGET_DIR) \ CFLAGS="$(BR2_UDEV_CFLAGS)" \ diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk index c7673d4ef..e5697a166 100644 --- a/package/xorg/xorg.mk +++ b/package/xorg/xorg.mk @@ -108,7 +108,7 @@ $(XORG_XSERVER): $(XORG_DIR)/.configured touch -c $(XORG_XSERVER) $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER) - -mkdir -p $(STAGING_DIR)/usr/X11R6 + mkdir -p $(STAGING_DIR)/usr/X11R6 ln -fs ../../include $(STAGING_DIR)/usr/X11R6/include ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX) ( cd $(XORG_DIR); $(MAKE) \ @@ -121,7 +121,7 @@ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER) touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(TARGET_XSERVER): $(XORG_XSERVER) - -mkdir -p $(XORG_BINX) + mkdir -p $(XORG_BINX) for file in $(XORG_APPS) ; do \ cp -f $(XORG_DIR)/programs/$$file $(XORG_BINX) ; \ chmod a+x $(XORG_PROGS)/$$file ; \ @@ -187,7 +187,7 @@ $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf: $(DEJAVU_DIR)/.unpacked touch -c $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf $(XORG_LIBX)/libX11.so.6.2: $(TARGET_XSERVER) $(XORG_LIBX)/X11/fonts/ttf-dejavu/DejaVuSansMono.ttf - -mkdir -p $(XORG_LIBX) + mkdir -p $(XORG_LIBX) set -e; for dirs in $(XORG_LIBS) ; do \ file=`find $(XORG_LDIR)/$$dirs -type f -iname "*$$dirs.so*"` ; \ $(STRIP) $(STRIP_STRIP_UNNEEDED) $$file ; \ diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk index 8ed477935..7b6567365 100644 --- a/target/device/Sharp/LNode80/linux.mk +++ b/target/device/Sharp/LNode80/linux.mk @@ -56,11 +56,11 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): - -mkdir -p $(DL_DIR) + mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(TOOL_BUILD_DIR) -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux) $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk index 039994ce2..a7363276b 100644 --- a/target/device/Soekris/net4521/linux.mk +++ b/target/device/Soekris/net4521/linux.mk @@ -57,11 +57,11 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): - -mkdir -p $(DL_DIR) + mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(TOOL_BUILD_DIR) -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux) $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk index 428b02121..e5b556972 100644 --- a/target/device/Via/epia-mii/linux.mk +++ b/target/device/Via/epia-mii/linux.mk @@ -45,11 +45,11 @@ LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): - -mkdir -p $(DL_DIR) + mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(TOOL_BUILD_DIR) -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk index 544d3538a..2685fbf19 100644 --- a/target/device/jp/q5/linux.mk +++ b/target/device/jp/q5/linux.mk @@ -55,11 +55,11 @@ LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4 LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): - -mkdir -p $(DL_DIR) + mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(TOOL_BUILD_DIR) -(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux) $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 48f6ace69..f235e5bb1 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -167,7 +167,7 @@ endif # the step or libgcc will not build... $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched - -mkdir -p $(GCC_BUILD_DIR1) + mkdir -p $(GCC_BUILD_DIR1) (cd $(GCC_BUILD_DIR1); PATH=$(TARGET_PATH) \ CC="$(HOSTCC)" \ $(GCC_DIR)/configure \ @@ -223,7 +223,7 @@ gcc_initial-dirclean: comma:=, GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ) - -mkdir -p $(GCC_BUILD_DIR2) + mkdir -p $(GCC_BUILD_DIR2) # Important! Required for limits.h to be fixed. ln -snf ../include $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-include #-rmdir $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib @@ -327,7 +327,7 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y) -cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/usr/lib/ -cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/usr/lib/ -cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/usr/lib/ - -mkdir -p $(TARGET_DIR)/usr/lib/security + mkdir -p $(TARGET_DIR)/usr/lib/security -cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/ -cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/ endif diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 48446a4b0..b01c0805a 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -349,7 +349,7 @@ ifeq ($(BR2_INSTALL_LIBGCJ),y) -cp -dpf $(STAGING_DIR)/lib/libgcj.so* $(TARGET_DIR)/lib/ -cp -dpf $(STAGING_DIR)/lib/lib-org-w3c-dom.so* $(TARGET_DIR)/lib/ -cp -dpf $(STAGING_DIR)/lib/lib-org-xml-sax.so* $(TARGET_DIR)/lib/ - -mkdir -p $(TARGET_DIR)/usr/lib/security + mkdir -p $(TARGET_DIR)/usr/lib/security -cp -dpf $(STAGING_DIR)/usr/lib/security/libgcj.security $(TARGET_DIR)/usr/lib/security/ -cp -dpf $(STAGING_DIR)/usr/lib/security/classpath.security $(TARGET_DIR)/usr/lib/security/ endif diff --git a/toolchain/sstrip/sstrip.mk b/toolchain/sstrip/sstrip.mk index 1121521a3..cb95e3faa 100644 --- a/toolchain/sstrip/sstrip.mk +++ b/toolchain/sstrip/sstrip.mk @@ -15,7 +15,7 @@ SSTRIP_SOURCE_FILE:=$(TOPDIR)/toolchain/sstrip/sstrip.c SSTRIP_HOST:=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip $(SSTRIP_HOST): $(SSTRIP_SOURCE_FILE) - -mkdir -p $(@D) $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin + mkdir -p $(@D) $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin $(HOSTCC) $(CFLAGS_FOR_BUILD) $(SSTRIP_SOURCE_FILE) -o $(SSTRIP_HOST) ln -snf ../../bin/$(REAL_GNU_TARGET_NAME)-sstrip \ $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/sstrip