update

.github/workflows/Openwrt-AutoBuild.yml

@@ -259,17 +259,13 @@ jobs:
  run: |
  shopt -s extglob
  mkdir -p firmware/${{matrix.target}}
- cd openwrt; kernel_v="$(make --file=info.mk kernel_version)"; cd -
  cp -rf openwrt/bin/targets/*/*/*{combined,sysupgrade}* ./firmware/${{matrix.target}}/ || true
  cd openwrt/bin/targets/*/*/
  mv -f profiles.json profiles.json.b || true
  cp $GITHUB_WORKSPACE/openwrt/.config ${{matrix.target}}.config || true
  cp $GITHUB_WORKSPACE/openwrt/build_dir/target-*/linux-*/linux-*/.config ${{matrix.target}}_kernel.config || true
  cd -
  rename -v "s/openwrt-/${{ env.VERSION }}-openwrt-/" ./firmware/*/* || true
- rename -v "s/friendlyarm_//" ./firmware/*/*gz || true
- rename -v "s/embedfire_//" ./firmware/*/*gz || true
- rename -v "s/xiaomi_redmi-router/redmi/" ./firmware/*/*bin || true
  Emoji=("🎉" "🤞" "✨" "🎁" "🎈" "🎄" "🎨" "💋" "🍓" "🍕" "🍉" "💐" "🌴" "🚀" "🛸" "🗽" "⛅" "🌈" "🔥" "⛄" "🐶" "🏅" "🦄" "🐤")
  echo "EMOJI=${Emoji[$[$RANDOM % ${#Emoji[@]}]]}" >> $GITHUB_ENV
  if [ ${{matrix.target}} == "x86_64" ]; then
@@ -298,26 +294,6 @@ jobs:
  path: |
  openwrt/bin/targets/
 
- - name: Upload firmware to cowtransfer
- if: env.UPLOAD_FIRMWARE_TO_COWTRANSFER == 'true'
- continue-on-error: true
- run: |
- curl -fsSL git.io/file-transfer | sh
- cowurl=$(./transfer cow --block 2621440 -s --no-progress ${FIRMWARE})
- cowurl=$(echo $cowurl | grep -o -E "https[^ ]*")
- echo "COWURL=$cowurl" >> $GITHUB_ENV
- echo "Download Link: ${{ env.EMOJI }} $cowurl ${{ env.EMOJI }} 🚀"
- 
- - name: Upload firmware to WeTransfer
- if: env.UPLOAD_FIRMWARE_TO_WETRANSFER == 'true' && ! contains(github.event.action, 'noup')
- continue-on-error: true
- run: |
- curl -fsSL git.io/file-transfer | sh
- wetrans=$(./transfer wet -s -p 16 --no-progress ${FIRMWARE})
- wetrans=$(echo $wetrans | grep -o -E "https[^ ]*")
- echo "WETRANS=$wetrans" >> $GITHUB_ENV
- echo "Download Link: ${{ env.EMOJI }} $wetrans ${{ env.EMOJI }} 🚀"
-
  - name: Create release
  id: create_release
  if: env.REPO_TOKEN && env.UPLOAD_FIRMWARE_FOR_RELEASE == 'true'
@@ -340,30 +316,6 @@ jobs:
  name: ${{ env.date2 }} ${{matrix.target}} ${{ env.EMOJI }}
  tag_name: ${{ env.date }}_${{matrix.target}}
  body_path: release.txt
-
- - name: Set Up Docker Buildx
- uses: docker/setup-buildx-action@master
- if: env.DOCKER_ID && env.DOCKER_PASSWD
-
- - name: Login To DockerHub
- uses: docker/login-action@master
- if: env.DOCKER_ID && env.DOCKER_PASSWD
- with:
- username: ${{ secrets.DOCKER_ID }}
- password: ${{ secrets.DOCKER_PASSWD }}
-
- - name: Build and push docker image
- uses: docker/build-push-action@master
- continue-on-error: true
- if: env.DOCKER_ID && env.DOCKER_PASSWD && ! contains(github.event.action, 'noser') && github.event.client_payload.target == 'x86_64'
- with:
- platforms: ${{ env.ARCH }}
- file: Dockerfile
- context: .
- push: true
- tags: |
- ${{ secrets.DOCKER_ID }}/openwrt-nginx:${{ matrix.target }}
- ${{ env.DOCKERTAG }}
 
  - name: WeChat notification
  continue-on-error: true

devices/common/.config

@@ -5,7 +5,6 @@ CONFIG_TARGET_ROOTFS_EXT4FS=n
 
 CONFIG_TARGET_ROOTFS_CPIOGZ=n
 CONFIG_LUCI_CSSTIDY=n
-CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n
 CONFIG_SIGNATURE_CHECK=n
 

devices/common/patches/kernel_version.patch

@@ -0,0 +1,30 @@
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+
+
+ if output:
+- default_packages, output["arch_packages"] = run(
++ default_packages, output["arch_packages"], output["kernel_version"] = run(
+ [
+ "make",
+ "--no-print-directory",
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
+ "target/linux/",
+ "val.DEFAULT_PACKAGES",
+ "val.ARCH_PACKAGES",
++ "val.LINUX_VERSION",
+ ],
+ stdout=PIPE,
+ stderr=PIPE,
+
+--- a/scripts/json_add_image_info.py
++++ b/scripts/json_add_image_info.py
+@@ -55,6 +55,7 @@ def get_titles():
+ "profiles": {
+ device_id: {
+ "image_prefix": getenv("DEVICE_IMG_PREFIX"),
++ "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
+ "images": [
+ {
+ "type": getenv("FILE_TYPE"),

devices/common/patches/fix.patch → devices/common/patches/rootfstargz.patch

@@ -79,46 +79,3 @@
  $$(eval $$(foreach compile,$$(COMPILE), \
  $$(call Device/Build/compile,$$(compile),$(1))))
 
-
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
-
-
- if output:
-- default_packages, output["arch_packages"] = run(
-+ default_packages, output["arch_packages"], output["kernel_version"] = run(
- [
- "make",
- "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
- "target/linux/",
- "val.DEFAULT_PACKAGES",
- "val.ARCH_PACKAGES",
-+ "val.LINUX_VERSION",
- ],
- stdout=PIPE,
- stderr=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
- "profiles": {
- device_id: {
- "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+ "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
- "images": [
- {
- "type": getenv("FILE_TYPE"),
-
---- a/package/system/procd/files/procd.sh
-+++ b/package/system/procd/files/procd.sh
-@@ -260,7 +260,7 @@ _procd_set_param() {
- reload_signal)
- json_add_int "$type" $(kill -l "$1")
- ;;
-- pidfile|user|group|seccomp|capabilities|facility|\
-+ pidfile|user|group|capabilities|facility|\
- extroot|overlaydir|tmpoverlaysize)
- json_add_string "$type" "$1"
- ;;

devices/common/patches/seccomp.patch

@@ -0,0 +1,11 @@
+--- a/package/system/procd/files/procd.sh
++++ b/package/system/procd/files/procd.sh
+@@ -260,7 +260,7 @@ _procd_set_param() {
+ reload_signal)
+ json_add_int "$type" $(kill -l "$1")
+ ;;
+- pidfile|user|group|seccomp|capabilities|facility|\
++ pidfile|user|group|capabilities|facility|\
+ extroot|overlaydir|tmpoverlaysize)
+ json_add_string "$type" "$1"
+ ;;

devices/mediatek_mt7981/diy.sh

@@ -6,7 +6,7 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 rm -rf feeds/kiddin9/{rtl*,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/packages/libevdev
 
-rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
+rm -rf devices/common/patches/{rootfstargz.patch,kernel_version.patch,seccomp.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
 #sed -i "/KernelPackage,sound-soc-core/d" package/kernel/linux/modules/sound.mk
 #sed -i "/KernelPackage,multimedia-input/d" package/kernel/linux/modules/video.mk