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.

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

[pull] main from armbian:main #196

Merged
merged 10 commits into from
Sep 30, 2024
177 changes: 176 additions & 1 deletion git_sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,52 @@
{
"source": "https://github.com/armbian/build",
"branch": "main",
"sha1": "6a03d070d79fb092d55fcce90a2881ca27fbdb4a"
"sha1": "89476e86f3f1bb508cbe2d507ff9df8dc76a1def"
},
{
"source": "https://github.com/armbian/config",
"branch": "master",
"sha1": "473f9990fe722bc7fa2c77795f50dea3118708ff"
},
{
"source": "https://github.com/armbian/firmware",
"branch": "master",
"sha1": "8e7c8a855f0a91d3a34c1e37086d5aa894b2011e"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.10.y",
"sha1": "8a886bee7aa574611df83a028ab435aeee071e00"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git",
"branch": "main",
"sha1": "c979a06518069901e4c43e0019d3a15b435b7e16"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.1.y",
"sha1": "e526b12bf9169887f8cfe5afed2b10e56bdca4c3"
},
{
"source": "https://github.com/AvaotaSBC/linux.git",
"branch": "linux-5.15",
"sha1": "af5fc555764e1ad015ba43f9b5151ee9180c0be6"
},
{
"source": "https://github.com/starfive-tech/linux",
"branch": "JH7110_VisionFive2_devel",
"sha1": "5dfc879916d946dcc2521ef1eccd1d8bfb06a75e"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-6.6.y",
"sha1": "561bbd55f91a8e94576ca3fbf35a0c99ff70d4b2"
},
{
"source": "https://github.com/radxa/u-boot.git",
"branch": "next-dev-v2024.03",
"sha1": "875ab5399d8fa48412b442e7d5029b69f0363a3e"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
Expand All @@ -28,5 +73,135 @@
"source": "https://github.com/armbian/linux-rockchip.git",
"branch": "rk-6.1-rkr3",
"sha1": "8986153dd6a03ec24ca4f231d51cdd6024c8a887"
},
{
"source": "https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel",
"branch": "ti-linux-6.1.y",
"sha1": "c1c2f1971fbf6ddad93a8c94314fe8221e7aa6be"
},
{
"source": "https://github.com/khadas/linux.git",
"branch": "khadas-vims-5.15.y",
"sha1": "b122f1595d14ec07b1ac46585875fbc2304550b9"
},
{
"source": "https://github.com/khadas/common_drivers",
"branch": "khadas-vims-5.15.y",
"sha1": "fc07bd8e505a8f43c8a4aad7382078007571a0f9"
},
{
"source": "https://source.denx.de/u-boot/u-boot.git",
"branch": "v2024.01",
"sha1": "aa6d5f7192d5860458b5ef0163aad1d94e9bde70"
},
{
"source": "https://github.com/SolidRun/u-boot.git",
"branch": "v2018.01-solidrun-imx6",
"sha1": "19858de9c94adb294dde90ac99d70526a2c42fd6"
},
{
"source": "https://github.com/functionland/u-boot.git",
"branch": "next-dev",
"sha1": "46da2bfe5068535caf919a36c6fcc5a7e744a04b"
},
{
"source": "https://github.com/stvhay/u-boot.git",
"branch": "rockchip-rk3588-unified",
"sha1": "2f6e967dc901ae570f522d1b47309e7c34acf542"
},
{
"source": "https://github.com/khadas/u-boot.git",
"branch": "khadas-edges-v2017.09",
"sha1": "757ac83af9061ef30b37f9357943fd810013c892"
},
{
"source": "https://github.com/khadas/u-boot.git",
"branch": "khadas-vims-v2019.01",
"sha1": "3a3d4275ad0eabb5ad092f948d3549a5e102bffd"
},
{
"source": "https://github.com/radxa/u-boot.git",
"branch": "rk35xx-2024.01",
"sha1": "31b85240876dc43492b0826a74b99c23fbf6ed9d"
},
{
"source": "https://github.com/tq-systems/u-boot-tqmaxx.git",
"branch": "TQMa8-v2020.04_imx_5.4.70_2.3.0",
"sha1": "948f078446e0acf62eb07473586dccf68e326407"
},
{
"source": "https://github.com/Kwiboo/u-boot-rockchip.git",
"branch": "rk3xxx-2024.04",
"sha1": "830cfcfdf54a1f08a3ca7fc17e69b4bc18cece50"
},
{
"source": "https://github.com/Kwiboo/u-boot-rockchip.git",
"branch": "rk3xxx-2024.07",
"sha1": "2e2ae1fb69a25217640bfe2fb9abaf9f4fbacead"
},
{
"source": "https://github.com/hardkernel/u-boot.git",
"branch": "odroidc-v2011.03",
"sha1": "b7b8dc21b64b9494618325c9b4d2fbae728aeed6"
},
{
"source": "https://github.com/hardkernel/u-boot.git",
"branch": "odroidxu4-v2017.05",
"sha1": "42ac93dcfbbb8a08c2bdc02e19f96eb35a81891a"
},
{
"source": "https://github.com/hardkernel/linux",
"branch": "odroid-6.6.y",
"sha1": "1fd1fd7cd2d4e163aefe8f7a8dc4f3890ca6aa50"
},
{
"source": "https://github.com/orangepi-xunlong/u-boot-orangepi.git",
"branch": "v2017.09-rk3588",
"sha1": "5e34a2115e1dd9128892b828d869f74677361a78"
},
{
"source": "https://github.com/chainsx/phytium-linux-kernel",
"branch": "linux-5.10",
"sha1": "b17835d38155a8c2bcb3e2d0f3f55989bf2f1b98"
},
{
"source": "https://github.com/chainsx/phytium-linux-kernel",
"branch": "linux-6.6",
"sha1": "b9b9d633ab5b213fe492a62f35c6cfd5a2614f42"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.1.y",
"sha1": "fbd8b3facb36ce888b1cdcf5f45a78475a8208f2"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.6.y",
"sha1": "2b5de12af9bb390239d5f3385c49e0c34f335de8"
},
{
"source": "https://github.com/raspberrypi/linux",
"branch": "rpi-6.10.y",
"sha1": "7fb4db26eacf81948fbc1a3c2cc57fb74944c0be"
},
{
"source": "https://github.com/jhovold/linux.git",
"branch": "wip/sc8280xp-6.11",
"sha1": "c8032fa3062e04cbb68f070959fc746b91abb16e"
},
{
"source": "https://github.com/jglathe/linux_ms_dev_kit.git",
"branch": "jg/wdk2023-gunyah-6.7-rc6",
"sha1": "401bea57d6b96f440142b9039d483c671c4a9587"
},
{
"source": "https://github.com/SolidRun/u-boot",
"branch": "v2018.01-solidrun-a38x",
"sha1": "a8004c1f1112ca2f867badccce5a76f052034853"
},
{
"source": "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git",
"branch": "linux-5.15.y",
"sha1": "3a5928702e7120f83f703fd566082bfb59f1a57e"
}
]
2 changes: 1 addition & 1 deletion nightly.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Armbian OS",
"version": "24.11.0-trunk.188",
"version": "24.11.0-trunk.190",
"description": "Linux for ARM development boards",
"keywords": [
"ARM",
Expand Down
4 changes: 2 additions & 2 deletions userpatches/targets-all-not-eos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ targets:
USERSPACE_ONLY: "yes" # this does nothing, but some var must exist. might as well be this.
items-from-inventory:
userspace: # creates items from userspace inventory automatically... 'eos' distributions are always skipped.
skip-releases: [ "sid", "trixie", "oracular" ] # do NOT include these releases
skip-releases: [ "focal", "sid", "trixie", "oracular" ] # do NOT include these releases
#only-releases: ["trixie", "bookworm", "bullseye"] # ONLY include these releases
#skip-desktops: [ "lxde" ] # do NOT include these desktops
only-desktops: ["gnome", "xfce", "cinnamon" ] # ONLY include these desktops
Expand Down Expand Up @@ -77,7 +77,7 @@ targets:
items-from-inventory:
userspace: # creates items from userspace inventory automatically... 'eos' distributions are always skipped.
#only-releases: ["bookworm"] # ONLY include these releases
skip-releases: [ "trixie" ]
skip-releases: [ "focal", "trixie" ]
#skip-desktops: [ "lxde" ] # do NOT include these desktops
only-desktops: ["xfce"] # ONLY include these desktops
cli: yes # include normal CLI userspace
Expand Down
Loading