projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: allow overriding default selection state for devices
[openwrt/openwrt.git]
/
include
/
image.mk
diff --git
a/include/image.mk
b/include/image.mk
index 5d93a42c6283322d3645f16c4980ffa16e537afe..1538d83df341dc1467c9ab3de256cd44476bdfb6 100644
(file)
--- a/
include/image.mk
+++ b/
include/image.mk
@@
-154,10
+154,10
@@
endif
# Disable noisy checks by default as in upstream
# Disable noisy checks by default as in upstream
-ifeq ($(strip $(call kernel_patchver_ge,4.
6
.0)),1)
+ifeq ($(strip $(call kernel_patchver_ge,4.
7
.0)),1)
DTC_FLAGS += -Wno-unit_address_vs_reg
endif
DTC_FLAGS += -Wno-unit_address_vs_reg
endif
-ifeq ($(strip $(call kernel_patchver_ge,4.1
1
.0)),1)
+ifeq ($(strip $(call kernel_patchver_ge,4.1
2
.0)),1)
DTC_FLAGS += \
-Wno-unit_address_vs_reg \
-Wno-simple_bus_reg \
DTC_FLAGS += \
-Wno-unit_address_vs_reg \
-Wno-simple_bus_reg \
@@
-166,12
+166,12
@@
ifeq ($(strip $(call kernel_patchver_ge,4.11.0)),1)
-Wno-pci_device_bus_num \
-Wno-pci_device_reg
endif
-Wno-pci_device_bus_num \
-Wno-pci_device_reg
endif
-ifeq ($(strip $(call kernel_patchver_ge,4.1
6
.0)),1)
+ifeq ($(strip $(call kernel_patchver_ge,4.1
7
.0)),1)
DTC_FLAGS += \
-Wno-avoid_unnecessary_addr_size \
-Wno-alias_paths
endif
DTC_FLAGS += \
-Wno-avoid_unnecessary_addr_size \
-Wno-alias_paths
endif
-ifeq ($(strip $(call kernel_patchver_ge,4.1
7
.0)),1)
+ifeq ($(strip $(call kernel_patchver_ge,4.1
8
.0)),1)
DTC_FLAGS += \
-Wno-graph_child_address \
-Wno-graph_port \
DTC_FLAGS += \
-Wno-graph_child_address \
-Wno-graph_port \
@@
-229,8
+229,7
@@
define Image/mkfs/squashfs
$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
-nopad -noappend -root-owned \
-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
$(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \
-nopad -noappend -root-owned \
-comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \
- -processors 1 \
- $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
+ -processors 1
endef
# $(1): board name
endef
# $(1): board name
@@
-292,7
+291,7
@@
endef
ifdef CONFIG_TARGET_ROOTFS_TARGZ
define Image/Build/targz
ifdef CONFIG_TARGET_ROOTFS_TARGZ
define Image/Build/targz
- $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
+ $(TAR) -cp --numeric-owner --owner=0 --group=0 --
mode=a-s --
sort=name \
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
endef
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
endef
@@
-384,6
+383,10
@@
define Device/Init
IMAGE_METADATA :=
FILESYSTEMS := $(TARGET_FILESYSTEMS)
IMAGE_METADATA :=
FILESYSTEMS := $(TARGET_FILESYSTEMS)
+
+ UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-$(1)
+
+ DEFAULT :=
endef
DEFAULT_DEVICE_VARS := \
endef
DEFAULT_DEVICE_VARS := \
@@
-391,7
+394,7
@@
DEFAULT_DEVICE_VARS := \
CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \
CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \
- IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR
+ IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR
UBOOT_PATH
define Device/ExportVar
$(1) : $(2):=$$($(2))
define Device/ExportVar
$(1) : $(2):=$$($(2))
@@
-558,6
+561,9
@@
define Device/DumpInfo
Target-Profile: DEVICE_$(1)
Target-Profile-Name: $(DEVICE_TITLE)
Target-Profile-Packages: $(DEVICE_PACKAGES)
Target-Profile: DEVICE_$(1)
Target-Profile-Name: $(DEVICE_TITLE)
Target-Profile-Packages: $(DEVICE_PACKAGES)
+Target-Profile-hasImageMetadata: $(if $(foreach image,$(IMAGES),$(findstring append-metadata,$(IMAGE/$(image)))),1,0)
+Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES)
+$(if $(DEFAULT),Target-Profile-Default: $(DEFAULT))
Target-Profile-Description:
$(DEVICE_DESCRIPTION)
@@
Target-Profile-Description:
$(DEVICE_DESCRIPTION)
@@
@@
-607,7
+613,7
@@
define BuildImage
$(call Image/Prepare)
legacy-images-prepare-make: image_prepare
$(call Image/Prepare)
legacy-images-prepare-make: image_prepare
- $(MAKE) legacy-images-prepare
+ $(MAKE) legacy-images-prepare
BIN_DIR="$(BIN_DIR)"
else
image_prepare:
else
image_prepare:
@@
-631,7
+637,7
@@
define BuildImage
legacy-images-make: install-images
$(call Image/mkfs/ubifs/legacy)
legacy-images-make: install-images
$(call Image/mkfs/ubifs/legacy)
- $(MAKE) legacy-images
+ $(MAKE) legacy-images
BIN_DIR="$(BIN_DIR)"
install: install-images
$(call Image/Manifest)
install: install-images
$(call Image/Manifest)