diff options
Diffstat (limited to 'sys-kernel/linux-firmware')
| -rw-r--r-- | sys-kernel/linux-firmware/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild | 2 | ||||
| -rw-r--r-- | sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 36 |
3 files changed, 16 insertions, 26 deletions
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 84a2a4769fdf..e8f1a4cfd9aa 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -10,7 +10,7 @@ DIST linux-firmware-20241110.tar.xz 405593676 BLAKE2B 949fbcc2da08c0cbde6e03613c DIST linux-firmware-20241210.tar.xz 411440732 BLAKE2B 64e02e1c61bddb154f1434c4ee52de3f990730ad7125620f042b9706d1a721feb950b66a0f8d71606d5cba3c0e665c43b8c29e05e84227b7fdaba62b405ec59c SHA512 852e63a936fb324033d819ff14084787a1ac9af8682487cddea889e85e69b3297e262ebc9a1fe029c2ece4e010bfc067b3c8f7f87cd440b6334975f0d81d1226 EBUILD linux-firmware-20241017-r3.ebuild 11151 BLAKE2B 96164e2955922808133afba98801559a807944f9eec0fce6d0236f2f15f9112d3380464c908776fb8b8d803fcd4e5b6892c180b2aa5f1688d24aa2d4acea59a8 SHA512 cbb8bf436a9e7d0243b8a6463795be66a1bb53f7b7f181a53d329e46695f5a2c8c7ad6448ef6b04484fc262725654257ceb8f9ec186025209b11821084abc625 EBUILD linux-firmware-20241110.ebuild 11111 BLAKE2B 510aac5b9b833cd7ad2d15079a6f7cb0cf4a3514a1ee4e58c032c47e96cd0e24eec58787048925a42bf1197f98c4655d96513d972b6491389c256ee0d1bf34a8 SHA512 b782be258a2f17c66896e89d4cb5f2b64e5c005261f3f94ef5d8b36e6856c2f973a1bf78867cfcc9af2be4142e52f68183bb586c79a63ce627b33b87bc9ab2ee -EBUILD linux-firmware-20241210-r1.ebuild 11119 BLAKE2B 90b653640aa35480664426299204acd98217caec0c27de75a7d25d23510f62823e859db94ff7016f026fd4d71ac51a52e84a6ca1212748bd0d387fdecbff2d40 SHA512 02ec0b4f47f58c7da62a5b0b168b62f12e78b31ff594c123126f12acae2fff428bb87a0d3f50f7a25aae1b3e7e896202bf9651f42c47c6da4604735ac66cd2b1 +EBUILD linux-firmware-20241210-r1.ebuild 11111 BLAKE2B 048407693153ffa3aed53d8a0b04ab35c0c2d9bdd6d24525edc55550c4ea620211ce28d5e187aaba24f4f9e13c15aaea2ec1f64a454744973330131ebca5ab9c SHA512 18a7069eccc5666ed08bab461a3bfa9b19d270fd28ee7a0392efa4f1d1502dcb50d4b6502b6e67767af526cff83c5ae9d759588435c84fc8b8c0762957fa5d3b EBUILD linux-firmware-20241210.ebuild 11111 BLAKE2B 510aac5b9b833cd7ad2d15079a6f7cb0cf4a3514a1ee4e58c032c47e96cd0e24eec58787048925a42bf1197f98c4655d96513d972b6491389c256ee0d1bf34a8 SHA512 b782be258a2f17c66896e89d4cb5f2b64e5c005261f3f94ef5d8b36e6856c2f973a1bf78867cfcc9af2be4142e52f68183bb586c79a63ce627b33b87bc9ab2ee -EBUILD linux-firmware-99999999.ebuild 11375 BLAKE2B aa565e1987a561216363d1166c7d41a3a25d714472c82a0d38c95c44db5d6d4deef3d50a45abd38915aa895fc071b54becd178d09dd23a7f2d80b2ed7d3a80e5 SHA512 829fc5efe1107e7090c1d7fc58248886f672a24c15b4e02944a97b6f948bcc69c4defebbaa42a82b283639b7bf942ee5c45315aa3b1190f582ec1ed75726b937 +EBUILD linux-firmware-99999999.ebuild 10907 BLAKE2B 1ad8f660e98921b254be65188d8071903a1ccaf4df7a3b6544bc4192bac5b5932f3e9deef61cc8e3890096c74ab49cdd60d4210b1abcd060c92a257387d01243 SHA512 d7b9c180c29fbeb0bab22ccd0eb3619b3acc34746aacf843cd1a9bf1906c4b38c116d04d359af39d368734854ecfcf45f76d203254e510c0612c662f8855aed6 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5 diff --git a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild index 10ff5ade1f44..4f68f0a8809f 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20241210-r1.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz" fi - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Linux firmware files" diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index f49e8118b8be..2e4486362db9 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -72,6 +72,9 @@ IDEPEND=" " QA_PREBUILT="*" +PATCHES=( + "${FILESDIR}"/${PN}-copy-firmware-r7.patch +) pkg_pretend() { if use initramfs; then @@ -231,6 +234,16 @@ src_install() { local FW_OPTIONS=( "-v" ) git config --global --add safe.directory "${S}" || die + local files_to_keep= + + if use savedconfig; then + if [[ -s "${S}/${PN}.conf" ]]; then + files_to_keep="${T}/files_to_keep.lst" + grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die + [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" + FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" ) + fi + fi if use compress-xz; then FW_OPTIONS+=( "--xz" ) @@ -296,29 +309,6 @@ src_install() { einfo "Removing broken symlinks ..." find * -xtype l -print -delete || die - if use savedconfig; then - if [[ -s "${S}/${PN}.conf" ]]; then - local files_to_keep="${T}/files_to_keep.lst" - grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die - [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" - - einfo "Applying USE=savedconfig; Removing all files not listed in config ..." - find ! -type d -printf "%P\n" \ - | grep -Fvx -f "${files_to_keep}" \ - | xargs -d '\n' --no-run-if-empty rm -v - - if [[ ${PIPESTATUS[0]} -ne 0 ]]; then - die "Find failed to print installed files" - elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then - # grep returns exit status 1 if no lines were selected - # which is the case when we want to keep all files - die "Grep failed to select files to keep" - elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then - die "Failed to remove files not listed in config" - fi - fi - fi - # remove empty directories, bug #396073 find -type d -empty -delete || die |