nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2731 from AiyionPrime/fix-targets-scripts-contrib

Browse Source 
Fix targets, scripts & contrib
This commit is contained in:
Andreas Ziegler 2022-12-19 01:21:13 +01:00 committed by GitHub
commit 3c0f8596f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.editorconfig
View File

@ -27,6 +27,8 @@ indent_size = 2
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
[*.pl]
[*.py] [*.py]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4

2
contrib/i18n-scan.pl
View File

@ -79,7 +79,7 @@ if( open F, "find @ARGV -type f '(' -name '*.html' -o -name '*.lua' ')' |" )
{ {
my $stag = quotemeta $1; my $stag = quotemeta $1;
my $etag = $stag; my $etag = $stag;
$etag =~ s/\[/]/g; $etag =~ s/\[/]/g;
( $res ) = extract_tagged($code, $stag, $etag); ( $res ) = extract_tagged($code, $stag, $etag);

14
scripts/copy_output.lua
View File

@ -69,16 +69,16 @@ end
-- copy kernel image with debug symbols -- copy kernel image with debug symbols
local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst', local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst',
env.GLUON_DEBUGDIR, env.GLUON_DEBUGDIR,
target) target)
lib.exec {'rm', '-f', kernel_debug_glob} lib.exec {'rm', '-f', kernel_debug_glob}
local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst', local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst',
bindir) bindir)
local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst', local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst',
env.GLUON_DEBUGDIR, env.GLUON_DEBUGDIR,
lib.site_code, lib.site_code,
env.GLUON_RELEASE, env.GLUON_RELEASE,
target) target)
lib.exec {'cp', kernel_debug_source, kernel_debug_dest} lib.exec {'cp', kernel_debug_source, kernel_debug_dest}

4
scripts/update.sh
View File

@ -21,8 +21,8 @@ for module in $GLUON_MODULES; do
if ! git branch -f base "$commit" 2>/dev/null; then if ! git branch -f base "$commit" 2>/dev/null; then
git fetch "$repo" "$branch" git fetch "$repo" "$branch"
git branch -f base "$commit" || { git branch -f base "$commit" || {
echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2 echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2
exit 1 exit 1
} }
fi fi
done done

8
targets/lantiq-xrx200
View File

@ -49,10 +49,10 @@ device('avm-fritz-box-7412', 'avm_fritz7412', {
-- TP-Link -- TP-Link
-- CAVEAT: These devices don't have a dedicated WAN port. -- CAVEAT: These devices don't have a dedicated WAN port.
-- All ethernet ports on the device are bridged and -- All ethernet ports on the device are bridged and
-- used as WAN ports. Clients connected to these -- used as WAN ports. Clients connected to these
-- ports will be connected to your private network. -- ports will be connected to your private network.
device('tp-link-td-w8970', 'tplink_tdw8970', { device('tp-link-td-w8970', 'tplink_tdw8970', {
factory = false, factory = false,

2
targets/ramips-mt7621
View File

@ -8,7 +8,7 @@ device('asus-rt-ac57u', 'asus_rt-ac57u', {
-- Cudy -- Cudy
device('cudy-wr2100', 'cudy_wr2100', { device('cudy-wr2100', 'cudy_wr2100', {
factory = false, factory = false,
}) })