diff --git a/profiles/glinet_x3000.yml b/profiles/glinet_x3000.yml index 2a5dff3..9a4641a 100644 --- a/profiles/glinet_x3000.yml +++ b/profiles/glinet_x3000.yml @@ -4,13 +4,16 @@ description: Add the glinet dependencies for the GL.iNET X3000 feeds: - name: gl_feed_common uri: https://github.com/gl-inet/gl-feeds.git - revision: 9a86b491f88d856936ab6c538732a212759111ac + revision: f86ec7f77b7a36c96a9b5a9b7fea30ccc9ac5fe6 - name: gl_feed_21_02 uri: https://github.com/gl-inet/gl-feeds.git revision: 032786d5ff300ebdd83fb1b5fec5344b3da04953 - name: mt7981_private uri: https://gitlab.com/gl.sdk4.0/gl.router/mt7981-feeds.git revision: c8031866e73dfb6d7a4912113c1bcab77046fd0b + - name: glinet + uri: git@gitlab.com:gl.sdk4.0/gl.router/gl-sdk4-collect.git + revision: 048c6e02cbc3ade54a12b9d22419ed4b963fa3b6 packages: - kmod-gl-sdk4-fan @@ -23,3 +26,7 @@ packages: - fwdd - kmod-mtfwd - kmod-mtqos + +diffconfig: | + CONFIG_PACKAGE_gl-sdk4-ui-btnsettings=n + CONFIG_PACKAGE_gl-sdk4-switch-button=n diff --git a/profiles/glinet_x3000_private.yml b/profiles/glinet_x3000_private.yml deleted file mode 100644 index 2fd0c37..0000000 --- a/profiles/glinet_x3000_private.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -description: Add the glinet x3000 private package -feeds: - - name: glinet - uri: git@gitlab.com:gl.sdk4.0/gl.router/gl-sdk4-collect.git - revision: 048c6e02cbc3ade54a12b9d22419ed4b963fa3b6 - diff --git a/profiles/glinet_xe3000.yml b/profiles/glinet_xe3000.yml index 8430f92..72c4b16 100644 --- a/profiles/glinet_xe3000.yml +++ b/profiles/glinet_xe3000.yml @@ -4,13 +4,16 @@ description: Add the glinet dependencies for the GL.iNET XE3000 feeds: - name: gl_feed_common uri: https://github.com/gl-inet/gl-feeds.git - revision: 9a86b491f88d856936ab6c538732a212759111ac + revision: f86ec7f77b7a36c96a9b5a9b7fea30ccc9ac5fe6 - name: gl_feed_21_02 uri: https://github.com/gl-inet/gl-feeds.git revision: 032786d5ff300ebdd83fb1b5fec5344b3da04953 - name: mt7981_private uri: https://gitlab.com/gl.sdk4.0/gl.router/mt7981-feeds.git revision: c8031866e73dfb6d7a4912113c1bcab77046fd0b + - name: glinet + uri: git@gitlab.com:gl.sdk4.0/gl.router/gl-sdk4-collect.git + revision: 048c6e02cbc3ade54a12b9d22419ed4b963fa3b6 packages: - kmod-gl-sdk4-fan @@ -23,3 +26,7 @@ packages: - fwdd - kmod-mtfwd - kmod-mtqos + +diffconfig: | + CONFIG_PACKAGE_gl-sdk4-ui-btnsettings=n + CONFIG_PACKAGE_gl-sdk4-switch-button=n diff --git a/scripts/openwrt/gen_config.py b/scripts/openwrt/gen_config.py index a1a11c1..b0223ca 100755 --- a/scripts/openwrt/gen_config.py +++ b/scripts/openwrt/gen_config.py @@ -209,12 +209,12 @@ CONFIG_TARGET_{profile["target"]}_{profile["subtarget"]}=y CONFIG_TARGET_{profile["target"]}_{profile["subtarget"]}_DEVICE_{profile["profile"]}=y """ - config_output += f"{profile.get('diffconfig', '')}" - for package in profile.get("packages", []): print(f"Add package to .config: {package}") config_output += f"CONFIG_PACKAGE_{package}=y\n" + config_output += f"{profile.get('diffconfig', '')}" + Path(".config").write_text(config_output) print("Configuration written to .config")