Simplify the ImageBuilder repackaging, and a few enhancements
This commit is contained in:
Justin Liu
3
.gitignore
vendored
3
.gitignore
vendored
@@ -6,6 +6,3 @@
|
||||
/.checkout_svn
|
||||
/.check_hostdeps
|
||||
/config
|
||||
/ImageBuilder/.patched
|
||||
/ImageBuilder/OpenWrt-ImageBuilder-*
|
||||
/ImageBuilder/OpenWrt-SDK-*
|
||||
|
||||
3
ImageBuilder/.gitignore
vendored
Normal file
3
ImageBuilder/.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
/.patched
|
||||
/OpenWrt-ImageBuilder-*
|
||||
/OpenWrt-SDK-*
|
||||
@@ -1,51 +1,15 @@
|
||||
|
||||
BUILDER ?= OpenWrt-ImageBuilder-ramips_mt7620a-for-linux-x86_64
|
||||
SDK ?= OpenWrt-SDK-ramips-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2
|
||||
BUILDER := OpenWrt-ImageBuilder-ramips_mt7620a-for-linux-x86_64
|
||||
SDK := OpenWrt-SDK-ramips-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2
|
||||
FULL ?= 1
|
||||
|
||||
OPKG_PACKAGES := 6in4 6to4 blkid curl ethtool ip ip6tables-extra ip6tables-mod-nat \
|
||||
iperf-mt ipset iptables-mod-conntrack-extra iptables-mod-extra iptables-mod-filter \
|
||||
iptables-mod-ipopt iptables-mod-nat-extra iwinfo kmod-crypto-deflate kmod-crypto-des \
|
||||
kmod-crypto-ecb kmod-crypto-hmac kmod-crypto-manager kmod-crypto-md4 kmod-crypto-md5 \
|
||||
kmod-crypto-pcompress kmod-crypto-sha1 kmod-crypto-sha256 kmod-dnsresolver kmod-fs-cifs \
|
||||
kmod-fs-ext4 kmod-fs-hfs kmod-fs-nfs kmod-fs-nfs-common kmod-fs-ntfs kmod-fs-vfat \
|
||||
kmod-fuse kmod-gre kmod-ifb kmod-ip6-tunnel kmod-ip6tables-extra kmod-ipip\
|
||||
kmod-ipt-conntrack-extra kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipset \
|
||||
kmod-ipt-nat-extra kmod-ipt-nat6 kmod-ipt-nathelper-extra kmod-iptunnel kmod-iptunnel4 \
|
||||
kmod-iptunnel6 kmod-l2tp kmod-ledtrig-gpio kmod-lib-textsearch kmod-lib-zlib \
|
||||
kmod-macvlan kmod-mppe kmod-nfnetlink kmod-nls-cp437 kmod-nls-iso8859-1 kmod-nls-utf8 \
|
||||
kmod-pppol2tp kmod-pptp kmod-sched-connmark kmod-sched-core kmod-sit kmod-tun \
|
||||
kmod-usb-ohci kmod-usb-printer kmod-usb-storage iptables-mod-tproxy kmod-ipt-tproxy \
|
||||
libcurl libdaemon libevent2 libiwinfo libiwinfo-lua libjson liblua liblzo libmnl \
|
||||
libncurses libopenssl libpolarssl libpthread librt libubus-lua libuci-lua lua luci \
|
||||
luci-app-firewall luci-app-samba luci-base luci-i18n-chinese luci-i18n-english \
|
||||
luci-lib-json luci-lib-nixio luci-mod-admin-full luci-proto-ipv6 luci-proto-ppp \
|
||||
luci-theme-bootstrap ntfs-3g openvpn-openssl ppp-mod-pppol2tp ppp-mod-pptp resolveip \
|
||||
samba36-server tc terminfo uclibcxx uhttpd uhttpd-mod-ubus zlib pdnsd pptpd xl2tpd \
|
||||
block-mount mountd ppp-mod-pppoe e2fsprogs
|
||||
EXTRA_PACKAGES := kmod-tun \
|
||||
iptables-mod-conntrack-extra iptables-mod-extra iptables-mod-filter \
|
||||
iptables-mod-nat-extra ip6tables-extra ip6tables-mod-nat \
|
||||
ip ipset ppp-mod-pppol2tp ppp-mod-pptp xl2tpd pptpd curl ethtool \
|
||||
luci-i18n-chinese luci-i18n-english
|
||||
|
||||
OPKG_PACKAGES_HC5661 :=
|
||||
OPKG_PACKAGES_HC5761 :=
|
||||
OPKG_PACKAGES_HC5861 :=
|
||||
PREPARED_TARGETS = $(BUILDER) $(SDK) .check_ib .patched
|
||||
|
||||
# A single option for enabling all options
|
||||
ifeq ($(FULL),1)
|
||||
RALINK := 1
|
||||
FEEDS := 1
|
||||
WIFI := 1
|
||||
endif
|
||||
# Check each option for selection of packages and dependencies
|
||||
ifeq ($(RALINK),1)
|
||||
OPKG_PACKAGES_HC5761 += 8021xd uci2dat kmod-mt7610e luci-mtk-wifi
|
||||
OPKG_PACKAGES_HC5861 += 8021xd uci2dat kmod-mt76x2e luci-mtk-wifi
|
||||
PREPARED_TARGETS += .check_sdk .ralink
|
||||
endif
|
||||
ifeq ($(FEEDS),1)
|
||||
OPKG_PACKAGES += ipset-lists minivtun shadowsocks-libev shadowsocks-tools dnsmasq-full \
|
||||
file-storage dnspod-utils kmod-proto-bridge kmod-yavlan
|
||||
PREPARED_TARGETS += .check_sdk .feeds
|
||||
endif
|
||||
all: HC5661 HC5761 HC5861
|
||||
|
||||
define BeforeBuildImage
|
||||
mkdir -p $(BUILDER)/dl
|
||||
@@ -56,95 +20,46 @@ define BeforeBuildImage
|
||||
cp -f opkg.conf $(BUILDER)/target/linux/ramips/base-files/etc/opkg.conf
|
||||
endef
|
||||
|
||||
define EnableWireless
|
||||
@[ -n "$(WIFI)" ] || exit 0; \
|
||||
F=$(shell echo $(1)); openwrt-repack.sh $$F -w -o $$F.out && mv -vf $$F.out $$F
|
||||
endef
|
||||
|
||||
all: HC5661 HC5761 HC5861
|
||||
|
||||
HC5661: $(PREPARED_TARGETS)
|
||||
HC5661: patch_ib
|
||||
$(call BeforeBuildImage)
|
||||
make -C $(BUILDER) image PROFILE=HC5661 \
|
||||
FILES="$(shell cd $(BUILDER); pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(OPKG_PACKAGES) $(OPKG_PACKAGES_HC5661)"
|
||||
$(call EnableWireless,$(shell echo $(BUILDER)/bin/ramips/openwrt-*-hc5661-*-sysupgrade.bin))
|
||||
$(MAKE) -C $(BUILDER) image PROFILE=HC5661 \
|
||||
FILES="$(shell cd $(BUILDER) && pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(EXTRA_PACKAGES)"
|
||||
|
||||
HC5761: $(PREPARED_TARGETS)
|
||||
HC5761: patch_ib build_drivers
|
||||
$(call BeforeBuildImage)
|
||||
make -C $(BUILDER) image PROFILE=HC5761 \
|
||||
FILES="$(shell cd $(BUILDER); pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(OPKG_PACKAGES) $(OPKG_PACKAGES_HC5761)"
|
||||
$(call EnableWireless,$(shell echo $(BUILDER)/bin/ramips/openwrt-*-hc5761-*-sysupgrade.bin))
|
||||
$(MAKE) -C $(BUILDER) image PROFILE=HC5761 \
|
||||
FILES="$(shell cd $(BUILDER) && pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(EXTRA_PACKAGES) 8021xd uci2dat kmod-mt7610e luci-mtk-wifi"
|
||||
|
||||
HC5861: $(PREPARED_TARGETS)
|
||||
HC5861: patch_ib build_drivers
|
||||
$(call BeforeBuildImage)
|
||||
make -C $(BUILDER) image PROFILE=HC5861 \
|
||||
FILES="$(shell cd $(BUILDER); pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(OPKG_PACKAGES) $(OPKG_PACKAGES_HC5861)"
|
||||
$(call EnableWireless,$(shell echo $(BUILDER)/bin/ramips/openwrt-*-hc5861-*-sysupgrade.bin))
|
||||
$(MAKE) -C $(BUILDER) image PROFILE=HC5861 \
|
||||
FILES="$(shell cd $(BUILDER) && pwd)/target/linux/ramips/base-files" \
|
||||
PACKAGES="$(EXTRA_PACKAGES) 8021xd uci2dat kmod-mt76x2e luci-mtk-wifi"
|
||||
|
||||
.patched:
|
||||
mkdir -p $(BUILDER)/target/linux/ramips/patches-3.10
|
||||
cat ../patches/01-hiwifi-hc5x61.patch ../patches/12-disable-pdnsd.patch > .patching
|
||||
patch -d $(BUILDER) -p0 < .patching
|
||||
mv .patching .patched
|
||||
|
||||
.ralink:
|
||||
@cd $(SDK); [ ! -L dl -a -d /var/dl ] && { rmdir dl && ln -s /var/dl; } || :
|
||||
@cd $(SDK)/package; [ -d ralink ] || ln -sv $(shell cd ..; pwd)/packages/ralink
|
||||
make package/8021xd/compile V=s -C "$(SDK)"
|
||||
make package/uci2dat/compile V=s -C "$(SDK)"
|
||||
make package/mt7610e/compile V=s -C "$(SDK)"
|
||||
make package/mt76x2e/compile V=s -C "$(SDK)"
|
||||
make package/luci-mtk-wifi/compile V=s -C "$(SDK)"
|
||||
build_drivers: $(SDK)
|
||||
$(MAKE) -C $(SDK) package/8021xd/compile package/uci2dat/compile package/mt7610e/compile package/mt76x2e/compile package/luci-mtk-wifi/compile V=s
|
||||
cd "$(SDK)/bin/ramips/packages" && ../../../scripts/ipkg-make-index.sh . > Packages && gzip -9c Packages > Packages.gz
|
||||
|
||||
.feeds:
|
||||
@cd $(SDK); [ ! -L dl -a -d /var/dl ] && { rmdir dl && ln -s /var/dl; } || :
|
||||
@cd $(SDK)/package; [ -d network-feeds ] && { cd network-feeds; git pull; } || git clone https://github.com/rssnsj/network-feeds.git
|
||||
make package/ipset-lists/compile V=s -C "$(SDK)"
|
||||
make package/shadowsocks-libev/compile V=s -C "$(SDK)"
|
||||
make package/shadowsocks-tools/compile V=s -C "$(SDK)"
|
||||
make package/minivtun-tools/compile V=s -C "$(SDK)"
|
||||
make package/file-storage/compile V=s -C "$(SDK)"
|
||||
make package/dnspod-utils/compile V=s -C "$(SDK)"
|
||||
make package/proto-bridge/compile V=s -C "$(SDK)"
|
||||
cd "$(SDK)/bin/ramips/packages" && ../../../scripts/ipkg-make-index.sh . > Packages && gzip -9c Packages > Packages.gz
|
||||
|
||||
.check_ib:
|
||||
@if ! [ -n "$(BUILDER)" -a -d "$(BUILDER)" ]; then \
|
||||
echo "Please specify a valid ImageBuilder directory by adding \"BUILDER=...\"."; \
|
||||
echo "Type \"make help\" for more details."; \
|
||||
exit 1; \
|
||||
fi
|
||||
.check_sdk:
|
||||
@if ! [ -n "$(SDK)" -a -d "$(SDK)/package" ]; then \
|
||||
echo "Please specify a valid OpenWrt SDK directory by adding \"SDK=...\"."; \
|
||||
echo "Type \"make help\" for more details."; \
|
||||
exit 1; \
|
||||
fi
|
||||
patch_ib: $(BUILDER)
|
||||
@[ -f .patched ] && exit 0; \
|
||||
mkdir -p $(BUILDER)/target/linux/ramips/patches-3.10; \
|
||||
cat ../patches/01-hiwifi-hc5x61.patch > .patching; \
|
||||
patch -d $(BUILDER) -p0 < .patching && mv .patching .patched
|
||||
|
||||
# Try extracting ImageBuilder & SDK to current directory
|
||||
$(BUILDER):
|
||||
tar jxvf /var/dl/$(BUILDER).tar.bz2
|
||||
$(SDK):
|
||||
tar jxvf /var/dl/$(SDK).tar.bz2
|
||||
$(SDK): /var/dl/$(SDK).tar.bz2
|
||||
tar axvf $< || { rm -rf $@; exit 1; }
|
||||
cd $(SDK) && [ ! -L dl -a -d /var/dl ] && { rmdir dl && ln -s /var/dl; } || :
|
||||
cd $(SDK)/package && { [ -d ralink ] || ln -sv ../../../packages/ralink; }
|
||||
$(BUILDER): /var/dl/$(BUILDER).tar.bz2
|
||||
tar axvf $< || { rm -rf $@; exit 1; }
|
||||
|
||||
help:
|
||||
@echo "Usage:"
|
||||
@echo " make BUILDER=.... [RALINK=1] [FEEDS=1] build OpenWrt firmware for this board"
|
||||
@echo "Options:"
|
||||
@echo " BUILDER=<directory> specify a valid ImageBuilder directory"
|
||||
@echo " SDK=<directory> specify a valid OpenWrt SDK directory"
|
||||
@echo " RALINK=1 build and install Ralink 5G drivers"
|
||||
@echo " FEEDS=1 build and install Shadowsocks, minivtun, kmod-proto-bridge, kmod-yavlan"
|
||||
@echo " FULL=1 enable both the options above"
|
||||
@echo " make HC5661|HC5761|HC5861"
|
||||
|
||||
clean: .check_ib
|
||||
make clean -C $(BUILDER)
|
||||
@if [ -e .patched ]; then \
|
||||
patch -R -d $(BUILDER) -p0 < .patched; \
|
||||
rm -vf .patched; \
|
||||
fi
|
||||
[ -n "$(SDK)" -a -d "$(SDK)"/bin/ramips ] && rm -rf "$(SDK)"/bin/ramips/* || :
|
||||
clean:
|
||||
rm -f patching .patched
|
||||
rm -rf $(BUILDER) $(SDK)
|
||||
|
||||
Reference in New Issue
Block a user