Changeset 165

Timestamp:

Feb 19, 2011, 4:35:47 PM (9 years ago)

Author:

amain

Message:

config: Don't set alternate openwrt download location. Normal users in general don't need it / are not aware of this feature. Targets make amain and make stappers added to set user specific options.

Location:

debwrt/trunk

Files:

• Config.in (modified) (1 diff)
• Makefile (modified) (2 diffs)
• openwrt/openwrt.mk (modified) (1 diff)

debwrt/trunk/Config.in

@@ -949 +949 @@
 config OPENWRT_DOWNLOAD_DIR
         string "Alternate OpenWrt download directory"
-        default "../../../dl"
         help
           When checking out and building multiple revisions of OpenWrt it

debwrt/trunk/Makefile

@@ -31 +31 @@
 include rules/scripts.mk
 include rules/debwrt.mk
+include rules/users.mk
 include rules/help.mk
 include config/config.mk
@@ -61 +62 @@
         @echo "Sub-Board:" ${SUB_BOARD}
 
-home: .config
-        sed -i 's!CONFIG_DEBIAN_BUILDENV_REPOSITORY.*!CONFIG_DEBIAN_BUILDENV_REPOSITORY="http://10.0.2.3:3142/ftp.debian.org/debian"!' $(TOPDIR)/.config
-        sed -i 's!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY.*!CONFIG_EMDEBIAN_BUILDENV_REPOSITORY="http://10.0.2.3:3142/www.emdebian.org/debian"!' $(TOPDIR)/.config
-
 flash:
         cd $(INSTALL_DIR) && $(SCRIPT_FLASH) "$(call qstrip,$(CONFIG_FLASH_IP))" "$(CONFIG_DEBWRT_TARGET_IMAGE_NAME_TRX)" || echo

debwrt/trunk/openwrt/openwrt.mk

@@ -46 +46 @@
 
 openwrt/download-link: openwrt/checkout
+ifneq ($(OPENWRT_DOWNLOAD_DIR),)
         cd $(OPENWRT_BUILD_DIR) && if [ -d $(OPENWRT_DOWNLOAD_DIR) -a ! -e dl ]; then ln -snf $(OPENWRT_DOWNLOAD_DIR) dl; fi
+endif
 
 openwrt/patch: openwrt/checkout