From: Daniel Dickinson <open...@daniel.thecshore.com>
Minor fixes so that the former 'Default' profile (now All)
not only builds all profiles but acts correctly in the
new multi-profile build machinery/menuconfig
Signed-off-by: Daniel Dickinson <open...@daniel.thecshore.com>
---
target/linux/ramips/image/Makefile | 12 ++++++------
target/linux/ramips/mt7620/profiles/00-default.mk | 1 +
target/linux/ramips/mt7620/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/mt7621/profiles/00-default.mk | 1 +
target/linux/ramips/mt7621/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/mt7628/profiles/00-default.mk | 1 +
target/linux/ramips/mt7628/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/mt7688/profiles/00-default.mk | 1 +
target/linux/ramips/mt7688/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/mt7688/profiles/01-mediatek.mk | 18 ------------------
target/linux/ramips/mt7688/profiles/02-mediatek.mk | 18 ++++++++++++++++++
target/linux/ramips/rt288x/profiles/00-default.mk | 1 +
target/linux/ramips/rt288x/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/rt305x/profiles/00-default.mk | 1 +
target/linux/ramips/rt305x/profiles/01-all.mk | 15 +++++++++++++++
target/linux/ramips/rt3883/profiles/00-default.mk | 1 +
target/linux/ramips/rt3883/profiles/01-all.mk | 16 ++++++++++++++++
17 files changed, 137 insertions(+), 24 deletions(-)
create mode 100644 target/linux/ramips/mt7620/profiles/01-all.mk
create mode 100644 target/linux/ramips/mt7621/profiles/01-all.mk
create mode 100644 target/linux/ramips/mt7628/profiles/01-all.mk
create mode 100644 target/linux/ramips/mt7688/profiles/01-all.mk
delete mode 100644 target/linux/ramips/mt7688/profiles/01-mediatek.mk
create mode 100644 target/linux/ramips/mt7688/profiles/02-mediatek.mk
create mode 100644 target/linux/ramips/rt288x/profiles/01-all.mk
create mode 100644 target/linux/ramips/rt305x/profiles/01-all.mk
create mode 100644 target/linux/ramips/rt3883/profiles/01-all.mk
diff --git a/target/linux/ramips/image/Makefile
b/target/linux/ramips/image/Makefile
index b58ca7e..ee6f325 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -448,7 +448,7 @@ Image/Build/Profile/WLITX4AG300N=$(call
BuildFirmware/Default4M/$(1),$(1),wli-tx
Image/Build/Profile/WZRAGL300NH=$(call
BuildFirmware/Default4M/$(1),$(1),wzr-agl300nh,WZR-AGL300NH)
ifeq ($(SUBTARGET),rt288x)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/AR670W,$(1))
$(call Image/Build/Profile/AR725W,$(1))
$(call Image/Build/Profile/F5D8235V1,$(1))
@@ -749,7 +749,7 @@ Image/Build/Profile/X8=$(call
BuildFirmware/Poray8M/$(1),$(1),x8,X8)
Image/Build/Profile/XDXRN502J=$(call
BuildFirmware/Default4M/$(1),$(1),xdxrn502j,XDXRN502J)
ifeq ($(SUBTARGET),rt305x)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/3G6200N,$(1))
$(call Image/Build/Profile/3G6200NL,$(1))
$(call Image/Build/Profile/3G150B,$(1))
@@ -897,7 +897,7 @@ rootfs_size_BR6475ND:=5832704
Image/Build/Profile/BR6475ND=$(call
BuildFirmware/EdimaxCombined/$(1),$(1),br-6475nd,BR-6475ND,$(kernel_size_BR6475ND),$(rootfs_size_BR6475ND),CSYS,RN54,0x70000,0x01100000)
ifeq ($(SUBTARGET),rt3883)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/CYSWR1100,$(1))
$(call Image/Build/Profile/DIR645,$(1))
$(call Image/Build/Profile/HPM,$(1))
@@ -956,7 +956,7 @@ Image/Build/Profile/TINY-AC=$(call
BuildFirmware/Default8M/$(1),$(1),tiny-ac,TIN
ifeq ($(SUBTARGET),mt7620)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/E1700,$(1))
$(call Image/Build/Profile/MT7620a,$(1))
$(call Image/Build/Profile/MT7620a_MT7610e,$(1))
@@ -1091,7 +1091,7 @@ Image/Build/Profile/MT7628=$(call
BuildFirmware/Default4M/$(1),$(1),mt7628,MT762
Image/Build/Profile/WRTNODE2P=$(call
BuildFirmware/Default16M/$(1),$(1),wrtnode2p,WRTNODE2P)
ifeq ($(SUBTARGET),mt7628)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/MT7628,$(1))
$(call Image/Build/Profile/WRTNODE2P,$(1))
endef
@@ -1106,7 +1106,7 @@ Image/Build/Profile/LinkIt7688=$(call
BuildFirmware/Default32M/$(1),$(1),LinkIt7
Image/Build/Profile/WRTNODE2R=$(call
BuildFirmware/Default16M/$(1),$(1),wrtnode2r,WRTNODE2R)
ifeq ($(SUBTARGET),mt7688)
-define Image/Build/Profile/Default
+define Image/Build/Profile/All
$(call Image/Build/Profile/LinkIt7688,$(1))
$(call Image/Build/Profile/WRTNODE2R,$(1))
endef
diff --git a/target/linux/ramips/mt7620/profiles/00-default.mk
b/target/linux/ramips/mt7620/profiles/00-default.mk
index 6c7d721..b86d541 100644
--- a/target/linux/ramips/mt7620/profiles/00-default.mk
+++ b/target/linux/ramips/mt7620/profiles/00-default.mk
@@ -10,6 +10,7 @@ define Profile/Default
PACKAGES:=\
kmod-usb-core kmod-usb2 kmod-usb-ohci \
kmod-ledtrig-usbdev
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/mt7620/profiles/01-all.mk
b/target/linux/ramips/mt7620/profiles/01-all.mk
new file mode 100644
index 0000000..ed1ab0d
--- /dev/null
+++ b/target/linux/ramips/mt7620/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Build images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/mt7621/profiles/00-default.mk
b/target/linux/ramips/mt7621/profiles/00-default.mk
index fb04ba7..8f537cc 100644
--- a/target/linux/ramips/mt7621/profiles/00-default.mk
+++ b/target/linux/ramips/mt7621/profiles/00-default.mk
@@ -10,6 +10,7 @@ define Profile/Default
PACKAGES:=\
kmod-usb-core kmod-usb3 \
kmod-ledtrig-usbdev
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/mt7621/profiles/01-all.mk
b/target/linux/ramips/mt7621/profiles/01-all.mk
new file mode 100644
index 0000000..ed1ab0d
--- /dev/null
+++ b/target/linux/ramips/mt7621/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Build images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/mt7628/profiles/00-default.mk
b/target/linux/ramips/mt7628/profiles/00-default.mk
index 6c7d721..b86d541 100644
--- a/target/linux/ramips/mt7628/profiles/00-default.mk
+++ b/target/linux/ramips/mt7628/profiles/00-default.mk
@@ -10,6 +10,7 @@ define Profile/Default
PACKAGES:=\
kmod-usb-core kmod-usb2 kmod-usb-ohci \
kmod-ledtrig-usbdev
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/mt7628/profiles/01-all.mk
b/target/linux/ramips/mt7628/profiles/01-all.mk
new file mode 100644
index 0000000..86d75a0
--- /dev/null
+++ b/target/linux/ramips/mt7628/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Builds images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/mt7688/profiles/00-default.mk
b/target/linux/ramips/mt7688/profiles/00-default.mk
index 6c7d721..b86d541 100644
--- a/target/linux/ramips/mt7688/profiles/00-default.mk
+++ b/target/linux/ramips/mt7688/profiles/00-default.mk
@@ -10,6 +10,7 @@ define Profile/Default
PACKAGES:=\
kmod-usb-core kmod-usb2 kmod-usb-ohci \
kmod-ledtrig-usbdev
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/mt7688/profiles/01-all.mk
b/target/linux/ramips/mt7688/profiles/01-all.mk
new file mode 100644
index 0000000..ed1ab0d
--- /dev/null
+++ b/target/linux/ramips/mt7688/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Build images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/mt7688/profiles/01-mediatek.mk
b/target/linux/ramips/mt7688/profiles/01-mediatek.mk
deleted file mode 100644
index 1ef824d..0000000
--- a/target/linux/ramips/mt7688/profiles/01-mediatek.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/LinkIt7688
- NAME:=LinkIt7688
- PACKAGES:=\
- kmod-usb-core kmod-usb2 kmod-usb-ohci \
- uboot-envtools kmod-ledtrig-netdev
-endef
-
-define Profile/LinkIt7688/Description
- Default package set compatible with LinkIt Smart7688 dev board.
-endef
-$(eval $(call Profile,LinkIt7688))
diff --git a/target/linux/ramips/mt7688/profiles/02-mediatek.mk
b/target/linux/ramips/mt7688/profiles/02-mediatek.mk
new file mode 100644
index 0000000..1ef824d
--- /dev/null
+++ b/target/linux/ramips/mt7688/profiles/02-mediatek.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/LinkIt7688
+ NAME:=LinkIt7688
+ PACKAGES:=\
+ kmod-usb-core kmod-usb2 kmod-usb-ohci \
+ uboot-envtools kmod-ledtrig-netdev
+endef
+
+define Profile/LinkIt7688/Description
+ Default package set compatible with LinkIt Smart7688 dev board.
+endef
+$(eval $(call Profile,LinkIt7688))
diff --git a/target/linux/ramips/rt288x/profiles/00-default.mk
b/target/linux/ramips/rt288x/profiles/00-default.mk
index 583610a..3dd63cd 100644
--- a/target/linux/ramips/rt288x/profiles/00-default.mk
+++ b/target/linux/ramips/rt288x/profiles/00-default.mk
@@ -8,6 +8,7 @@
define Profile/Default
NAME:=Default Profile
PACKAGES:=kmod-switch-rtl8366s kmod-swconfig swconfig
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/rt288x/profiles/01-all.mk
b/target/linux/ramips/rt288x/profiles/01-all.mk
new file mode 100644
index 0000000..3857963
--- /dev/null
+++ b/target/linux/ramips/rt288x/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Build images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/rt305x/profiles/00-default.mk
b/target/linux/ramips/rt305x/profiles/00-default.mk
index a905d1e..334f155 100644
--- a/target/linux/ramips/rt305x/profiles/00-default.mk
+++ b/target/linux/ramips/rt305x/profiles/00-default.mk
@@ -10,6 +10,7 @@ define Profile/Default
PACKAGES:=\
kmod-usb-core kmod-usb-dwc2 \
kmod-ledtrig-usbdev
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/rt305x/profiles/01-all.mk
b/target/linux/ramips/rt305x/profiles/01-all.mk
new file mode 100644
index 0000000..ed1ab0d
--- /dev/null
+++ b/target/linux/ramips/rt305x/profiles/01-all.mk
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+endef
+
+define Profile/All/Description
+ Build images for all profiles
+endef
+$(eval $(call Profile,All))
diff --git a/target/linux/ramips/rt3883/profiles/00-default.mk
b/target/linux/ramips/rt3883/profiles/00-default.mk
index 7007c5d..ad04a57 100644
--- a/target/linux/ramips/rt3883/profiles/00-default.mk
+++ b/target/linux/ramips/rt3883/profiles/00-default.mk
@@ -8,6 +8,7 @@
define Profile/Default
NAME:=Default Profile
PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
+ PROFILE_SKIP_DEFAULT:=1
endef
define Profile/Default/Description
diff --git a/target/linux/ramips/rt3883/profiles/01-all.mk
b/target/linux/ramips/rt3883/profiles/01-all.mk
new file mode 100644
index 0000000..bd2a425
--- /dev/null
+++ b/target/linux/ramips/rt3883/profiles/01-all.mk
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/All
+ NAME:=All Profiles
+ PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
+endef
+
+define Profile/All/Description
+ Builds images for all profiles
+endef
+$(eval $(call Profile,All))
--
2.4.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
