Changeset 731


Ignore:
Timestamp:
Mar 4, 2016, 9:04:17 PM (5 years ago)
Author:
amain
Message:

Merge trunk

Location:
branches/15.05
Files:
10 deleted
6 edited
6 copied

Legend:

Unmodified
Added
Removed
  • branches/15.05

  • branches/15.05/Makefile

    r724 r731  
    7272
    7373ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
    74 clean: openwrt/clean debian/clean config/clean plugins/clean
     74clean: openwrt/clean debian/clean plugins/clean
    7575else
    7676clean: debian/clean config/clean plugins/clean
    7777endif
     78        rm -rf $(BIN_DIR)
     79
     80ifeq ($(CONFIG_DEBWRT_FIRMWARE),y)
     81dirclean: openwrt/dirclean debian/clean config/clean plugins/clean
     82else
     83dirclean: debian/clean config/clean plugins/clean
     84endif
     85        rm -rf $(BIN_DIR)
     86
     87distclean:
     88        rm -rf $(BIN_DIR)
     89        rm -rf $(BUILD_DIR)
    7890        rm -f .config
     91
    7992
    8093.PHONY: clean all world flash board update-targets
  • branches/15.05/buildbot/buildep.sh

    r724 r731  
    2424                        flex \
    2525                        git \
     26                        git-core \
    2627                        subversion \
    2728                        build-essential \
  • branches/15.05/config/kernel/openwrt/version.in

    r726 r731  
    1414config OPENWRT_BRANCH
    1515        string
    16                 default "chaos_palmer" if OPENWRT_BRANCH_15_05
     16                default "15.05" if OPENWRT_BRANCH_15_05
    1717                default "unset"
    1818
  • branches/15.05/openwrt/openwrt.mk

    r724 r731  
    3838        find \
    3939          $(OPENWRT_PATCH_DIRS) \
    40           -name .svn -prune -o \! -type d -printf %f/%p\\n | \
     40          -name .svn -prune -o \! -type d -printf %f/%p\\n 2>/dev/null | \
    4141        gawk -F / '\
    4242          BEGIN { OFS=FS } \
     
    158158        touch $@
    159159
     160CONFIG_OPENWRT_SVN_REPO_URL=git://git.openwrt.org
    160161ifeq ($(OPENWRT_BRANCH),trunk)
    161 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/trunk/
    162 else ifeq ($(OPENWRT_TAG),)
    163 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/branches/$(OPENWRT_BRANCH)/
     162OPENWRT_GIT:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/openwrt.git
    164163else
    165 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/tags/$(OPENWRT_TAG)
     164OPENWRT_GIT:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/$(OPENWRT_BRANCH)/openwrt.git
    166165endif
    167166
     
    170169        if [ ! -f $(TOPDIR)/.config ]; then echo "Please type menuconfig first"; exit 1; fi
    171170        mkdir -p $(OPENWRT_BUILD_DIR)
    172         svn co -r $(OPENWRT_REVISION) $(OPENWRT_SUBVERSION) $(OPENWRT_BUILD_DIR)
     171        git clone $(OPENWRT_GIT) $(OPENWRT_BUILD_DIR)
     172ifneq ($(OPENWRT_REVISION),HEAD)
     173        cd $(OPENWRT_BUILD_DIR); git checkout $(OPENWRT_REVISION)
     174endif
    173175        touch $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
    174176        touch $@
    175177
    176 openwrt/update: openwrt/checkout
    177         svn up -r $(OPENWRT_REVISION) $(OPENWRT_BUILD_DIR)
     178openwrt/update: openwrt/checkout openwrt/patch
     179        $(MAKE) openwrt/unpatch
     180        cd $(OPENWRT_BUILD_DIR); git pull origin master
     181        $(MAKE) openwrt/patch
    178182
    179183openwrt/menuconfig: openwrt/prepare
     
    186190
    187191# deletes contents of the directories /bin and /build_dir. make clean does not remove the toolchain, it also avoids cleaning architectures/targets other than the one you have selected in your .config
    188 openwrt/clean:
     192openwrt/clean: openwrt/deliver/clean
    189193        -$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) clean V=$(V)
     194        rm -f openwrt/all
     195        rm -f openwrt/build
     196        rm -f openwrt/deliver
     197        rm -f openwrt/merge-config
    190198
    191199# deletes contents of the directories /bin and /build_dir and additionally /staging_dir and /toolchain (=the cross-compile tools) and /logs. 'Dirclean' is your basic "Full clean" operation.
    192 openwrt/dirclean:
     200openwrt/dirclean: openwrt/deliver/clean
    193201        -$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) dirclean V=$(V)
     202        rm -f openwrt/all
     203        rm -f openwrt/build
     204        rm -f openwrt/deliver
     205        rm -f openwrt/merge-config
    194206
    195207# nukes everything you have compiled or configured and also deletes all downloaded feeds contents and package sources.
    196 openwrt/distclean:
     208openwrt/distclean: openwrt/deliver/clean
    197209        -$(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) distclean V=$(V)
    198 
    199 openwrt/full-clean:
     210        rm -f openwrt/all
     211        rm -f openwrt/build
     212        rm -f openwrt/deliver
     213        rm -f openwrt/merge-config
     214
     215openwrt/full-clean: openwrt/deliver/clean
    200216        rm -rf $(OPENWRT_BUILD_DIR)
     217        rm -f openwrt/all
     218        rm -f openwrt/build
     219        rm -f openwrt/deliver
    201220        rm -f openwrt/checkout
    202221        rm -f openwrt/patch
    203222        rm -f openwrt/files-copy
     223        rm -f openwrt/download-link
     224        rm -f openwrt/prepare
     225        rm -f openwrt/merge-config
    204226
    205227.PHONY: openwrt/patch/force \
  • branches/15.05/openwrt/patches/all/021_install_kernel_modules_and_merge_debwrt_config

    r724 r731  
    1 --- openwrt/include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
    2 +++ openwrt/include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
    3 @@ -93,9 +93,11 @@
     1Index: trunk-HEAD/include/kernel-defaults.mk
     2===================================================================
     3--- trunk-HEAD/include/kernel-defaults.mk       (revision 36948)
     4+++ trunk-HEAD/include/kernel-defaults.mk       (working copy)
     5@@ -105,9 +105,11 @@
    46 endef
    57 
     
    1416        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
    1517        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
    16         echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
    17 @@ -103,6 +105,8 @@
    18         $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
    19         $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
     18        echo "CONFIG_KALLSYMS_UNCOMPRESSED=y" >> $(LINUX_DIR)/.config.target
     19@@ -114,6 +116,8 @@
     20        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
     21        $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
    2022        $(call Kernel/SetNoInitramfs)
    2123+# DebWrt: merge new kernel config, say no to anything new
    2224+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    2325        rm -rf $(KERNEL_BUILD_DIR)/modules
    24         [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
    25         $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
    26 @@ -114,7 +118,12 @@
     26        cmp -s $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev || { \
     27                cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \
     28@@ -120,6 +124,8 @@
     29                cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \
     30        }
     31        $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
     32+# DebWrt: merge new kernel config, say no to anything new, 2nd pass to make sure any *new* config options are automatically satisfied (no questions asked on console). Not sure why this needed
     33+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
     34        $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
     35 endef
     36 
     37@@ -129,7 +135,12 @@
    2738 
    2839 define Kernel/CompileModules/Default
Note: See TracChangeset for help on using the changeset viewer.