From da977c427514ba5205d63db51e0d7f831d4e994d Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Thu, 21 Jul 2022 12:54:06 +0300 Subject: [PATCH] upg base linux-firmware --- base/PKGBUILD | 34 ++++++---- base/PKGBUILD-arch | 10 ++- base/README.txt | 9 ++- base/dependencies | 13 ++++ base/deps | 13 ---- linux-firmware/PKGBUILD | 128 ++++++++++++++++++++++++++++++----- linux-firmware/PKGBUILD-arch | 120 ++++++++++++++++++++++++++++---- linux-firmware/clean | 2 +- linux-firmware/deps | 1 - linux-firmware/key | 2 +- linux-firmware/time | 7 +- pacman/PKGBUILD | 16 +++-- pacman/PKGBUILD-arch | 8 ++- pacman/deps | 2 + 14 files changed, 287 insertions(+), 78 deletions(-) create mode 100644 base/dependencies diff --git a/base/PKGBUILD b/base/PKGBUILD index 92ac1e4..89660a7 100644 --- a/base/PKGBUILD +++ b/base/PKGBUILD @@ -6,13 +6,25 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=base -pkgdesc='Minimal set of packages to define a basic JOBORun Linux installation' pkgver=0.1 -pkgrel=06 +pkgrel=07 +pkgdesc='Minimal set of packages to define a basic JOBORun Linux installation' +url='http://pozol.net' groups=( jobbase ) arch=(x86_64) source=( README.txt ) -depends=( + +optdepends=('linux-lts: recommended kernel' + 'linux: alternative latest lts kernel' + 's6-suite: s6 and 66 system and basic booting necessities' + 'grub: bootloader capable of a multiboot system of various OSes' + 'syslinux: alternative bootloader lighter than grub' ) + +makedepends=('sh' 'glibc') + +package() { + + depends=( # very very core 'filesystem' 'gcc-libs' 'glibc' 'bash' @@ -39,23 +51,15 @@ depends=( # fonts for console 'terminus-font' -) + ) -optdepends=('linux-lts: recommended kernel' - 'linux: alternative latest lts kernel' - 's6-suite: s6 and 66 system and basic booting necessities' - 'grub: bootloader capable of a multiboot system of various OSes' - 'syslinux: alternative bootloader lighter than grub' ) - -makedepends=('sh' 'glibc') - -package() { cd "$pkgdir" - install -Dm644 "$srcdir"/README.txt "$pkgdir"/src/README.txt + install -Dm644 "$srcdir"/README.txt "$pkgdir"/src/README.txt } #---- license gpg-key sha512sums ---- license=('ISC') -sha256sums=(3acf5ee17f5970920a25021bc5d3a6372a0c395f95788bd43e88784bffa2beef) # README.txt +sha256sums=(91b46aa5cfa851075296ca34f39ad19b767e976ecd007d2908f726e8ba7ce1df) # README.txt + diff --git a/base/PKGBUILD-arch b/base/PKGBUILD-arch index 0f23db2..5702901 100644 --- a/base/PKGBUILD-arch +++ b/base/PKGBUILD-arch @@ -3,8 +3,8 @@ # Contributor: Eli Schwartz pkgname=base -pkgver=2 -pkgrel=2 +pkgver=3 +pkgrel=1 pkgdesc='Minimal package set to define a basic Arch Linux installation' url='https://www.archlinux.org' arch=('any') @@ -20,9 +20,13 @@ depends=( 'gettext' 'pciutils' 'psmisc' 'shadow' 'util-linux' 'bzip2' 'gzip' 'xz' # distro defined requirements - 'licenses' 'pacman' 'systemd' 'systemd-sysvcompat' + 'licenses' 'pacman' 'archlinux-keyring' 'systemd' 'systemd-sysvcompat' # networking, ping, etc 'iputils' 'iproute2' ) optdepends=('linux: bare metal support') + +# vim: ts=2 sw=2 et: + + diff --git a/base/README.txt b/base/README.txt index 5dcdfed..9939e33 100644 --- a/base/README.txt +++ b/base/README.txt @@ -8,7 +8,7 @@ For a minimal chroot pkg building environment install jobbot. ________ What you initially get is a console non graphic system, but we have a setup script that you can -choose between an openbox or Jwm bundle if you this is what you like. Of course you are free to +choose between an openbox or Jwm bundle if this is what you like. Of course you are free to install whatever environment you like from Obarun, Arch, OUR and AUR repositories. It is just that we are not willing to support and assist in anything beyond the minimalistic installation of a window manager and this without a Display Manager and its complications. @@ -24,5 +24,10 @@ with the least possible complications. We are always open to constructive criticism, suggestions, recommendations, complaints,... We are here to discuss, not just one on one, but collectively, all that we have an interest in improving -this system. +this system. We perceive joborun as an alternative initial proposal containing specific guidelines, +values and principles. Where it will go and how it will evolve will depend on the participating +community, contributing, proposing, suggesting, arguing, debating, etc. When we collectivel get +convinced of a change the change will take place according to our new agreement. + +Simple? Let us hope it is. diff --git a/base/dependencies b/base/dependencies new file mode 100644 index 0000000..de6796f --- /dev/null +++ b/base/dependencies @@ -0,0 +1,13 @@ +runit +runit-rc +joborun66 +eudev +net-tools +dhclient +wpa_supplicant +runit-service-scripts +terminus-font +jobo-setup +arch-install-scripts +inetutils +ntp diff --git a/base/deps b/base/deps index de6796f..e69de29 100644 --- a/base/deps +++ b/base/deps @@ -1,13 +0,0 @@ -runit -runit-rc -joborun66 -eudev -net-tools -dhclient -wpa_supplicant -runit-service-scripts -terminus-font -jobo-setup -arch-install-scripts -inetutils -ntp diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD index e5546db..670bb57 100644 --- a/linux-firmware/PKGBUILD +++ b/linux-firmware/PKGBUILD @@ -1,40 +1,43 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=linux-firmware -pkgname=(linux-firmware amd-ucode) -#_tag=20211027 -#_tag=20190923 -_tag=20191022 -#pkgver=20211027.1d00989 -#pkgver=20190923.417a9c6 -pkgver=20191022.2b016af +pkgname=(linux-firmware-whence linux-firmware amd-ucode + linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x} +) +_tag=20220708 +pkgver=20220708.be7798e pkgrel=01 pkgdesc="Firmware files for Linux" url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" arch=('any') makedepends=('git') options=(!strip) -source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed") +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed" + 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch) _backports=( ) prepare() { - cd ${pkgname} + cd ${pkgbase} local _c for _c in "${_backports[@]}"; do git log --oneline -1 "${_c}" git cherry-pick -n "${_c}" done + + # add firmware compression support - patch taken from Fedora + patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch } pkgver() { - cd ${pkgname} + cd ${pkgbase} # Commit date + short rev echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD) @@ -45,7 +48,7 @@ build() { cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin # Reproducibility: set the timestamp on the bin file - if [[ -n ${SOURCE_DATE_EPOCH} ]]; then + if [[ -n ${SOURCE_DATE_EPOCH} ]]; then touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin fi @@ -55,16 +58,56 @@ build() { bsdtar --null -cf - --format=newc @- > amd-ucode.img } -package_linux-firmware() { - cd ${pkgname} +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} - make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install +package_linux-firmware-whence() { + pkgdesc+=" - contains the WHENCE license file which documents the vendor license details" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/WHENCE +} + +package_linux-firmware() { + depends=('linux-firmware-whence') + + cd ${pkgbase} + + make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware installcompress # Trigger a microcode reload for configurations not using early updates echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* WHENCE + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* + + # split + cd "${pkgdir}" + + _pick linux-firmware-nfp usr/lib/firmware/netronome + _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome + + _pick linux-firmware-mellanox usr/lib/firmware/mellanox + + _pick linux-firmware-marvell usr/lib/firmware/{libertas,mwl8k,mwlwifi,mrvl} + _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP} + + _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*} + _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom + + _pick linux-firmware-liquidio usr/lib/firmware/liquidio + _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio + + _pick linux-firmware-qlogic usr/lib/firmware/{qlogic,qed,ql2???_*,c{b,t,t2}fw-*} + _pick linux-firmware-qlogic usr/share/licenses/${pkgname}/LICENCE.{qla1280,qla2xxx} + + _pick linux-firmware-bnx2x usr/lib/firmware/bnx2x* } package_amd-ucode() { @@ -76,10 +119,61 @@ package_amd-ucode() { install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode } +package_linux-firmware-nfp() { + pkgdesc+=" - nfp / Firmware for Netronome Flow Processors" + depends=('linux-firmware-whence') + + mv -v linux-firmware-nfp/* "${pkgdir}" +} + +package_linux-firmware-mellanox() { + pkgdesc+=" - mellanox / Firmware for Mellanox Spectrum switches" + depends=('linux-firmware-whence') + + mv -v linux-firmware-mellanox/* "${pkgdir}" +} + +package_linux-firmware-marvell() { + pkgdesc+=" - marvell / Firmware for Marvell devices" + depends=('linux-firmware-whence') + + mv -v linux-firmware-marvell/* "${pkgdir}" +} + +package_linux-firmware-qcom() { + pkgdesc+=" - qcom / Firmware for Qualcomm SoCs" + depends=('linux-firmware-whence') + + mv -v linux-firmware-qcom/* "${pkgdir}" +} + +package_linux-firmware-liquidio() { + pkgdesc+=" - liquidio / Firmware for Cavium LiquidIO server adapters" + depends=('linux-firmware-whence') + + mv -v linux-firmware-liquidio/* "${pkgdir}" +} + +package_linux-firmware-qlogic() { + pkgdesc+=" - qlogic / Firmware for QLogic devices" + depends=('linux-firmware-whence') + + mv -v linux-firmware-qlogic/* "${pkgdir}" +} + +package_linux-firmware-bnx2x() { + pkgdesc+=" - bnx2x / Firmware for Broadcom NetXtreme II 10Gb ethernet adapters" + depends=('linux-firmware-whence') + + mv -v linux-firmware-bnx2x/* "${pkgdir}" +} + #---- license gpg-key sha256sums ---- license=('GPL2' 'GPL3' 'custom') validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer -sha256sums=(SKIP) +sha256sums=(SKIP # linux-firmware + aa11b2eed9c0be42571b45eb7153908a43290f02a5fc715aefcaa81030a1832f) # 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch + diff --git a/linux-firmware/PKGBUILD-arch b/linux-firmware/PKGBUILD-arch index 6abcef1..7d7f0c1 100644 --- a/linux-firmware/PKGBUILD-arch +++ b/linux-firmware/PKGBUILD-arch @@ -1,9 +1,11 @@ # Maintainer: Thomas Bächler pkgbase=linux-firmware -pkgname=(linux-firmware amd-ucode) -_tag=20211027 -pkgver=20211027.1d00989 +pkgname=(linux-firmware-whence linux-firmware amd-ucode + linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x} +) +_tag=20220708 +pkgver=20220708.be7798e pkgrel=1 pkgdesc="Firmware files for Linux" url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" @@ -11,25 +13,30 @@ license=('GPL2' 'GPL3' 'custom') arch=('any') makedepends=('git') options=(!strip) -source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed") -sha256sums=('SKIP') +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed" + 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch) +sha256sums=('SKIP' + 'aa11b2eed9c0be42571b45eb7153908a43290f02a5fc715aefcaa81030a1832f') validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer _backports=( ) prepare() { - cd ${pkgname} + cd ${pkgbase} local _c for _c in "${_backports[@]}"; do git log --oneline -1 "${_c}" git cherry-pick -n "${_c}" done + + # add firmware compression support - patch taken from Fedora + patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch } pkgver() { - cd ${pkgname} + cd ${pkgbase} # Commit date + short rev echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD) @@ -40,7 +47,7 @@ build() { cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin # Reproducibility: set the timestamp on the bin file - if [[ -n ${SOURCE_DATE_EPOCH} ]]; then + if [[ -n ${SOURCE_DATE_EPOCH} ]]; then touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin fi @@ -50,16 +57,56 @@ build() { bsdtar --null -cf - --format=newc @- > amd-ucode.img } -package_linux-firmware() { - cd ${pkgname} +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} - make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install +package_linux-firmware-whence() { + pkgdesc+=" - contains the WHENCE license file which documents the vendor license details" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/WHENCE +} + +package_linux-firmware() { + depends=('linux-firmware-whence') + + cd ${pkgbase} + + make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware installcompress # Trigger a microcode reload for configurations not using early updates echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* WHENCE + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* + + # split + cd "${pkgdir}" + + _pick linux-firmware-nfp usr/lib/firmware/netronome + _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome + + _pick linux-firmware-mellanox usr/lib/firmware/mellanox + + _pick linux-firmware-marvell usr/lib/firmware/{libertas,mwl8k,mwlwifi,mrvl} + _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP} + + _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*} + _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom + + _pick linux-firmware-liquidio usr/lib/firmware/liquidio + _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio + + _pick linux-firmware-qlogic usr/lib/firmware/{qlogic,qed,ql2???_*,c{b,t,t2}fw-*} + _pick linux-firmware-qlogic usr/share/licenses/${pkgname}/LICENCE.{qla1280,qla2xxx} + + _pick linux-firmware-bnx2x usr/lib/firmware/bnx2x* } package_amd-ucode() { @@ -71,4 +118,53 @@ package_amd-ucode() { install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode } +package_linux-firmware-nfp() { + pkgdesc+=" - nfp / Firmware for Netronome Flow Processors" + depends=('linux-firmware-whence') + + mv -v linux-firmware-nfp/* "${pkgdir}" +} + +package_linux-firmware-mellanox() { + pkgdesc+=" - mellanox / Firmware for Mellanox Spectrum switches" + depends=('linux-firmware-whence') + + mv -v linux-firmware-mellanox/* "${pkgdir}" +} + +package_linux-firmware-marvell() { + pkgdesc+=" - marvell / Firmware for Marvell devices" + depends=('linux-firmware-whence') + + mv -v linux-firmware-marvell/* "${pkgdir}" +} + +package_linux-firmware-qcom() { + pkgdesc+=" - qcom / Firmware for Qualcomm SoCs" + depends=('linux-firmware-whence') + + mv -v linux-firmware-qcom/* "${pkgdir}" +} + +package_linux-firmware-liquidio() { + pkgdesc+=" - liquidio / Firmware for Cavium LiquidIO server adapters" + depends=('linux-firmware-whence') + + mv -v linux-firmware-liquidio/* "${pkgdir}" +} + +package_linux-firmware-qlogic() { + pkgdesc+=" - qlogic / Firmware for QLogic devices" + depends=('linux-firmware-whence') + + mv -v linux-firmware-qlogic/* "${pkgdir}" +} + +package_linux-firmware-bnx2x() { + pkgdesc+=" - bnx2x / Firmware for Broadcom NetXtreme II 10Gb ethernet adapters" + depends=('linux-firmware-whence') + + mv -v linux-firmware-bnx2x/* "${pkgdir}" +} + # vim:set sw=2 et: diff --git a/linux-firmware/clean b/linux-firmware/clean index 66e61af..e3a4283 100644 --- a/linux-firmware/clean +++ b/linux-firmware/clean @@ -1 +1 @@ -rm -rvf {src,pkg,linux-firmware} +rm -rf {src,pkg,linux-firmware} diff --git a/linux-firmware/deps b/linux-firmware/deps index 6a91c13..5664e30 100644 --- a/linux-firmware/deps +++ b/linux-firmware/deps @@ -1,2 +1 @@ git - diff --git a/linux-firmware/key b/linux-firmware/key index 3880976..41fe33d 100644 --- a/linux-firmware/key +++ b/linux-firmware/key @@ -1 +1 @@ -gpg -v --recv-key A31B6BD72486CFD6 +gpg --recv-keys A31B6BD72486CFD6 diff --git a/linux-firmware/time b/linux-firmware/time index 1f9ced1..3c6aa59 100644 --- a/linux-firmware/time +++ b/linux-firmware/time @@ -1,5 +1,4 @@ -real 0m46.534s -user 2m6.552s -sys 0m2.701s - +real 4m29.624s +user 5m18.086s +sys 0m22.188s diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 09ffced..4521c52 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pacman pkgver=6.0.1 -pkgrel=08 +pkgrel=09 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="https://www.archlinux.org/pacman/" @@ -23,6 +23,7 @@ backup=(etc/pacman.conf #options=('strip' 'debug') options=(strip) source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} + "fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch" add-flto-to-LDFLAGS-for-clang.patch # sync_first_option.patch # an Obarun patch that ensures upgraded keyrings preceed # remaining upgrades, so new packages don't get rejected @@ -39,6 +40,7 @@ prepare() { patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch + patch -Np1 -i ../fix-wkd-lookup.patch } build() { @@ -55,11 +57,11 @@ build() { meson compile -C build } -check() { - cd "$pkgname-$pkgver" - - meson test -C build -} +#check() { +# cd "$pkgname-$pkgver" +# +# meson test -C build +#} package() { cd "$pkgname-$pkgver" @@ -82,6 +84,7 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig} + "fix-wkd-lookup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/e1246baddd14ec6f4b6270b59bea0e1b639472a7.patch" add-flto-to-LDFLAGS-for-clang.patch makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch libmakepkg-add-extra-buildflags-only-when-buildflags.patch @@ -29,6 +29,7 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig makepkg.conf) sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731' 'SKIP' + '8ab5b1338874d7d58e11c5d1185ea3454fcc89755f9c18faf87ff348ad1ed16c' '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223' 'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582' '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278' @@ -43,6 +44,7 @@ prepare() { patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch + patch -Np1 -i ../fix-wkd-lookup.patch } build() { diff --git a/pacman/deps b/pacman/deps index 4bc0601..5bfdc9e 100644 --- a/pacman/deps +++ b/pacman/deps @@ -4,3 +4,5 @@ doxygen python fakechroot cmake bash-completion + +