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

Jump to bottom

asahi-kernel maintenance july 13th #98

Merged
merged 10 commits into from
Jul 14, 2024
Merged

asahi-kernel maintenance july 13th #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e293b26
sys-kernel/asahi-kernel: add 6.9.9_p4
jannau Jul 13, 2024
d7c17f3
virtual/dist-kernel: add 6.9.9_p4
jannau Jul 13, 2024
06936dd
virtual/dist-kernel: drop 6.8.10_p2
jannau Jul 13, 2024
c334497
sys-kernel/asahi-kernel: drop 6.8.10_p2
jannau Jul 13, 2024
479e7db
sys-kernel/asahi-kernel: stabilize 6.9.7_p1 for arm64
jannau Jul 13, 2024
29fcd04
virtual/dist-kernel: stabilize 6.9.7_p1 for arm64
jannau Jul 13, 2024
1c9fca2
sys-kernel/asahi-kernel: add 6.9.9_p5
jannau Jul 13, 2024
54116f7
virtual/dist-kernel: add 6.9.9_p5
jannau Jul 13, 2024
9f18720
virtual/dist-kernel: drop 6.9.9_p4
jannau Jul 13, 2024
e0c1f32
sys-kernel/asahi-kernel: drop 6.9.9_p4
jannau Jul 13, 2024
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
9 changes: 4 additions & 5 deletions sys-kernel/asahi-kernel/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
DIST genpatches-6.8-13.base.tar.xz 781972 BLAKE2B 7e8d26cca0d5fff4e1dbbd7088cb88ca705fa80df33437e1d9ca16305e162757010fa5c3ae5c869c20ed8a3bcbc72f89e055b5b8af1bb9110411e04e920e19d5 SHA512 e57405fe56630baef2d062973576b33b1528640491164f1cfd64bf230a9f2afb0c75e2ac6bfab2f085b4b7aee8c138315a9cfe56abc52e7c1a5385e80eb66ef1
DIST genpatches-6.8-13.extras.tar.xz 4048 BLAKE2B 095bac7134081b953aa4c7d5b40305ac572bee80eda680466a84c45bc4775a344dd40806aa6c0600dea61c9b7f9775e7b7481a364cc84aac3b8169bd8830ab63 SHA512 9f9a02ba1b8e1f13946d63d93f1e61959fc8377aaffc4a60e5b46e9f632df98ccbcb998f37e86c0f640ab478f6d0e7e0e92b1a0d04d076e1a0591841d90252b5
DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734 SHA512 7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c SHA512 b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
DIST genpatches-6.9-7.base.tar.xz 406988 BLAKE2B 066ce941f4338903a9f54071b34215dd16401d7e00e471615ea4b55cc5da7c8b312bb4c5224398c5348a76fdd4f1c6c5fe97213b913cc397ca92ecd1c33a8d86 SHA512 0175ff3df86d76b926efae0b15aa4addf2192d8b38f80a23e930c669a6a2453847d358383f2d61ccbc0c0b2e6e155a62bccbb4408b96c1ad3fb56eeaffbb1365
DIST genpatches-6.9-7.extras.tar.xz 4048 BLAKE2B 06ddd8d1443bbc4833040250b872d1949489fe14b0b4567c6c484d6bd6972a465ce0563c37a5272de1cd4ae66bd7711b1bf413b0a04b52bc00b9e549154b97fa SHA512 b74f2aa4050b06d7e5b588c87638470f92c45d26b3ffe7a16db43b487fc6460ec4e7037b81120a87608e773a63cbed678d4368b7d0399b841711fb63b1744f99
DIST genpatches-6.9-8.base.tar.xz 488932 BLAKE2B f8ec56d444df32d1e5fd922dfb4ad64429f2af2b5660a017b02d862452751282982ec354bc70b06072943b1dc3786adfb78bbfe70e5e366f98f3565c065d81ec SHA512 f0df3b5407c48415f76e3738a07f22fdd0fc168302cddd46d63c4057013e585c19c94ee7d9d418ae9eab2dc5597f58bdf4e78ec6f05e80217acfa7a119c9f5ce
DIST genpatches-6.9-8.extras.tar.xz 4052 BLAKE2B 6ef3193ca251ed0d707df368a55f98b2bf6e7b165cc03da9dcc122a96462eeccbd70c7e349402387dfe5cdf41e6ab9caeacc18d6c40d13e1a274828e910fa17a SHA512 f4a023f4d754de5bbce85affd0ca4636a89e129d298a0d81bc256632c9cb9886119ad6c1bd0c3703a2fb38b316ab52c11c7585d0d8a8991eb54e662c38d217f5
DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
DIST kernel-aarch64-16k-fedora.config-6.8.9-402-gentoo 279090 BLAKE2B a3bbacf28a6f7e624cb3e46b09d7c7221466a79af1610a8ffeb424ac6686cce386a595cb8ec814cb66b652e3d73844e98181832357d396a3c0f102e0311aa2d6 SHA512 2e521753eefa3ee7000c810f12f7f92fd1dfd9e224df03a31374a6847a4cc6a1079643e77312982d1823647b87b6fc4223c06aadcc964fbe503f856fb2fc744b
DIST kernel-aarch64-16k-fedora.config-6.9.6-400-gentoo 280483 BLAKE2B 76d033ed3b49bf3114e9f87d83edda1ec971fd37363caf8e0fad7e162b97f52c728ef2b7c8110b96dd352b9419a58d45b8104e690572d94f41107b1430e1a7ed SHA512 5b8e8a42dfcefb42ced270140896bf878fe22717af8468b43d2d54d38ede3f7ef74c2b9c706d0a38e5f138cfbab68f4831e0297e24ba4bd5b057d3e7b70d583d
DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
DIST linux-asahi-6.8.10-2.patch 5191055 BLAKE2B 8f95dfba521bdb81114a5b2508139f2fef80e472cde0369c19f5c9165fad83dbf53b77de710d291689efcae1f82c10ed8f4c533799727cb85b029e90a4ff0b18 SHA512 60bbc2c49ea3b4dcf9699761dd0a687eec5d3cd0f1c566fbbb17b27eea64f6649dcb1828be8c7853e3ade07cbed01a177b0f6a79629e5f05094cbeb0ac0369d9
DIST linux-asahi-6.9.6-1.patch 5137006 BLAKE2B 4eca2846028f32b21f7f88f95e314461e570a662e2df5ebd1d957c8e5433ab7de4ac79f46053b7536bc11d9f173a074db91987e6af1f4b4a02d3c2e0c3a61efc SHA512 2340b13ccad28d622708c101ab5c2ed104b95059773b636b99d13270cfcdaf5413529a149ed14a0a798273e7bf50368db491313fe700fec916856911550b78ca
DIST linux-asahi-6.9.7-1.patch 5296308 BLAKE2B 7a6640235488d11ebaa230d022fc89d85633830a9082d5fc7a62ed7a46272a62dcf3b5f68387bc2c2cbe14a5fc9167d31a896ddbeefe1d8d70557077d83d90df SHA512 0c0de341a98fa91da4670c14a704d5cc0aaaf80ad74af86b9df2a13762a0f9196f0c32b32fc80cffce4f65c459d92a9363bee7c2c5f02e35d5ecd0ee0118b5d4
DIST linux-asahi-6.9.9-4..asahi-6.9.9-5.patch 3334 BLAKE2B 2337fd9a0ea8dff0004ed39386e4c7090eac1f46b9859557a66064b9732320b144d7e578e15d9ebf33bd354bfc76c55e838bd68059ccea7dbf539bb6b06d1633 SHA512 7b6e54e25722a72c1c112471dfb0e2efbf1866d4f0bd9fbf3aa4121c77b93406651f209c106a7ce129f6f88c1419f425fe143253aad0a4f4f7494b898fa08ed1
DIST linux-asahi-6.9.9-4.patch 5352675 BLAKE2B f73ecb195cc1e7488ad50ffe69dd2672f5556add2bd5bb7c994d7e50482cee4b234a5abdd7b2591124dfbd2b7277ac7e4bcfe157b7207a811de5c4f55fb61af8 SHA512 316aea2fcb8985021eecbb082548d0149eca3bfe82ca06f49573fdd5299ecc32a30d587273050b2467a9b1ef7b04d73cc30eda27cde07bad5908c0beb0d1e9b6
2 changes: 1 addition & 1 deletion sys-kernel/asahi-kernel/asahi-kernel-6.9.7_p1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ SRC_URI="
S="${WORKDIR}/${MY_P}"

LICENSE="GPL-2"
KEYWORDS="~arm64"
KEYWORDS="arm64"

IUSE="debug"

Expand Down
20 changes: 11 additions & 9 deletions ...sahi-kernel/asahi-kernel-6.8.10_p2.ebuild → ...asahi-kernel/asahi-kernel-6.9.9_p5.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ K_NODRYRUN="1"
inherit kernel-build

MY_P=linux-${PV%.*}
GENPATCHES_P="genpatches-$(ver_cut 1-2)-13"
GENPATCHES_P="genpatches-$(ver_cut 1-2)-10"

if [[ ${PV} != ${PV/_rc} ]] ; then
# $PV is expected to be of following form: 6.0_rc5_p1
Expand All @@ -27,21 +27,23 @@ fi

# BASE_ASAHI_TAG is the first used TAG of specific release, i.e. usually
# the first tag of a linux 6.x or linux stable 6.x.y release
BASE_ASAHI_TAG="asahi-${MY_BASE}-2"
BASE_ASAHI_TAG="asahi-${MY_BASE}-4"
ASAHI_TAG="asahi-${MY_BASE}-${MY_TAG}"

CONFIG_VER=6.8.9-402-gentoo
CONFIG_VER=6.9.6-400-gentoo
GENTOO_CONFIG_VER=g13
FEDORA_CONFIG_DISTGIT="copr-dist-git.fedorainfracloud.org/cgit/@asahi/kernel"
# FEDORA_CONFIG_DISTGIT="copr-dist-git.fedorainfracloud.org/cgit/ngompa/fedora-asahi-dev"
FEDORA_CONFIG_SHA1=82a221a3043efc2022d39f532e13535f183661ca
FEDORA_CONFIG_SHA1=611c0eba110f04ecfee7f3a9eb4dd88d4bbcbf8c

DESCRIPTION="Asahi Linux kernel sources"
HOMEPAGE="https://asahilinux.org"
SRC_URI="
https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
https://github.com/AsahiLinux/linux/compare/v${MY_BASE}...${BASE_ASAHI_TAG}.patch
-> linux-${BASE_ASAHI_TAG}.patch
https://github.com/AsahiLinux/linux/compare/${BASE_ASAHI_TAG}...${ASAHI_TAG}.patch
-> linux-${BASE_ASAHI_TAG}..${ASAHI_TAG}.patch
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
Expand All @@ -53,7 +55,7 @@ SRC_URI="
S="${WORKDIR}/${MY_P}"

LICENSE="GPL-2"
KEYWORDS="arm64"
KEYWORDS="~arm64"

IUSE="debug"

Expand Down Expand Up @@ -84,8 +86,8 @@ src_prepare() {
# meh, genpatches have no directory
"${WORKDIR}"/*.patch
"${DISTDIR}/linux-${BASE_ASAHI_TAG}.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-enable-speakers.patch"
"${DISTDIR}/linux-${BASE_ASAHI_TAG}..${ASAHI_TAG}.patch"
"${FILESDIR}/${PN}-6.8-config-gentoo-Drop-RANDSTRUCT-from-GENTOO_KERNEL_SEL.patch"
)
default

Expand All @@ -112,11 +114,11 @@ src_prepare() {

# deselect all non APPLE arm64 ARCHs
merge_configs+=(
"${FILESDIR}"/linux-$(ver_cut 1-2)_arm64_deselect_non_apple_arch.config
"${FILESDIR}"/linux-6.8_arm64_deselect_non_apple_arch.config
)
# adjust base config for Apple silicon systems
merge_configs+=(
"${FILESDIR}"/linux-$(ver_cut 1-2)_arch_apple_overrides.config
"${FILESDIR}"/linux-6.8_arch_apple_overrides.config
)

kernel-build_merge_configs "${merge_configs[@]}"
Expand Down
125 changes: 0 additions & 125 deletions sys-kernel/asahi-kernel/files/asahi-kernel-6.8-enable-speakers.patch
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions sys-kernel/asahi-kernel/files/asahi-kernel-6.8.2_revert_spi_stable_asahi.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion virtual/dist-kernel/dist-kernel-6.9.7_p1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=8

DESCRIPTION="Virtual to depend on any Distribution Kernel"
SLOT="0/${PVR}"
KEYWORDS="~arm64"
KEYWORDS="arm64"

RDEPEND="
~sys-kernel/asahi-kernel-${PV}
Expand Down
2 changes: 1 addition & 1 deletion .../dist-kernel/dist-kernel-6.8.10_p2.ebuild → ...l/dist-kernel/dist-kernel-6.9.9_p5.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=8

DESCRIPTION="Virtual to depend on any Distribution Kernel"
SLOT="0/${PVR}"
KEYWORDS="arm64"
KEYWORDS="~arm64"

RDEPEND="
~sys-kernel/asahi-kernel-${PV}
Expand Down
Loading