hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: replace uses of OpenWrt with $(VERSION_DIST)

Browse Source 
This makes the distribution name more configurable.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
master
Felix Fietkau 7 years ago
parent ecc347dd6e
commit cde71a543c
11 changed files with 24 additions and 24 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      include/image-commands.mk
  2. 2
      include/image.mk
  3. 2
      target/linux/apm821xx/image/Makefile
  4. 6
      target/linux/ar71xx/image/generic.mk
  5. 14
      target/linux/ar71xx/image/legacy.mk
  6. 2
      target/linux/ath25/image/Makefile
  7. 6
      target/linux/brcm63xx/image/bcm63xx.mk
  8. 4
      target/linux/cns3xxx/image/Makefile
  9. 2
      target/linux/lantiq/image/Makefile
  10. 2
      target/linux/mcs814x/image/Makefile
  11. 2
      target/linux/ramips/image/Makefile

6
include/image-commands.mk
Unescape View File

@ -7,7 +7,7 @@ define Build/uImage
mkimage -A $(LINUX_KARCH) \ mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \ -O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION))' -d $@ $@.new -n '$(if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION))' -d $@ $@.new
mv $@.new $@ mv $@.new $@
endef endef
@ -60,7 +60,7 @@ endef
define Build/netgear-dni define Build/netgear-dni
$(STAGING_DIR_HOST)/bin/mkdniimg \ $(STAGING_DIR_HOST)/bin/mkdniimg \
-B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ -B $(NETGEAR_BOARD_ID) -v $(VERSION_DIST).$(REVISION) \
$(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \
-r "$(1)" \ -r "$(1)" \
-i $@ -o $@.new -i $@ -o $@.new
@ -83,7 +83,7 @@ define Build/append-uImage-fakeroot-hdr
rm -f $@.fakeroot rm -f $@.fakeroot
$(STAGING_DIR_HOST)/bin/mkimage \ $(STAGING_DIR_HOST)/bin/mkimage \
-A $(LINUX_KARCH) -O linux -T filesystem -C none \ -A $(LINUX_KARCH) -O linux -T filesystem -C none \
-n '$(call toupper,$(LINUX_KARCH)) OpenWrt fakeroot' \ -n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) fakeroot' \
-s \ -s \
$@.fakeroot $@.fakeroot
cat $@.fakeroot >> $@ cat $@.fakeroot >> $@

2
include/image.mk
Unescape View File

@ -136,7 +136,7 @@ endef
define Image/BuildKernel/MkuImage define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \ mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5) -n '$(call toupper,$(ARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $(4) $(5)
endef endef
define Image/BuildKernel/MkFIT define Image/BuildKernel/MkFIT

2
target/linux/apm821xx/image/Makefile
Unescape View File

@ -118,7 +118,7 @@ define Build/create-uImage-dtb
# flat_dt target expect FIT image - which WNDR4700's uboot doesn't support # flat_dt target expect FIT image - which WNDR4700's uboot doesn't support
-$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \ -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
-O linux -T kernel -C none \ -O linux -T kernel -C none \
-n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' \ -n '$(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-d $(IMAGE_KERNEL).dtb $@.new -d $(IMAGE_KERNEL).dtb $@.new
@mv $@.new $@ @mv $@.new $@
endef endef

6
target/linux/ar71xx/image/generic.mk
Unescape View File

@ -28,7 +28,7 @@ define Build/mkwrggimg
$(STAGING_DIR_HOST)/bin/mkwrggimg -b \ $(STAGING_DIR_HOST)/bin/mkwrggimg -b \
-i $@ -o $@.imghdr -d /dev/mtdblock/1 \ -i $@ -o $@.imghdr -d /dev/mtdblock/1 \
-m $(BOARDNAME) -s $(DAP_SIGNATURE) \ -m $(BOARDNAME) -s $(DAP_SIGNATURE) \
-v OpenWrt -B $(REVISION) -v $(VERSION_DIST) -B $(REVISION)
mv $@.imghdr $@ mv $@.imghdr $@
endef endef
@ -46,7 +46,7 @@ define Build/netgear-squashfs
-A mips -O linux -T filesystem -C none \ -A mips -O linux -T filesystem -C none \
-M $(NETGEAR_KERNEL_MAGIC) \ -M $(NETGEAR_KERNEL_MAGIC) \
-a 0xbf070000 -e 0xbf070000 \ -a 0xbf070000 -e 0xbf070000 \
-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ -n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-d $@.squashfs $@ -d $@.squashfs $@
rm -rf $@.squashfs $@.fs rm -rf $@.squashfs $@.fs
endef endef
@ -93,7 +93,7 @@ define Build/uImageHiWiFi
mkimage -A $(LINUX_KARCH) \ mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \ -O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-n 'tw150v1 $(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new -n 'tw150v1 $(call toupper,$(LINUX_KARCH)) $(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $@ $@.new
@mv $@.new $@ @mv $@.new $@
endef endef

14
target/linux/ar71xx/image/legacy.mk
Unescape View File

@ -87,7 +87,7 @@ ifneq ($(SUBTARGET),mikrotik)
# $(4): output file. # $(4): output file.
define MkuImage define MkuImage
mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \ mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \
-e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ -e 0x80060000 -n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-d $(3) $(4) -d $(3) $(4)
endef endef
@ -484,11 +484,11 @@ define Image/Build/Belkin
$(eval rootsize=$(call mtdpartsize,rootfs,$(4))) $(eval rootsize=$(call mtdpartsize,rootfs,$(4)))
$(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize)) $(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \ if [ -e "$(call sysupname,$(1),$(2))" ]; then \
edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \ edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \
-n "uImage" \ -n "uImage" \
-i $(KDIR_TMP)/vmlinux-$(2).uImage \ -i $(KDIR_TMP)/vmlinux-$(2).uImage \
-o $(KDIR_TMP)/$(2)-uImage; \ -o $(KDIR_TMP)/$(2)-uImage; \
edimax_fw_header -m $(5) -v "$(shell echo -n OpenWrt$(REVISION) | cut -c -13)" \ edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \
-n "rootfs" \ -n "rootfs" \
-i $(KDIR)/root.$(1) \ -i $(KDIR)/root.$(1) \
-o $(KDIR_TMP)/$(2)-rootfs; \ -o $(KDIR_TMP)/$(2)-rootfs; \
@ -661,7 +661,7 @@ define Image/Build/Netgear/buildkernel
) > $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 ) > $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2
mkimage -A mips -O linux -T filesystem -C none -M $(5) \ mkimage -A mips -O linux -T filesystem -C none -M $(5) \
-a 0xbf070000 -e 0xbf070000 \ -a 0xbf070000 -e 0xbf070000 \
-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ -n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
-d $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 \ -d $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 \
$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs
endef endef
@ -673,7 +673,7 @@ define Image/Build/Netgear
for r in $(7) ; do \ for r in $(7) ; do \
[ -n "$$r" ] && dashr="-$$r" || dashr= ; \ [ -n "$$r" ] && dashr="-$$r" || dashr= ; \
$(STAGING_DIR_HOST)/bin/mkdniimg \ $(STAGING_DIR_HOST)/bin/mkdniimg \
-B $(6) -v OpenWrt.$(REVISION) -r "$$r" $(8) \ -B $(6) -v $(VERSION_DIST).$(REVISION) -r "$$r" $(8) \
-i $(call sysupname,$(1),$(2)) \ -i $(call sysupname,$(1),$(2)) \
-o $(call imgname,$(1),$(2))-factory$$dashr.img; \ -o $(call imgname,$(1),$(2))-factory$$dashr.img; \
done; \ done; \
@ -714,7 +714,7 @@ define Image/Build/NetgearNAND/buildkernel
dd if=/dev/zero of=$(KDIR_TMP)/fakeroot-$(2) bs=131072 count=1 dd if=/dev/zero of=$(KDIR_TMP)/fakeroot-$(2) bs=131072 count=1
mkimage -A mips -O linux -T filesystem -C none \ mkimage -A mips -O linux -T filesystem -C none \
-a 0xbf070000 -e 0xbf070000 \ -a 0xbf070000 -e 0xbf070000 \
-n 'MIPS OpenWrt fakeroot' \ -n 'MIPS $(VERSION_DIST) fakeroot' \
-d $(KDIR_TMP)/fakeroot-$(2) \ -d $(KDIR_TMP)/fakeroot-$(2) \
-M $(5) \ -M $(5) \
$(KDIR_TMP)/fakeroot-$(2).uImage $(KDIR_TMP)/fakeroot-$(2).uImage
@ -745,7 +745,7 @@ define Image/Build/NetgearNAND
dd if=$(KDIR_TMP)/$(2)-root.ubi \ dd if=$(KDIR_TMP)/$(2)-root.ubi \
) > $(imageraw) ) > $(imageraw)
$(STAGING_DIR_HOST)/bin/mkdniimg \ $(STAGING_DIR_HOST)/bin/mkdniimg \
-B $(6) -v OpenWrt.$(REVISION) -r "$$r" $(8) \ -B $(6) -v $(VERSION_DIST).$(REVISION) -r "$$r" $(8) \
-i $(imageraw) \ -i $(imageraw) \
-o $(call imgname,ubi,$(2))-factory.img -o $(call imgname,ubi,$(2))-factory.img

2
target/linux/ath25/image/Makefile
Unescape View File

@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
define Build/mkfwimage define Build/mkfwimage
$(STAGING_DIR_HOST)/bin/mkfwimage \ $(STAGING_DIR_HOST)/bin/mkfwimage \
-B $(1).OpenWrt.$(REVISION) \ -B $(1).$(VERSION_DIST).$(REVISION) \
-k $(IMAGE_KERNEL) \ -k $(IMAGE_KERNEL) \
-r $(IMAGE_ROOTFS) \ -r $(IMAGE_ROOTFS) \
-o $@.new && \ -o $@.new && \

6
target/linux/brcm63xx/image/bcm63xx.mk
Unescape View File

@ -990,7 +990,7 @@ define Device/NEUFBOX4-SER
DEVICE_DTS := nb4-ser-r0 DEVICE_DTS := nb4-ser-r0
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -1002,7 +1002,7 @@ define Device/NEUFBOX4-FXC
DEVICE_DTS := nb4-fxc-r1 DEVICE_DTS := nb4-fxc-r1
CFE_BOARD_ID := 96358VW CFE_BOARD_ID := 96358VW
CFE_CHIP_ID := 6358 CFE_CHIP_ID := 6358
CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef
@ -1014,7 +1014,7 @@ define Device/NEUFBOX6
DEVICE_DTS := nb6-ser-r0 DEVICE_DTS := nb6-ser-r0
CFE_BOARD_ID := NB6-SER-r0 CFE_BOARD_ID := NB6-SER-r0
CFE_CHIP_ID := 6362 CFE_CHIP_ID := 6362
CFE_EXTRAS += --rsa-signature "OpenWrt-$(firstword $(subst -,$(space),$(REVISION)))" CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
$(B43_PACKAGES) $(USB2_PACKAGES) $(B43_PACKAGES) $(USB2_PACKAGES)
endef endef

4
target/linux/cns3xxx/image/Makefile
Unescape View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
define Image/Prepare define Image/Prepare
mkimage -A arm -O linux -T kernel -C none -a 0x20008000 -e 0x20008000 -n 'OpenWrt Linux-$(LINUX_VERSION)' -d $(KDIR)/zImage $(KDIR)/uImage mkimage -A arm -O linux -T kernel -C none -a 0x20008000 -e 0x20008000 -n '$(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $(KDIR)/zImage $(KDIR)/uImage
endef endef
LEGACY_NOR_KERNEL_SIZE = 2048k LEGACY_NOR_KERNEL_SIZE = 2048k
@ -27,7 +27,7 @@ define BuildFirmware/Legacy
endef endef
define Image/BuildKernel/Initramfs define Image/BuildKernel/Initramfs
mkimage -A arm -O linux -T kernel -C none -a 0x20008000 -e 0x20008000 -n 'OpenWrt Linux-$(LINUX_VERSION)' -d $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-initramfs-uImage mkimage -A arm -O linux -T kernel -C none -a 0x20008000 -e 0x20008000 -n '$(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-initramfs-uImage
endef endef
define Image/Build define Image/Build

2
target/linux/lantiq/image/Makefile
Unescape View File

@ -39,7 +39,7 @@ endef
define Build/fullimage define Build/fullimage
mkimage -A mips -O linux -C lzma -T filesystem -a 0x00 \ mkimage -A mips -O linux -C lzma -T filesystem -a 0x00 \
-e 0x00 -n 'OpenWrt RootFS' \ -e 0x00 -n '$(VERSION_DIST) RootFS' \
-d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new -d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new
cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp

2
target/linux/mcs814x/image/Makefile
Unescape View File

@ -20,7 +20,7 @@ UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
define Image/Build/MkuImage define Image/Build/MkuImage
mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \ mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \
-n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2); -n 'ARM $(VERSION_DIST) Linux-$(LINUX_VERSION)' -d $(1) $(2);
endef endef
define Image/Build/DTB define Image/Build/DTB

2
target/linux/ramips/image/Makefile
Unescape View File

@ -118,7 +118,7 @@ endef
# $(2), filename of image data # $(2), filename of image data
# $(3), output filename # $(3), output filename
define MkImage define MkImage
$(eval imagename=$(if $(4),$(4),MIPS OpenWrt Linux-$(LINUX_VERSION))) $(eval imagename=$(if $(4),$(4),MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)))
-mkimage -A mips -O linux -T kernel -C $(1) -a $(loadaddr-y) -e $(loadaddr-y) \ -mkimage -A mips -O linux -T kernel -C $(1) -a $(loadaddr-y) -e $(loadaddr-y) \
-n "$(imagename)" \ -n "$(imagename)" \
-d $(2) $(3) -d $(2) $(3)

Write Preview
Loading…
Cancel
Save