diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 5647a473267d0346df40f81cb5d2c0d39b2836a2..f5ed35b27e99a88c079ccdb824afd5c4ce41e4d5 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index dd6dc1c58df2a56807c0a7b59d4767caec42ebaf..85e625c8477600eb86dbd8df7718a3f0b177f22d 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -48,15 +48,6 @@ _PROCD_SERVICE= procd_lock() { local basescript=$(readlink "$initscript") local service_name="$(basename ${basescript:-$initscript})" - - flock -n 1000 &> /dev/null - if [ "$?" != "0" ]; then - exec 1000>"$IPKG_INSTROOT/var/lock/procd_${service_name}.lock" - flock 1000 - if [ "$?" != "0" ]; then - logger "warning: procd flock for $service_name failed" - fi - fi } _procd_call() { diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 864cfa543d053b0991cb0fe0c029f18221419b00..c3d118b2ab229e0f236ab5a4de6d56755f326a84 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=MediaTek Ralink MIPS SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883 FEATURES:=squashfs gpio -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=5.4 KERNEL_TESTING_PATCHVER:=5.4 define Target/Description diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi index b781edf6beaebe89f5cac5042a628156e4d40a35..02deb28aa0f454b5507e442cde3232956dcc50e4 100644 --- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi +++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi @@ -150,12 +150,23 @@ reg = <0x0 0x100000>; read-only; }; - - partition@100000 { + + partition@1 { label = "SC PART_MAP"; reg = <0x100000 0x100000>; read-only; }; + + partition@100000 { + label = "BootEnv"; + reg = <0x100000 0x80000>; + read-only; + }; + + partition@180000 { + label = "Factory"; + reg = <0x180000 0x80000>; + }; partition@200000 { label = "kernel"; @@ -166,19 +177,30 @@ label = "ubi"; reg = <0x600000 0x2800000>; }; + + partition@2 { + label = "firmware"; + reg = <0x200000 0x2C00000>; + }; partition@2e00000 { label = "reserved0"; reg = <0x2e00000 0x1800000>; read-only; }; - + factory: partition@4600000 { label = "factory"; reg = <0x4600000 0x200000>; read-only; }; - + + partition@3 { + label = "epprom"; + reg = <0x4600000 0x80000>; + read-only; + }; + partition@4800000 { label = "reserved1"; reg = <0x4800000 0x3800000>;