diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 8ae1e3f12f..51e4bf279a 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git -PKG_SOURCE_DATE:=2020-04-25 -PKG_SOURCE_VERSION:=17e7ae769a4739e4b41a93f588d52cfd216b8eb2 -PKG_MIRROR_HASH:=6763cb63a53222d44be3b1ef238f3b9198d31fd533534abbbdc02202d3ef88e0 +PKG_SOURCE_DATE:=2020-05-15 +PKG_SOURCE_VERSION:=1ab539b3a8a0070b493112c8263ab380a689db66 +PKG_MIRROR_HASH:=fcc9fb1a046dbbea776ab1ca616c885e73d6a0a35c2278b8fddcc7e42d6b8647 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -56,6 +56,13 @@ define Package/procd-ujail TITLE:=OpenWrt process jail helper endef +define Package/procd-ujail-console + SECTION:=base + CATEGORY:=Base system + DEPENDS:=+procd-ujail +libubus +libubox + TITLE:=OpenWrt process jail console +endef + define Package/procd-seccomp SECTION:=base CATEGORY:=Base system @@ -110,6 +117,11 @@ define Package/procd-ujail/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail $(1)/sbin/ endef +define Package/procd-ujail-console/install + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ujail-console $(1)/sbin/ +endef + define Package/procd-seccomp/install $(INSTALL_DIR) $(1)/sbin $(1)/lib $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-seccomp.so $(1)/lib @@ -120,4 +132,5 @@ endef $(eval $(call BuildPackage,procd)) $(eval $(call BuildPackage,procd-ujail)) +$(eval $(call BuildPackage,procd-ujail-console)) $(eval $(call BuildPackage,procd-seccomp)) diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index b8605396e9..dd6dc1c58d 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -198,6 +198,7 @@ _procd_add_jail() { netns) json_add_boolean "netns" "1";; userns) json_add_boolean "userns" "1";; cgroupsns) json_add_boolean "cgroupsns" "1";; + console) json_add_boolean "console" "1";; esac done json_add_object "mount" diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts new file mode 100644 index 0000000000..215a07e597 --- /dev/null +++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "vr9_avm_fritz736x.dtsi" + +#include +#include + +/ { + compatible = "avm,fritz7360v2", "avm,fritz736x", "lantiq,xway", "lantiq,vr9"; + model = "AVM FRITZ!Box 7360 V2"; +}; + +&power_green { + label = "fritz7360v2:green:power"; +}; + +&power_red { + label = "fritz7360v2:red:power"; +}; + +&info_green { + label = "fritz7360v2:green:info"; +}; + +&wifi { + label = "fritz7360v2:green:wlan"; +}; + +&info_red { + label = "fritz7360v2:red:info"; +}; + +&dect { + label = "fritz7360v2:green:dect"; +}; + +&state_default { + pcie-rst { + lantiq,pins = "io21"; + lantiq,pull = <0>; + lantiq,output = <1>; + }; +}; + +&localbus { + flash@0 { + compatible = "lantiq,nor"; + bank-width = <2>; + reg = <0 0x0 0x2000000>; + + partitions { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fixed-partitions"; + + urlader: partition@0 { + label = "urlader"; + reg = <0x00000 0x20000>; + read-only; + }; + + partition@20000 { + label = "firmware"; + reg = <0x20000 0x1f60000>; + }; + + partition@1f80000 { + label = "tffs (1)"; + reg = <0x1f80000 0x40000>; + read-only; + }; + + partition@1fc0000 { + label = "tffs (2)"; + reg = <0x1fc0000 0x40000>; + read-only; + }; + }; + }; +}; diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts new file mode 100644 index 0000000000..215a07e597 --- /dev/null +++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360v2.dts @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "vr9_avm_fritz736x.dtsi" + +#include +#include + +/ { + compatible = "avm,fritz7360v2", "avm,fritz736x", "lantiq,xway", "lantiq,vr9"; + model = "AVM FRITZ!Box 7360 V2"; +}; + +&power_green { + label = "fritz7360v2:green:power"; +}; + +&power_red { + label = "fritz7360v2:red:power"; +}; + +&info_green { + label = "fritz7360v2:green:info"; +}; + +&wifi { + label = "fritz7360v2:green:wlan"; +}; + +&info_red { + label = "fritz7360v2:red:info"; +}; + +&dect { + label = "fritz7360v2:green:dect"; +}; + +&state_default { + pcie-rst { + lantiq,pins = "io21"; + lantiq,pull = <0>; + lantiq,output = <1>; + }; +}; + +&localbus { + flash@0 { + compatible = "lantiq,nor"; + bank-width = <2>; + reg = <0 0x0 0x2000000>; + + partitions { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fixed-partitions"; + + urlader: partition@0 { + label = "urlader"; + reg = <0x00000 0x20000>; + read-only; + }; + + partition@20000 { + label = "firmware"; + reg = <0x20000 0x1f60000>; + }; + + partition@1f80000 { + label = "tffs (1)"; + reg = <0x1f80000 0x40000>; + read-only; + }; + + partition@1fc0000 { + label = "tffs (2)"; + reg = <0x1fc0000 0x40000>; + read-only; + }; + }; + }; +}; diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk index 167c57c7c4..d59605a158 100644 --- a/target/linux/lantiq/image/vr9.mk +++ b/target/linux/lantiq/image/vr9.mk @@ -127,6 +127,16 @@ define Device/avm_fritz7360sl endef TARGET_DEVICES += avm_fritz7360sl +define Device/avm_fritz7360v2 + $(Device/AVM) + DEVICE_MODEL := FRITZ!Box 7360 + DEVICE_VARIANT := v2 + IMAGE_SIZE := 32128k + DEVICE_PACKAGES := kmod-ath9k kmod-owl-loader wpad-basic kmod-usb-dwc2 + SUPPORTED_DEVICES += FRITZ7360V2 +endef +TARGET_DEVICES += avm_fritz7360v2 + define Device/avm_fritz7362sl $(Device/AVM) $(Device/NAND) diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network index f39898263d..790fae58c9 100755 --- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network @@ -39,6 +39,7 @@ lantiq_setup_interfaces() avm,fritz3370-rev2-hynix|\ avm,fritz3370-rev2-micron|\ avm,fritz7360sl|\ + avm,fritz7360v2|\ avm,fritz7362sl) ucidef_add_switch "switch0" \ "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0" diff --git a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom index 6fee72ea8d..4b6d0bf13a 100644 --- a/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom +++ b/target/linux/lantiq/xrx200/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom @@ -16,7 +16,8 @@ case "$FIRMWARE" in avm,fritz7362sl) caldata_extract_reverse "urlader" 0x1541 0x440 ;; - avm,fritz7360sl) + avm,fritz7360sl|\ + avm,fritz7360v2) caldata_extract "urlader" 0x985 0x1000 ;; avm,fritz7412)