mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	Add all changes for OpenWrt/LEDE source here
This commit is contained in:
		
							parent
							
								
									b68e966d63
								
							
						
					
					
						commit
						9414e5098b
					
				
					 8 changed files with 21403 additions and 4 deletions
				
			
		
							
								
								
									
										9
									
								
								build.sh
									
										
									
									
									
								
							
							
						
						
									
										9
									
								
								build.sh
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -14,7 +14,7 @@ _get_repo() {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
OMR_DIST=${OMR_DIST:-omr}
 | 
			
		||||
OMR_HOST=${OMR_HOST:-$(curl -sS ipaddr.ovh)}
 | 
			
		||||
OMR_HOST=${OMR_HOST:-$(curl -sS ifconfig.co)}
 | 
			
		||||
OMR_PORT=${OMR_PORT:-8000}
 | 
			
		||||
OMR_REPO=${OMR_REPO:-http://$OMR_HOST:$OMR_PORT/$OMR_PATH}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -29,9 +29,10 @@ if [ ! -f "$OMR_TARGET_CONFIG" ]; then
 | 
			
		|||
	exit 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
_get_repo source https://github.com/ysurac/openmptcprouter "master"
 | 
			
		||||
#_get_repo source https://github.com/ysurac/openmptcprouter-source "master"
 | 
			
		||||
_get_repo source https://github.com/openwrt/openwrt "lede-17.01"
 | 
			
		||||
_get_repo feeds/packages https://github.com/openwrt/packages "master"
 | 
			
		||||
_get_repo feeds/luci https://github.com/openwrt/luci "for-15.05"
 | 
			
		||||
_get_repo feeds/luci https://github.com/openwrt/luci "lede-17.01"
 | 
			
		||||
 | 
			
		||||
if [ -z "$OMR_FEED" ]; then
 | 
			
		||||
	OMR_FEED=feeds/openmptcprouter
 | 
			
		||||
| 
						 | 
				
			
			@ -44,7 +45,7 @@ if [ -n "$1" ] && [ -f "$OMR_FEED/$1/Makefile" ]; then
 | 
			
		|||
fi
 | 
			
		||||
 | 
			
		||||
rm -rf source/bin source/files source/tmp
 | 
			
		||||
#cp -rf root source/files
 | 
			
		||||
cp -rf root source/files
 | 
			
		||||
 | 
			
		||||
cat >> source/files/etc/banner <<EOF
 | 
			
		||||
-----------------------------------------------------
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										61
									
								
								patches/iptables-trace.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										61
									
								
								patches/iptables-trace.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,61 @@
 | 
			
		|||
From 0f5291c8e2418bf489893121ef8d5438767a809a Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: Martin Wetterwald <martin.wetterwald@corp.ovh.com>
 | 
			
		||||
Date: Thu, 12 Jan 2017 15:06:00 +0100
 | 
			
		||||
Subject: [PATCH] iptables: Fix target TRACE issue
 | 
			
		||||
 | 
			
		||||
The package kmod-ipt-debug builds the module xt_TRACE, which allows
 | 
			
		||||
users to use '-j TRACE' as target in the chain PREROUTING of the table
 | 
			
		||||
raw in iptables.
 | 
			
		||||
 | 
			
		||||
The kernel compilation flag NETFILTER_XT_TARGET_TRACE is also enabled so
 | 
			
		||||
that this feature which is implemented deep inside the linux IP stack
 | 
			
		||||
(for example in sk_buff) is compiled.
 | 
			
		||||
 | 
			
		||||
But a strace of iptables -t raw -I PREROUTING -p icmp -j TRACE reveals
 | 
			
		||||
that an attempt is made to read /usr/lib/iptables/libxt_TRACE.so, which
 | 
			
		||||
fails as this dynamic library is not present on the system.
 | 
			
		||||
 | 
			
		||||
I created the package iptables-mod-trace which takes care of that, and
 | 
			
		||||
target TRACE now works!
 | 
			
		||||
 | 
			
		||||
https://dev.openwrt.org/ticket/16694
 | 
			
		||||
https://dev.openwrt.org/ticket/19661
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Martin Wetterwald <martin.wetterwald@corp.ovh.com>
 | 
			
		||||
---
 | 
			
		||||
 package/network/utils/iptables/Makefile | 15 +++++++++++++++
 | 
			
		||||
 1 file changed, 15 insertions(+)
 | 
			
		||||
 | 
			
		||||
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
 | 
			
		||||
index ac869f0385..0604f6f0a8 100644
 | 
			
		||||
--- a/package/network/utils/iptables/Makefile
 | 
			
		||||
+++ b/package/network/utils/iptables/Makefile
 | 
			
		||||
@@ -203,6 +203,20 @@ define Package/iptables-mod-nflog/description
 | 
			
		||||
 
 | 
			
		||||
 endef
 | 
			
		||||
 
 | 
			
		||||
+define Package/iptables-mod-trace
 | 
			
		||||
+$(call Package/iptables/Module, +kmod-ipt-debug)
 | 
			
		||||
+  TITLE:=Netfilter TRACE target
 | 
			
		||||
+endef
 | 
			
		||||
+
 | 
			
		||||
+define Package/iptables-mod-trace/description
 | 
			
		||||
+ iptables extension for TRACE target
 | 
			
		||||
+
 | 
			
		||||
+ Includes:
 | 
			
		||||
+  - libxt_TRACE
 | 
			
		||||
+
 | 
			
		||||
+endef
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
 define Package/iptables-mod-nfqueue
 | 
			
		||||
 $(call Package/iptables/Module, +kmod-nfnetlink-queue +kmod-ipt-nfqueue)
 | 
			
		||||
   TITLE:=Netfilter NFQUEUE target
 | 
			
		||||
@@ -548,6 +562,7 @@ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
 | 
			
		||||
 $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
 | 
			
		||||
 $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))
 | 
			
		||||
 $(eval $(call BuildPlugin,iptables-mod-nflog,$(IPT_NFLOG-m)))
 | 
			
		||||
+$(eval $(call BuildPlugin,iptables-mod-trace,$(IPT_DEBUG-m)))
 | 
			
		||||
 $(eval $(call BuildPlugin,iptables-mod-nfqueue,$(IPT_NFQUEUE-m)))
 | 
			
		||||
 $(eval $(call BuildPackage,ip6tables))
 | 
			
		||||
 $(eval $(call BuildPlugin,ip6tables-extra,$(IPT_IPV6_EXTRA-m)))
 | 
			
		||||
							
								
								
									
										134
									
								
								patches/uefi.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										134
									
								
								patches/uefi.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,134 @@
 | 
			
		|||
From 84532089eb8dc4cb322afbe7af150aa5bb1d37a3 Mon Sep 17 00:00:00 2001
 | 
			
		||||
From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
 | 
			
		||||
Date: Tue, 1 Aug 2017 15:06:04 +0200
 | 
			
		||||
Subject: [PATCH] x86: Add UEFI
 | 
			
		||||
MIME-Version: 1.0
 | 
			
		||||
Content-Type: text/plain; charset=UTF-8
 | 
			
		||||
Content-Transfer-Encoding: 8bit
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
 | 
			
		||||
---
 | 
			
		||||
 target/linux/x86/base-files/lib/preinit/79_move_config |  2 +-
 | 
			
		||||
 target/linux/x86/base-files/lib/upgrade/platform.sh    |  2 +-
 | 
			
		||||
 target/linux/x86/image/Makefile                        |  8 +++++---
 | 
			
		||||
 target/linux/x86/image/gen_image_generic.sh            | 17 +++++++----------
 | 
			
		||||
 target/linux/x86/image/grub.cfg                        |  4 ++--
 | 
			
		||||
 target/linux/x86/image/startup.nsh                     |  7 +++++++
 | 
			
		||||
 6 files changed, 23 insertions(+), 17 deletions(-)
 | 
			
		||||
 create mode 100644 target/linux/x86/image/startup.nsh
 | 
			
		||||
 | 
			
		||||
diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
 | 
			
		||||
index 143ca5147b..83171b3ba9 100644
 | 
			
		||||
--- a/target/linux/x86/base-files/lib/preinit/79_move_config
 | 
			
		||||
+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
 | 
			
		||||
@@ -7,7 +7,7 @@ move_config() {
 | 
			
		||||
 	. /lib/upgrade/common.sh
 | 
			
		||||
 
 | 
			
		||||
 	if export_bootdevice && export_partdevice partdev 1; then
 | 
			
		||||
-		if mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt; then
 | 
			
		||||
+		if mount -t vfat -o rw,noatime "/dev/$partdev" /mnt; then
 | 
			
		||||
 			if [ -f /mnt/sysupgrade.tgz ]; then
 | 
			
		||||
 				mv -f /mnt/sysupgrade.tgz /
 | 
			
		||||
 			fi
 | 
			
		||||
diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
 | 
			
		||||
index d3e9f360aa..b475fd5435 100644
 | 
			
		||||
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
 | 
			
		||||
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
 | 
			
		||||
@@ -14,7 +14,7 @@ platform_copy_config() {
 | 
			
		||||
 	local partdev
 | 
			
		||||
 
 | 
			
		||||
 	if export_partdevice partdev 1; then
 | 
			
		||||
-		mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
 | 
			
		||||
+		mount -t vfat -o rw,noatime "/dev/$partdev" /mnt
 | 
			
		||||
 		cp -af "$CONF_TAR" /mnt/
 | 
			
		||||
 		umount /mnt
 | 
			
		||||
 	fi
 | 
			
		||||
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
 | 
			
		||||
index 965737ac63..d2a9e0ec0e 100644
 | 
			
		||||
--- a/target/linux/x86/image/Makefile
 | 
			
		||||
+++ b/target/linux/x86/image/Makefile
 | 
			
		||||
@@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/image.mk
 | 
			
		||||
 
 | 
			
		||||
 export PATH=$(TARGET_PATH):/sbin
 | 
			
		||||
 
 | 
			
		||||
-GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga
 | 
			
		||||
+GRUB2_MODULES = biosdisk boot chain configfile fat linux ls part_msdos reboot serial vga
 | 
			
		||||
 GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga
 | 
			
		||||
 GRUB_TERMINALS =
 | 
			
		||||
 GRUB_SERIAL_CONFIG =
 | 
			
		||||
@@ -65,8 +65,10 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
 | 
			
		||||
 
 | 
			
		||||
   define Image/Build/grub2
 | 
			
		||||
 	# left here because the image builder doesnt need these
 | 
			
		||||
-	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2
 | 
			
		||||
-	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz
 | 
			
		||||
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/root.grub/efi/boot $(KDIR)/grub2
 | 
			
		||||
+	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/efi/boot/linux.efi
 | 
			
		||||
+	echo 'linux.efi $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))' > $(KDIR)/root.grub/efi/boot/boot.nsh
 | 
			
		||||
+	$(CP) ./startup.nsh $(KDIR)/root.grub/
 | 
			
		||||
 	grub-mkimage \
 | 
			
		||||
 		-p /boot/grub \
 | 
			
		||||
 		-d $(STAGING_DIR_HOST)/lib/grub/i386-pc \
 | 
			
		||||
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh
 | 
			
		||||
index 17d969b96b..abb1abf5d1 100755
 | 
			
		||||
--- a/target/linux/x86/image/gen_image_generic.sh
 | 
			
		||||
+++ b/target/linux/x86/image/gen_image_generic.sh
 | 
			
		||||
@@ -15,23 +15,20 @@ ALIGN="$6"
 | 
			
		||||
 
 | 
			
		||||
 rm -f "$OUTPUT"
 | 
			
		||||
 
 | 
			
		||||
-head=16
 | 
			
		||||
-sect=63
 | 
			
		||||
-cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512)))
 | 
			
		||||
-
 | 
			
		||||
-# create partition table
 | 
			
		||||
-set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}`
 | 
			
		||||
+# shellcheck disable=2046
 | 
			
		||||
+set $(ptgen -o "$OUTPUT" -h 16 -s 63 -t 0xef -p "${KERNELSIZE}m" -t 0x83 -p "${ROOTFSSIZE}m" ${ALIGN:+-l "$ALIGN"} ${SIGNATURE:+-S "0x$SIGNATURE"})
 | 
			
		||||
 
 | 
			
		||||
 KERNELOFFSET="$(($1 / 512))"
 | 
			
		||||
-KERNELSIZE="$2"
 | 
			
		||||
+KERNELCOUNT="$(($2 / 1024))" # mkfs.fat BLOCK_SIZE=1024
 | 
			
		||||
 ROOTFSOFFSET="$(($3 / 512))"
 | 
			
		||||
-ROOTFSSIZE="$(($4 / 512))"
 | 
			
		||||
+ROOTFSCOUNT="$(($4 / 512))"
 | 
			
		||||
 
 | 
			
		||||
-[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE"
 | 
			
		||||
+[ -n "$PADDING" ] && dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" count="$ROOTFSCOUNT"
 | 
			
		||||
 dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc
 | 
			
		||||
 
 | 
			
		||||
 [ -n "$NOGRUB" ] && exit 0
 | 
			
		||||
 
 | 
			
		||||
-make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR"
 | 
			
		||||
+mkfs.fat -C -n BOOT "$OUTPUT.kernel" "$KERNELCOUNT"
 | 
			
		||||
+mcopy -s -i "$OUTPUT.kernel" "$KERNELDIR"/* ::/
 | 
			
		||||
 dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc
 | 
			
		||||
 rm -f "$OUTPUT.kernel"
 | 
			
		||||
diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg
 | 
			
		||||
index acca036a2e..8169108ac4 100644
 | 
			
		||||
--- a/target/linux/x86/image/grub.cfg
 | 
			
		||||
+++ b/target/linux/x86/image/grub.cfg
 | 
			
		||||
@@ -6,8 +6,8 @@ set timeout="@TIMEOUT@"
 | 
			
		||||
 set root='(@ROOT@)'
 | 
			
		||||
 
 | 
			
		||||
 menuentry "LEDE" {
 | 
			
		||||
-	linux /boot/vmlinuz @CMDLINE@ noinitrd
 | 
			
		||||
+	linux /efi/boot/linux.efi @CMDLINE@ noinitrd
 | 
			
		||||
 }
 | 
			
		||||
 menuentry "LEDE (failsafe)" {
 | 
			
		||||
-	linux /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd
 | 
			
		||||
+	linux /efi/boot/linux.efi failsafe=true @CMDLINE@ noinitrd
 | 
			
		||||
 }
 | 
			
		||||
diff --git a/target/linux/x86/image/startup.nsh b/target/linux/x86/image/startup.nsh
 | 
			
		||||
new file mode 100644
 | 
			
		||||
index 0000000000..3bf618d892
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ b/target/linux/x86/image/startup.nsh
 | 
			
		||||
@@ -0,0 +1,7 @@
 | 
			
		||||
+for %d in 9 8 7 6 5 4 3 2 1 0
 | 
			
		||||
+   set bootapp "fs%d:\efi\boot\boot.nsh"
 | 
			
		||||
+   if exist %bootapp% then
 | 
			
		||||
+      %bootapp%
 | 
			
		||||
+   endif
 | 
			
		||||
+endfor
 | 
			
		||||
+exit
 | 
			
		||||
							
								
								
									
										438
									
								
								root/package/base-files/files/bin/config_generate
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										438
									
								
								root/package/base-files/files/bin/config_generate
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,438 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
 | 
			
		||||
CFG=/etc/board.json
 | 
			
		||||
 | 
			
		||||
. /usr/share/libubox/jshn.sh
 | 
			
		||||
 | 
			
		||||
[ -s $CFG ] || /bin/board_detect || exit 1
 | 
			
		||||
[ -s /etc/config/network -a -s /etc/config/system ] && exit 0
 | 
			
		||||
 | 
			
		||||
generate_static_network() {
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		delete network.loopback
 | 
			
		||||
		set network.loopback='interface'
 | 
			
		||||
		set network.loopback.ifname='lo'
 | 
			
		||||
		set network.loopback.proto='static'
 | 
			
		||||
		set network.loopback.ipaddr='127.0.0.1'
 | 
			
		||||
		set network.loopback.netmask='255.0.0.0'
 | 
			
		||||
		delete network.globals
 | 
			
		||||
		set network.globals='globals'
 | 
			
		||||
		set network.globals.ula_prefix='auto'
 | 
			
		||||
	EOF
 | 
			
		||||
 | 
			
		||||
	if json_is_a dsl object; then
 | 
			
		||||
		json_select dsl
 | 
			
		||||
			if json_is_a atmbridge object; then
 | 
			
		||||
				json_select atmbridge
 | 
			
		||||
					local vpi vci encaps payload
 | 
			
		||||
					json_get_vars vpi vci encaps payload
 | 
			
		||||
					uci -q batch <<-EOF
 | 
			
		||||
						delete network.atm
 | 
			
		||||
						set network.atm='atm-bridge'
 | 
			
		||||
						set network.atm.vpi='$vpi'
 | 
			
		||||
						set network.atm.vci='$vci'
 | 
			
		||||
						set network.atm.encaps='$encaps'
 | 
			
		||||
						set network.atm.payload='$payload'
 | 
			
		||||
					EOF
 | 
			
		||||
				json_select ..
 | 
			
		||||
			fi
 | 
			
		||||
 | 
			
		||||
			if json_is_a modem object; then
 | 
			
		||||
				json_select modem
 | 
			
		||||
					local type annex firmware tone xfer_mode
 | 
			
		||||
					json_get_vars type annex firmware tone xfer_mode
 | 
			
		||||
					uci -q batch <<-EOF
 | 
			
		||||
						delete network.dsl
 | 
			
		||||
						set network.dsl='dsl'
 | 
			
		||||
						set network.dsl.annex='$annex'
 | 
			
		||||
						set network.dsl.firmware='$firmware'
 | 
			
		||||
						set network.dsl.tone='$tone'
 | 
			
		||||
						set network.dsl.xfer_mode='$xfer_mode'
 | 
			
		||||
					EOF
 | 
			
		||||
				json_select ..
 | 
			
		||||
			fi
 | 
			
		||||
		json_select ..
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
addr_offset=2
 | 
			
		||||
generate_network() {
 | 
			
		||||
	local ifname macaddr protocol type ipaddr netmask
 | 
			
		||||
 | 
			
		||||
	json_select network
 | 
			
		||||
		json_select "$1"
 | 
			
		||||
			json_get_vars ifname macaddr protocol ipaddr netmask
 | 
			
		||||
		json_select ..
 | 
			
		||||
	json_select ..
 | 
			
		||||
 | 
			
		||||
	[ -n "$ifname" ] || return
 | 
			
		||||
 | 
			
		||||
	case "$1" in
 | 
			
		||||
		# hack (see /etc/board.d/02_network)
 | 
			
		||||
		none) return ;;
 | 
			
		||||
		lan*) proto=${proto:-static} ;;
 | 
			
		||||
		wan*) proto=${proto:-dhcp} ;;
 | 
			
		||||
	esac
 | 
			
		||||
 | 
			
		||||
	if [ -n "$macaddr" ]; then
 | 
			
		||||
		type=macvlan # useless, only for legacy
 | 
			
		||||
		uci -q batch <<-EOF
 | 
			
		||||
			delete network.${1}_dev
 | 
			
		||||
			set network.${1}_dev='device'
 | 
			
		||||
			set network.${1}_dev.name='$1'
 | 
			
		||||
			set network.${1}_dev.type='$type'
 | 
			
		||||
			set network.${1}_dev.ifname='$ifname'
 | 
			
		||||
			set network.${1}_dev.macaddr='$macaddr'
 | 
			
		||||
		EOF
 | 
			
		||||
		ifname=$1
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		delete network.$1
 | 
			
		||||
		set network.$1='interface'
 | 
			
		||||
		set network.$1.type='$type'
 | 
			
		||||
		set network.$1.ifname='$ifname'
 | 
			
		||||
		set network.$1.proto='none'
 | 
			
		||||
	EOF
 | 
			
		||||
 | 
			
		||||
	case "$protocol" in
 | 
			
		||||
		static)
 | 
			
		||||
			local ipad
 | 
			
		||||
			case "$1" in
 | 
			
		||||
				lan) ipad=${ipaddr:-"192.168.100.1"} ;;
 | 
			
		||||
				*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
 | 
			
		||||
			esac
 | 
			
		||||
 | 
			
		||||
			netm=${netmask:-"255.255.255.0"}
 | 
			
		||||
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set network.$1.proto='static'
 | 
			
		||||
				set network.$1.ipaddr='$ipad'
 | 
			
		||||
				set network.$1.netmask='$netm'
 | 
			
		||||
				set network.$1.ip6assign='60'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		dhcp)
 | 
			
		||||
			# fixup IPv6 slave interface if parent is a bridge
 | 
			
		||||
			[ "$type" = "bridge" ] && ifname="br-$1"
 | 
			
		||||
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set network.$1.proto='dhcp'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		pppoe)
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set network.$1.proto='pppoe'
 | 
			
		||||
				set network.$1.username='username'
 | 
			
		||||
				set network.$1.password='password'
 | 
			
		||||
				set network.$1.ipv6='1'
 | 
			
		||||
				delete network.${1}6
 | 
			
		||||
				set network.${1}6='interface'
 | 
			
		||||
				set network.${1}6.ifname='@${1}'
 | 
			
		||||
				set network.${1}6.proto='dhcpv6'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
	esac
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
generate_switch_vlans_ports() {
 | 
			
		||||
	local switch="$1"
 | 
			
		||||
	local port ports role roles num attr val
 | 
			
		||||
 | 
			
		||||
	#
 | 
			
		||||
	# autogenerate vlans
 | 
			
		||||
	#
 | 
			
		||||
 | 
			
		||||
	if json_is_a roles array; then
 | 
			
		||||
		json_get_keys roles roles
 | 
			
		||||
		json_select roles
 | 
			
		||||
 | 
			
		||||
		for role in $roles; do
 | 
			
		||||
			json_select "$role"
 | 
			
		||||
				json_get_vars ports
 | 
			
		||||
			json_select ..
 | 
			
		||||
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				add network switch_vlan
 | 
			
		||||
				set network.@switch_vlan[-1].device='$switch'
 | 
			
		||||
				set network.@switch_vlan[-1].vlan='$role'
 | 
			
		||||
				set network.@switch_vlan[-1].ports='$ports'
 | 
			
		||||
			EOF
 | 
			
		||||
		done
 | 
			
		||||
 | 
			
		||||
		json_select ..
 | 
			
		||||
	fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	#
 | 
			
		||||
	# write port specific settings
 | 
			
		||||
	#
 | 
			
		||||
 | 
			
		||||
	if json_is_a ports array; then
 | 
			
		||||
		json_get_keys ports ports
 | 
			
		||||
		json_select ports
 | 
			
		||||
 | 
			
		||||
		for port in $ports; do
 | 
			
		||||
			json_select "$port"
 | 
			
		||||
				json_get_vars num
 | 
			
		||||
 | 
			
		||||
				if json_is_a attr object; then
 | 
			
		||||
					json_get_keys attr attr
 | 
			
		||||
					json_select attr
 | 
			
		||||
						uci -q batch <<-EOF
 | 
			
		||||
							add network switch_port
 | 
			
		||||
							set network.@switch_port[-1].device='$switch'
 | 
			
		||||
							set network.@switch_port[-1].port=$num
 | 
			
		||||
						EOF
 | 
			
		||||
 | 
			
		||||
						for attr in $attr; do
 | 
			
		||||
							json_get_var val "$attr"
 | 
			
		||||
							uci -q set network.@switch_port[-1].$attr="$val"
 | 
			
		||||
						done
 | 
			
		||||
					json_select ..
 | 
			
		||||
				fi
 | 
			
		||||
			json_select ..
 | 
			
		||||
		done
 | 
			
		||||
 | 
			
		||||
		json_select ..
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
generate_switch() {
 | 
			
		||||
	local key="$1"
 | 
			
		||||
	local vlans
 | 
			
		||||
 | 
			
		||||
	json_select switch
 | 
			
		||||
	json_select "$key"
 | 
			
		||||
	json_get_vars enable reset blinkrate cpu_port
 | 
			
		||||
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		add network switch
 | 
			
		||||
		set network.@switch[-1].name='$key'
 | 
			
		||||
		set network.@switch[-1].reset='$reset'
 | 
			
		||||
		set network.@switch[-1].enable_vlan='$enable'
 | 
			
		||||
		set network.@switch[-1].blinkrate='$blinkrate'
 | 
			
		||||
	EOF
 | 
			
		||||
 | 
			
		||||
	generate_switch_vlans_ports "$1"
 | 
			
		||||
 | 
			
		||||
	json_select ..
 | 
			
		||||
	json_select ..
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
generate_static_system() {
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		delete system.@system[0]
 | 
			
		||||
		add system system
 | 
			
		||||
		set system.@system[-1].hostname='OpenMPTCProuter'
 | 
			
		||||
		set system.@system[-1].timezone='UTC'
 | 
			
		||||
		set system.@system[-1].ttylogin='0'
 | 
			
		||||
		set system.@system[-1].log_size='64'
 | 
			
		||||
		set system.@system[-1].urandom_seed='0'
 | 
			
		||||
 | 
			
		||||
		delete system.ntp
 | 
			
		||||
		set system.ntp='timeserver'
 | 
			
		||||
		set system.ntp.enabled='1'
 | 
			
		||||
		set system.ntp.enable_server='0'
 | 
			
		||||
		add_list system.ntp.server='0.lede.pool.ntp.org'
 | 
			
		||||
		add_list system.ntp.server='1.lede.pool.ntp.org'
 | 
			
		||||
		add_list system.ntp.server='2.lede.pool.ntp.org'
 | 
			
		||||
		add_list system.ntp.server='3.lede.pool.ntp.org'
 | 
			
		||||
	EOF
 | 
			
		||||
 | 
			
		||||
	if json_is_a system object; then
 | 
			
		||||
		json_select system
 | 
			
		||||
			local hostname
 | 
			
		||||
			if json_get_var hostname hostname; then
 | 
			
		||||
				uci -q set "system.@system[-1].hostname=$hostname"
 | 
			
		||||
			fi
 | 
			
		||||
 | 
			
		||||
			if json_is_a ntpserver array; then
 | 
			
		||||
				local keys key
 | 
			
		||||
				json_get_keys keys ntpserver
 | 
			
		||||
				json_select ntpserver
 | 
			
		||||
					uci -q delete "system.ntp.server"
 | 
			
		||||
 | 
			
		||||
					for key in $keys; do
 | 
			
		||||
						local server
 | 
			
		||||
						if json_get_var server "$key"; then
 | 
			
		||||
							uci -q add_list "system.ntp.server=$server"
 | 
			
		||||
						fi
 | 
			
		||||
					done
 | 
			
		||||
				json_select ..
 | 
			
		||||
			fi
 | 
			
		||||
		json_select ..
 | 
			
		||||
	fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
generate_rssimon() {
 | 
			
		||||
	local key="$1"
 | 
			
		||||
	local cfg="rssid_$key"
 | 
			
		||||
	local refresh threshold
 | 
			
		||||
 | 
			
		||||
	json_select rssimon
 | 
			
		||||
	json_select "$key"
 | 
			
		||||
	json_get_vars refresh threshold
 | 
			
		||||
	json_select ..
 | 
			
		||||
	json_select ..
 | 
			
		||||
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		delete system.$cfg
 | 
			
		||||
		set system.$cfg='rssid'
 | 
			
		||||
		set system.$cfg.dev='$key'
 | 
			
		||||
		set system.$cfg.refresh='$refresh'
 | 
			
		||||
		set system.$cfg.threshold='$threshold'
 | 
			
		||||
	EOF
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
generate_led() {
 | 
			
		||||
	local key="$1"
 | 
			
		||||
	local cfg="led_$key"
 | 
			
		||||
 | 
			
		||||
	json_select led
 | 
			
		||||
	json_select "$key"
 | 
			
		||||
	json_get_vars name sysfs type trigger default
 | 
			
		||||
 | 
			
		||||
	uci -q batch <<-EOF
 | 
			
		||||
		delete system.$cfg
 | 
			
		||||
		set system.$cfg='led'
 | 
			
		||||
		set system.$cfg.name='$name'
 | 
			
		||||
		set system.$cfg.sysfs='$sysfs'
 | 
			
		||||
		set system.$cfg.trigger='$trigger'
 | 
			
		||||
		set system.$cfg.default='$default'
 | 
			
		||||
	EOF
 | 
			
		||||
 | 
			
		||||
	case "$type" in
 | 
			
		||||
		gpio)
 | 
			
		||||
			local gpio inverted
 | 
			
		||||
			json_get_vars gpio inverted
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.trigger='gpio'
 | 
			
		||||
				set system.$cfg.gpio='$gpio'
 | 
			
		||||
				set system.$cfg.inverted='$inverted'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		netdev)
 | 
			
		||||
			local device mode
 | 
			
		||||
			json_get_vars device mode
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.trigger='netdev'
 | 
			
		||||
				set system.$cfg.mode='$mode'
 | 
			
		||||
				set system.$cfg.dev='$device'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		usb)
 | 
			
		||||
			local device
 | 
			
		||||
			json_get_vars device
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.trigger='usbdev'
 | 
			
		||||
				set system.$cfg.interval='50'
 | 
			
		||||
				set system.$cfg.dev='$device'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		usbport)
 | 
			
		||||
			local ports port
 | 
			
		||||
			json_get_values ports ports
 | 
			
		||||
			uci set system.$cfg.trigger='usbport'
 | 
			
		||||
			for port in $ports; do
 | 
			
		||||
				uci add_list system.$cfg.port=$port
 | 
			
		||||
			done
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		rssi)
 | 
			
		||||
			local iface minq maxq offset factor
 | 
			
		||||
			json_get_vars iface minq maxq offset factor
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.trigger='rssi'
 | 
			
		||||
				set system.$cfg.iface='rssid_$iface'
 | 
			
		||||
				set system.$cfg.minq='$minq'
 | 
			
		||||
				set system.$cfg.maxq='$maxq'
 | 
			
		||||
				set system.$cfg.offset='$offset'
 | 
			
		||||
				set system.$cfg.factor='$factor'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		switch)
 | 
			
		||||
			local port_mask speed_mask
 | 
			
		||||
			json_get_vars port_mask speed_mask
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.port_mask='$port_mask'
 | 
			
		||||
				set system.$cfg.speed_mask='$speed_mask'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		portstate)
 | 
			
		||||
			local port_state
 | 
			
		||||
			json_get_vars port_state
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.port_state='$port_state'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
 | 
			
		||||
		timer|oneshot)
 | 
			
		||||
			local delayon delayoff
 | 
			
		||||
			json_get_vars delayon delayoff
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				set system.$cfg.trigger='$type'
 | 
			
		||||
				set system.$cfg.delayon='$delayon'
 | 
			
		||||
				set system.$cfg.delayoff='$delayoff'
 | 
			
		||||
			EOF
 | 
			
		||||
		;;
 | 
			
		||||
	esac
 | 
			
		||||
 | 
			
		||||
	json_select ..
 | 
			
		||||
	json_select ..
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
generate_gpioswitch() {
 | 
			
		||||
	local cfg="$1"
 | 
			
		||||
 | 
			
		||||
	json_select gpioswitch
 | 
			
		||||
		json_select "$cfg"
 | 
			
		||||
			local name pin default
 | 
			
		||||
			json_get_vars name pin default
 | 
			
		||||
			uci -q batch <<-EOF
 | 
			
		||||
				delete system.$cfg
 | 
			
		||||
				set system.$cfg='gpio_switch'
 | 
			
		||||
				set system.$cfg.name='$name'
 | 
			
		||||
				set system.$cfg.gpio_pin='$pin'
 | 
			
		||||
				set system.$cfg.value='$default'
 | 
			
		||||
			EOF
 | 
			
		||||
		json_select ..
 | 
			
		||||
	json_select ..
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
json_init
 | 
			
		||||
json_load "$(cat ${CFG})"
 | 
			
		||||
 | 
			
		||||
if [ ! -s /etc/config/network ]; then
 | 
			
		||||
	touch /etc/config/network
 | 
			
		||||
	generate_static_network
 | 
			
		||||
 | 
			
		||||
	json_get_keys keys network
 | 
			
		||||
	for key in $keys; do generate_network $key; done
 | 
			
		||||
 | 
			
		||||
	json_get_keys keys switch
 | 
			
		||||
	for key in $keys; do generate_switch $key; done
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ ! -s /etc/config/system ]; then
 | 
			
		||||
	touch /etc/config/system
 | 
			
		||||
	generate_static_system
 | 
			
		||||
 | 
			
		||||
	json_get_keys keys rssimon
 | 
			
		||||
	for key in $keys; do generate_rssimon $key; done
 | 
			
		||||
 | 
			
		||||
	json_get_keys keys gpioswitch
 | 
			
		||||
	for key in $keys; do generate_gpioswitch $key; done
 | 
			
		||||
 | 
			
		||||
	json_get_keys keys led
 | 
			
		||||
	for key in $keys; do generate_led $key; done
 | 
			
		||||
fi
 | 
			
		||||
uci commit
 | 
			
		||||
							
								
								
									
										8
									
								
								root/package/base-files/files/etc/banner
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								root/package/base-files/files/etc/banner
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,8 @@
 | 
			
		|||
   ___                 __  __ ___ _____ ___ ___              _           
 | 
			
		||||
  / _ \ _ __  ___ _ _ |  \/  | _ \_   _/ __| _ \_ _ ___ _  _| |_ ___ _ _ 
 | 
			
		||||
 | (_) | '_ \/ -_) ' \| |\/| |  _/ | || (__|  _/ '_/ _ \ || |  _/ -_) '_|
 | 
			
		||||
  \___/| .__/\___|_||_|_|  |_|_|   |_| \___|_| |_| \___/\_,_|\__\___|_|  
 | 
			
		||||
       |_|                                                               
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
   %N (%V, %C)
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
							
								
								
									
										91
									
								
								root/package/boot/grub2/Makefile
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										91
									
								
								root/package/boot/grub2/Makefile
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,91 @@
 | 
			
		|||
#
 | 
			
		||||
# Copyright (C) 2006-2015 OpenWrt.org
 | 
			
		||||
#
 | 
			
		||||
# This is free software, licensed under the GNU General Public License v2.
 | 
			
		||||
# See /LICENSE for more information.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
include $(TOPDIR)/rules.mk
 | 
			
		||||
include $(INCLUDE_DIR)/kernel.mk
 | 
			
		||||
 | 
			
		||||
PKG_NAME:=grub
 | 
			
		||||
PKG_VERSION:=2.02
 | 
			
		||||
PKG_RELEASE:=1
 | 
			
		||||
 | 
			
		||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 | 
			
		||||
PKG_SOURCE_URL:=@GNU/grub
 | 
			
		||||
PKG_HASH:=810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f
 | 
			
		||||
 | 
			
		||||
PKG_FIXUP:=autoreconf
 | 
			
		||||
HOST_BUILD_PARALLEL:=1
 | 
			
		||||
PKG_BUILD_DEPENDS:=grub2/host
 | 
			
		||||
 | 
			
		||||
PKG_SSP:=0
 | 
			
		||||
 | 
			
		||||
PKG_FLAGS:=nonshared
 | 
			
		||||
 | 
			
		||||
include $(INCLUDE_DIR)/host-build.mk
 | 
			
		||||
include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
 | 
			
		||||
define Package/grub2
 | 
			
		||||
  CATEGORY:=Boot Loaders
 | 
			
		||||
  SECTION:=boot
 | 
			
		||||
  TITLE:=GRand Unified Bootloader
 | 
			
		||||
  URL:=http://www.gnu.org/software/grub/
 | 
			
		||||
  DEPENDS:=@TARGET_x86||TARGET_x86_64
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/grub2-editenv
 | 
			
		||||
  CATEGORY:=Utilities
 | 
			
		||||
  SECTION:=utils
 | 
			
		||||
  SUBMENU:=Boot Loaders
 | 
			
		||||
  TITLE:=Grub2 Environment editor
 | 
			
		||||
  URL:=http://www.gnu.org/software/grub/
 | 
			
		||||
  DEPENDS:=@TARGET_x86||TARGET_x86_64
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/grub2-editenv/description
 | 
			
		||||
	Edit grub2 environment files.
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
HOST_BUILD_PREFIX := $(STAGING_DIR_HOST)
 | 
			
		||||
 | 
			
		||||
CONFIGURE_VARS += \
 | 
			
		||||
	grub_build_mkfont_excuse="don't want fonts"
 | 
			
		||||
 | 
			
		||||
CONFIGURE_ARGS += \
 | 
			
		||||
	--target=$(REAL_GNU_TARGET_NAME) \
 | 
			
		||||
	--disable-werror \
 | 
			
		||||
	--disable-nls \
 | 
			
		||||
	--disable-device-mapper \
 | 
			
		||||
	--disable-libzfs \
 | 
			
		||||
	--disable-grub-mkfont
 | 
			
		||||
 | 
			
		||||
HOST_CONFIGURE_VARS += \
 | 
			
		||||
	grub_build_mkfont_excuse="don't want fonts"
 | 
			
		||||
 | 
			
		||||
HOST_CONFIGURE_ARGS += \
 | 
			
		||||
	--disable-grub-mkfont \
 | 
			
		||||
	--target=$(REAL_GNU_TARGET_NAME) \
 | 
			
		||||
	--sbindir="$(STAGING_DIR_HOST)/bin" \
 | 
			
		||||
	--disable-werror \
 | 
			
		||||
	--disable-libzfs \
 | 
			
		||||
	--disable-nls
 | 
			
		||||
 | 
			
		||||
HOST_MAKE_FLAGS += \
 | 
			
		||||
	TARGET_RANLIB=$(TARGET_RANLIB) \
 | 
			
		||||
	LIBLZMA=$(STAGING_DIR_HOST)/lib/liblzma.a
 | 
			
		||||
 | 
			
		||||
define Host/Configure
 | 
			
		||||
	$(SED) 's,(RANLIB),(TARGET_RANLIB),' $(HOST_BUILD_DIR)/grub-core/Makefile.in
 | 
			
		||||
	$(Host/Configure/Default)
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/grub2-editenv/install
 | 
			
		||||
	$(INSTALL_DIR) $(1)/usr/sbin
 | 
			
		||||
	$(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
$(eval $(call HostBuild))
 | 
			
		||||
$(eval $(call BuildPackage,grub2))
 | 
			
		||||
$(eval $(call BuildPackage,grub2-editenv))
 | 
			
		||||
							
								
								
									
										20658
									
								
								root/target/linux/generic/patches-4.4/699-mptcp_v0.92.2.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										20658
									
								
								root/target/linux/generic/patches-4.4/699-mptcp_v0.92.2.patch
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										8
									
								
								sign.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										8
									
								
								sign.sh
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,8 @@
 | 
			
		|||
#!/bin/sh
 | 
			
		||||
 | 
			
		||||
key=${1:-key-build}
 | 
			
		||||
 | 
			
		||||
[ -d source/bin ] && [ -f "$key" ] && \
 | 
			
		||||
	find source/bin \
 | 
			
		||||
	\( -name '*.img.gz' -or -name 'Packages' \) \
 | 
			
		||||
	-exec source/staging_dir/host/bin/usign -S -m {} -s "$key" \;
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue