From a8bdfefc15187360b82345ceb79c2128f2c07c67 Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Fri, 14 Sep 2018 22:50:45 +0200 Subject: build & release : downgrade to Barrier Breaker --- include/feeds.mk | 4 +++- include/kernel-defaults.mk | 5 ++++- include/kernel-version.mk | 18 ------------------ include/kernel.mk | 2 +- include/ltqtapi.mk | 6 +++++- include/prereq-build.mk | 6 +++--- include/toplevel.mk | 2 +- include/version.mk | 27 +++++++++++---------------- 8 files changed, 28 insertions(+), 42 deletions(-) (limited to 'include') diff --git a/include/feeds.mk b/include/feeds.mk index 97b1449..695b03b 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -10,10 +10,12 @@ FEEDS_AVAILABLE:=$(shell $(SCRIPT_DIR)/feeds list -n) FEEDS_INSTALLED:=$(notdir $(wildcard $(TOPDIR)/package/feeds/*)) FEEDS_ENABLED:=$(foreach feed,$(FEEDS_INSTALLED),$(if $(CONFIG_FEED_$(feed)),$(feed))) -FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_INSTALLED)) +FEEDS_DISABLED:=$(filter-out $(FEEDS_ENABLED),$(FEEDS_AVAILABLE)) PKG_CONFIG_DEPENDS += \ CONFIG_PER_FEED_REPO \ + CONFIG_PER_FEED_REPO_ADD_DISABLED \ + CONFIG_PER_FEED_REPO_ADD_COMMENTED \ $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed)) # 1: package name diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index da06abd..f7e5e8c 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -4,7 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # - +include $(INCLUDE_DIR)/wifi.mk KERNEL_MAKEOPTS := -C $(LINUX_DIR) \ HOSTCFLAGS="$(HOST_CFLAGS) -Wall -Wmissing-prototypes -Wstrict-prototypes" \ CROSS_COMPILE="$(KERNEL_CROSS)" \ @@ -32,6 +32,7 @@ export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include # defined in quilt.mk Kernel/Patch:=$(Kernel/Patch/Default) +WiFi/Patch:=$(WiFi/Patch/Default) KERNEL_GIT_OPTS:= ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"") @@ -47,7 +48,9 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") define Kernel/Prepare/Default xzcat $(DL_DIR)/$(LINUX_SOURCE) | $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) $(Kernel/Patch) + $(call wifi-prepare) touch $(LINUX_DIR)/.quilt_used + ln -sf $(LINUX_DIR) `echo $(LINUX_DIR) | sed 's/linux-[0-9]*\.[0-9]*\.[0-9]*/linux-kernel/g'` endef else define Kernel/Prepare/Default diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7023ff0..b49033e 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,27 +2,9 @@ LINUX_RELEASE?=1 -ifeq ($(LINUX_VERSION),3.3.8) - LINUX_KERNEL_MD5SUM:=f1058f64eed085deb44f10cee8541d50 -endif -ifeq ($(LINUX_VERSION),3.6.11) - LINUX_KERNEL_MD5SUM:=3d602ad7f7984509c3e923a5ae90bc54 -endif -ifeq ($(LINUX_VERSION),3.8.13) - LINUX_KERNEL_MD5SUM:=2af19d06cd47ec459519159cdd10542d -endif -ifeq ($(LINUX_VERSION),3.9.11) - LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 -endif ifeq ($(LINUX_VERSION),3.10.49) LINUX_KERNEL_MD5SUM:=9774e12764e740d49c80eda77d0ef3eb endif -ifeq ($(LINUX_VERSION),3.13.7) - LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f -endif -ifeq ($(LINUX_VERSION),3.14.16) - LINUX_KERNEL_MD5SUM:=469c879236ed694f60b81122e91ca02e -endif # disable the md5sum check for unknown kernel versions LINUX_KERNEL_MD5SUM?=x diff --git a/include/kernel.mk b/include/kernel.mk index ae2dcc3..f3aa395 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -51,7 +51,7 @@ else LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux - LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.xz + LINUX_SOURCE:=linux-$(LINUX_EXT_VERSION).tar.xz TESTING:=$(if $(findstring -rc,$(LINUX_VERSION)),/testing,) ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),) LINUX_SITE:=@KERNEL/linux/kernel/v3.x$(TESTING) diff --git a/include/ltqtapi.mk b/include/ltqtapi.mk index f4d06ad..cf8b550 100644 --- a/include/ltqtapi.mk +++ b/include/ltqtapi.mk @@ -1,12 +1,16 @@ LTQ_TAPI_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-tapi \ TARGET_lantiq_xway:kmod-ltq-vmmc \ + TARGET_lantiq_xrx200:kmod-ltq-tapi \ + TARGET_lantiq_xrx200:kmod-ltq-vmmc \ TARGET_lantiq_falcon:kmod-ltq-tapi \ TARGET_lantiq_falcon:kmod-ltq-vmmc -LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway) +LTQ_TAPI_TARGET:=@(TARGET_lantiq_falcon||TARGET_lantiq_xway||TARGET_lantiq_xrx200) LTQ_TAPI_DEPENDS:=$(LTQ_TAPI_TARGET) \ +TARGET_lantiq_xway:kmod-ltq-tapi \ +TARGET_lantiq_xway:kmod-ltq-vmmc \ + +TARGET_lantiq_xrx200:kmod-ltq-tapi \ + +TARGET_lantiq_xrx200:kmod-ltq-vmmc \ +TARGET_lantiq_falcon:kmod-ltq-tapi \ +TARGET_lantiq_falcon:kmod-ltq-vmmc diff --git a/include/prereq-build.mk b/include/prereq-build.mk index cb23f85..700078e 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -164,9 +164,9 @@ $(eval $(call Require,gnutar, \ Please install GNU tar. \ )) -$(eval $(call RequireCommand,svn, \ - Please install the subversion client. \ -)) +#$(eval $(call RequireCommand,svn, \ +# Please install the subversion client. \ +#)) $(eval $(call RequireCommand,openssl, \ Please install openssl. \ diff --git a/include/toplevel.mk b/include/toplevel.mk index dcde7e2..6949be3 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -6,7 +6,7 @@ # See /LICENSE for more information. # -RELEASE:=Chaos Calmer +RELEASE:=Barrier Breaker PREP_MK= OPENWRT_BUILD= QUIET=0 export IS_TTY=$(shell tty -s && echo 1 || echo 0) diff --git a/include/version.mk b/include/version.mk index c4747f2..2fd605f 100644 --- a/include/version.mk +++ b/include/version.mk @@ -17,31 +17,28 @@ PKG_CONFIG_DEPENDS += \ CONFIG_VERSION_PRODUCT \ CONFIG_VERSION_HWREV \ -qstrip_escape=$(subst ','\'',$(call qstrip,$(1))) -#' +VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),14.07) -VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),$(REVISION)) +VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) +VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Barrier Breaker) -VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) -VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),Bleeding Edge) - -VERSION_NICK:=$(call qstrip_escape,$(CONFIG_VERSION_NICK)) +VERSION_NICK:=$(call qstrip,$(CONFIG_VERSION_NICK)) VERSION_NICK:=$(if $(VERSION_NICK),$(VERSION_NICK),$(RELEASE)) -VERSION_REPO:=$(call qstrip_escape,$(CONFIG_VERSION_REPO)) -VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/snapshots/trunk/%T/packages) +VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO)) +VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/%n/%v/%S/packages) -VERSION_DIST:=$(call qstrip_escape,$(CONFIG_VERSION_DIST)) +VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST)) VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt) -VERSION_MANUFACTURER:=$(call qstrip_escape,$(CONFIG_VERSION_MANUFACTURER)) +VERSION_MANUFACTURER:=$(call qstrip,$(CONFIG_VERSION_MANUFACTURER)) VERSION_MANUFACTURER:=$(if $(VERSION_MANUFACTURER),$(VERSION_MANUFACTURER),OpenWrt) -VERSION_PRODUCT:=$(call qstrip_escape,$(CONFIG_VERSION_PRODUCT)) +VERSION_PRODUCT:=$(call qstrip,$(CONFIG_VERSION_PRODUCT)) VERSION_PRODUCT:=$(if $(VERSION_PRODUCT),$(VERSION_PRODUCT),Generic) -VERSION_HWREV:=$(call qstrip_escape,$(CONFIG_VERSION_HWREV)) +VERSION_HWREV:=$(call qstrip,$(CONFIG_VERSION_HWREV)) VERSION_HWREV:=$(if $(VERSION_HWREV),$(VERSION_HWREV),v0) define taint2sym @@ -83,5 +80,3 @@ VERSION_SED:=$(SED) 's,%U,$(VERSION_REPO),g' \ -e 's,%M,$(VERSION_MANUFACTURER),g' \ -e 's,%P,$(VERSION_PRODUCT),g' \ -e 's,%h,$(VERSION_HWREV),g' - -VERSION_SED_SCRIPT:=$(subst '\'','\'\\\\\'\'',$(VERSION_SED)) -- cgit v1.1