OpenWrt/Lienol-openwrt
1
0
Fork 0
mirror of https://github.com/Lienol/openwrt synced 2025-01-08 11:37:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'openwrt-23.05' of https://github.com/openwrt/openwrt into 23.05

Browse Source
This commit is contained in:
Lienol 2024-12-17 15:02:51 +08:00
commit 6a9651ae33
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/feeds.mk
View File

@ -33,7 +33,7 @@ define FeedSourcesAppend
echo 'src/gz %d_core %U/targets/%S/packages'; \ echo 'src/gz %d_core %U/targets/%S/packages'; \
$(strip $(if $(CONFIG_PER_FEED_REPO), \ $(strip $(if $(CONFIG_PER_FEED_REPO), \
echo 'src/gz %d_base %U/packages/%A/base'; \ echo 'src/gz %d_base %U/packages/%A/base'; \
$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \ $(if $(CONFIG_BUILDBOT), \
echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \ echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
$(foreach feed,$(FEEDS_AVAILABLE), \ $(foreach feed,$(FEEDS_AVAILABLE), \
$(if $(CONFIG_FEED_$(feed)), \ $(if $(CONFIG_FEED_$(feed)), \

19
scripts/json_overview_image_info.py
View File

@ -47,7 +47,13 @@ for device_id, profile in output.get("profiles", {}).items():
if output: if output:
default_packages, output["arch_packages"] = run( (
default_packages,
output["arch_packages"],
linux_version,
linux_release,
linux_vermagic,
) = run(
[ [
"make", "make",
"--no-print-directory", "--no-print-directory",
@ -55,16 +61,23 @@ if output:
"target/linux/", "target/linux/",
"val.DEFAULT_PACKAGES", "val.DEFAULT_PACKAGES",
"val.ARCH_PACKAGES", "val.ARCH_PACKAGES",
"val.LINUX_VERSION",
"val.LINUX_RELEASE",
"val.LINUX_VERMAGIC",
"V=s",
], ],
stdout=PIPE, stdout=PIPE,
stderr=PIPE,
check=True, check=True,
env=environ.copy().update({"TOPDIR": Path().cwd()}), env=environ.copy().update({"TOPDIR": Path().cwd()}),
universal_newlines=True, universal_newlines=True,
).stdout.splitlines() ).stdout.splitlines()
output["default_packages"] = sorted(default_packages.split()) output["default_packages"] = sorted(default_packages.split())
output["linux_kernel"] = {
"version": linux_version,
"release": linux_release,
"vermagic": linux_vermagic,
}
output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":"))) output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
else: else:
print("JSON info file script could not find any JSON files for target") print("JSON info file script could not find any JSON files for target")

7
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts
View File

@ -58,10 +58,11 @@
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
}; };
switch { rfkill {
label = "switch-button"; label = "WiFi on/off switch";
gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_SETUP>; linux,code = <KEY_RFKILL>;
linux,input-type = <EV_SW>;
}; };
}; };