kiddin9 3 ani în urmă
părinte
comite
1df46b88d2
2 a modificat fișierele cu 11 adăugiri și 11 ștergeri
  1. 8 8
      devices/common/diy.sh
  2. 3 3
      devices/x86_64/diy.sh

+ 8 - 8
devices/common/diy.sh

@@ -2,21 +2,21 @@
 #=================================================
 shopt -s extglob
 
-commitid="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: bump 5.10' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
+commitid="$(curl -sfL https://github.com/openwrt/openwrt/tree/master/include | grep -o 'href=".*>kernel: 5.15' | head -1 | cut -d / -f 5 | cut -d '"' -f 1)"
 version="$(git rev-parse HEAD)"
 git checkout $commitid
 git checkout HEAD^
-[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.10")" ] && git checkout $commitid
-mv -f target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.10 include/kernel-defaults.mk .github/
+[ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $commitid
+mv -f target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk .github/
 git checkout $version
-rm -rf target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.10 include/kernel-defaults.mk
+rm -rf target/linux package/kernel package/firmware/linux-firmware include/kernel-version.mk include/kernel-5.15 include/kernel-defaults.mk
 mv -f .github/linux target/
 mv -f .github/kernel package/
 mv -f .github/linux-firmware package/firmware/
-mv -f  .github/kernel-version.mk .github/kernel-5.10 .github/kernel-defaults.mk include/
+mv -f  .github/kernel-version.mk .github/kernel-5.15 .github/kernel-defaults.mk include/
 sed -i 's/ libelf//' tools/Makefile
 
-kernel_v="$(cat include/kernel-5.10 | grep LINUX_KERNEL_HASH-5.10* | cut -f 2 -d - | cut -f 1 -d ' ')"
+kernel_v="$(cat include/kernel-5.15 | grep LINUX_KERNEL_HASH-5.15* | cut -f 2 -d - | cut -f 1 -d ' ')"
 sed -i "s?targets/%S/packages?packages/%A/kmods/$kernel_v?" include/feeds.mk
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
@@ -41,8 +41,8 @@ cd feeds/kiddin9; git pull; cd -
 (
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl
-svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10
-rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*}
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
+rm -rf target/linux/generic/hack-5.15/{220-gc_sections*,781-dsa-register*,780-drivers-net*}
 ) &
 
 sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile

+ 3 - 3
devices/x86_64/diy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.10 target/linux/x86/patches-5.10
-rm -rf target/linux/x86/patches-5.10/.svn
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.15 target/linux/x86/patches-5.15
+rm -rf target/linux/x86/patches-5.15/.svn
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += my-autocore-x86 lm-sensors-detect kmod-r8125 kmod-vmxnet3 kmod-igc kmod-drm-i915/' target/linux/x86/Makefile
 
@@ -10,7 +10,7 @@ sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 echo '
 CONFIG_CRYPTO_CHACHA20_X86_64=y
 CONFIG_CRYPTO_POLY1305_X86_64=y
-' >> ./target/linux/x86/config-5.10
+' >> ./target/linux/x86/config-5.15
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config