Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

222 #445

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

222 #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188e8dd
update
kiddin9 Jul 25, 2021
110f52b
Merge branch 'master' of https://github.com/kiddin9/OpenWrt_x86-r2s-r…
kiddin9 Jul 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/Openwrt-AutoBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,9 @@ jobs:
- name: Organize files
id: organize
run: |
mkdir firmware && find openwrt/bin/targets/*/*/ -maxdepth 1 \
mkdir firmware && mv -f `find openwrt/bin/targets/*/*/ -maxdepth 1 \
-name "*combined*" \
-or -name "*sysupgrade*" \
| xargs -i mv -f {} ./firmware/
-or -name "*sysupgrade*"` ./firmware/
cp openwrt/.config ./firmware/${{matrix.target}}.config
cd firmware
echo ${{ env.date4 }} > version.txt
Expand Down
10 changes: 4 additions & 6 deletions devices/common/diy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ sed -i '$a /etc/bench.log' package/base-files/files/lib/upgrade/keep.d/base-file
sed -i '/\/etc\/profile/d' package/base-files/files/lib/upgrade/keep.d/base-files-essential
sed -i '/^\/etc\/profile/d' package/base-files/Makefile
# find target/linux/x86 -name "config*" -exec bash -c 'cat kernel.conf >> "{}"' \;
find target/linux -path "target/linux/*/config-*" | xargs -i sed -i '$a CONFIG_ACPI=y\nCONFIG_X86_ACPI_CPUFREQ=y\n \
CONFIG_NR_CPUS=128\nCONFIG_FAT_DEFAULT_IOCHARSET="utf8"\nCONFIG_CRYPTO_CHACHA20_NEON=y\nCONFIG_CRYPTO_CHACHA20POLY1305=y\nCONFIG_BINFMT_MISC=y' {}
sed -i '$a CONFIG_ACPI=y\nCONFIG_X86_ACPI_CPUFREQ=y\n CONFIG_NR_CPUS=128\nCONFIG_FAT_DEFAULT_IOCHARSET="utf8"\nCONFIG_CRYPTO_CHACHA20_NEON=y\n \ CONFIG_CRYPTO_CHACHA20POLY1305=y\nCONFIG_BINFMT_MISC=y' `find target/linux -path "target/linux/*/config-*"`
sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config
#rm -rf ./feeds/packages/lang/{golang,node}
#svn export https://github.com/immortalwrt/packages/trunk/lang/golang feeds/packages/lang/golang
Expand All @@ -41,11 +40,10 @@ sed -i 's/+python\( \|$\)/+python3/g' package/*/*/*/Makefile
sed -i 's?../../lang?$(TOPDIR)/feeds/packages/lang?g' package/feeds/custom/*/Makefile
sed -i 's/PKG_BUILD_DIR:=/PKG_BUILD_DIR?=/g' feeds/luci/luci.mk
sed -i 's?admin/status/channel_analysis??' package/feeds/luci/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json
find package target -name inittab | xargs -i sed -i "s/askfirst/respawn/g" {}
sed -i "s/askfirst/respawn/g" `find package target -name inittab`
for ipk in $(find package/feeds/custom/* -maxdepth 0); do
if [[ ! -d "$ipk/patches" && ! "$(grep "codeload.github.com" $ipk/Makefile)" ]]; then
find $ipk/ -maxdepth 1 ! -path *tcping* -name "Makefile" \
| xargs -i sed -i "s/PKG_SOURCE_VERSION:=[0-9a-z]\{15,\}/PKG_SOURCE_VERSION:=HEAD/g" {}
sed -i "s/PKG_SOURCE_VERSION:=[0-9a-z]\{15,\}/PKG_SOURCE_VERSION:=HEAD/g" `find $ipk/ -maxdepth 1 ! -path *tcping* -name "Makefile"`
fi
done
sed -i 's/$(VERSION) &&/$(VERSION) ;/g' include/download.mk
Expand All @@ -60,7 +58,7 @@ if [ -f sdk.tar.xz ]; then
tar -xJf sdk.tar.xz -C sdk
cp -rf sdk/*/staging_dir/* ./staging_dir/
rm -rf sdk.tar.xz sdk
find "staging_dir/host/" -maxdepth 2 -name 'libelf*' | xargs -i rm -rf {} || true
rm -rf `find "staging_dir/host/" -maxdepth 2 -name 'libelf*'` || true
sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
if [ -f /usr/bin/python ]; then
ln -sf /usr/bin/python staging_dir/host/bin/python
Expand Down