hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oxnas: copy ubinized images to binary folder 

Since r43778 ubinized images are stored inside KDIR. This makes sense
when using an uninized image to generate a factory image.
On oxnas ubinized images were used for sysupgrade before proper NAND
support was implemented in OpenWrt.
For users still on old builds before sysupgrade.tar was introduced,
ubinized image is thus the only option to conveniantly upgrade to a
more recent build.
Copy ubinized image also to BIN_DIR, so it will be easier for users
to find them.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44357 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2015-02-09 12:16:04 +00:00
parent 0bc1bc845f
commit 969192c483
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/oxnas/image/Makefile
View File

@ -89,6 +89,7 @@ endef
define Image/Build/squashfs define Image/Build/squashfs
$(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),$(1),$(KDIR)/fit-$(call sanitize_profile_name).itb) $(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),$(1),$(KDIR)/fit-$(call sanitize_profile_name).itb)
$(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,$(1),$($(PROFILE)_UBI_OPTS)) $(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,$(1),$($(PROFILE)_UBI_OPTS))
cp $(KDIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-squashfs-ubinized.bin $(BIN_DIR)
endef endef
define Image/mkfs/targz define Image/mkfs/targz
@ -101,6 +102,7 @@ define Image/Build/ubifs
ifneq ($($(PROFILE)_UBIFS_OPTS),) ifneq ($($(PROFILE)_UBIFS_OPTS),)
$(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),ubifs,$(KDIR)/fit-$(call sanitize_profile_name).itb) $(call Image/Build/SysupgradeNAND,$(call sanitize_profile_name),ubifs,$(KDIR)/fit-$(call sanitize_profile_name).itb)
$(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,ubifs,$($(PROFILE)_UBI_OPTS)) $(call Image/Build/UbinizeImage,$(call sanitize_profile_name),--uboot-env --kernel $(KDIR)/fit-$(call sanitize_profile_name).itb,ubifs,$($(PROFILE)_UBI_OPTS))
cp $(KDIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-ubifs-ubinized.bin $(BIN_DIR)
endif endif
endef endef