upg linux-firmware pacman
This commit is contained in:
parent
a8a43cb30f
commit
9a1b4b5b64
14 changed files with 189 additions and 107 deletions
|
|
@ -8,8 +8,8 @@
|
|||
pkgbase=linux-firmware
|
||||
pkgname=(linux-firmware-whence linux-firmware amd-ucode
|
||||
linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x})
|
||||
_tag=20240811
|
||||
pkgver=20240809.59460076
|
||||
_tag=20240909
|
||||
pkgver=20240909.552ed9b8
|
||||
pkgrel=01
|
||||
pkgdesc="Firmware files for Linux"
|
||||
#url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
|
||||
|
|
@ -181,20 +181,11 @@ package_linux-firmware-bnx2x() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2' 'GPL3' 'custom')
|
||||
license=(GPL-2.0-only GPL-2.0-or-later GPL-3.0-only custom)
|
||||
|
||||
validpgpkeys=(4CDE8575E547BF835FE15807A31B6BD72486CFD6) # Josh Boyer <jwboyer@fedoraproject.org>
|
||||
|
||||
sha256sums=(2ff3645681d23658fa5e6ca5f9b8b383b5510c2ff46532679b8e95d693a3f0eb) # linux-firmware
|
||||
b2sums=('1578c2a2fc4696a21d463f03745dc5bf2fe1266001e3ceac698f52c4b891c1d045c788c6ac57555182f8cf78b6dd973e84fed34884092dc36850c63643d067f9')
|
||||
|
||||
## efbcc99031d866a2f1509658f2ed25318c36705210e3e4db608dffb33102a1da amd-ucode-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## 357768bd2bb986f8b150c4b088c3a5d23dbe990ba8be01566596d8ce295784ec linux-firmware-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## cfcce00793ec87aaaee5b54d4b33c08b3e383984047df748e663c21b967a2815 linux-firmware-bnx2x-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## 03c50f35562f283032e1cc94bde3e5813e9a223643f264102dd7cc7bdd074213 linux-firmware-liquidio-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## ea6805893fad2bd3d86917f7dfa4dde733ae2d0cf9755d5288ccd14ad8cee431 linux-firmware-marvell-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## 74c2f9ecbead6b7bec53bb65dbe18733788562cd7a78555f2bf2837a5eddd4a2 linux-firmware-mellanox-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## 4f1302bdc068b8940667c086be6f5067fce6f7e71fb33ece5ec706334806e31d linux-firmware-nfp-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## d1b19a22a3ae9ecb69860c5239208e49a6b952ba78585a316345945c2ffeb3c7 linux-firmware-qcom-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## b21f1ad332ef0ab87d5f09b7dc878d569491ae5376077ce7edef6ab70a0840c1 linux-firmware-qlogic-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
## b3ec20a399b2bc19ff3a3163e9823145e96b17e4fd54f95fa27c49fba5976844 linux-firmware-whence-20240809.59460076-01-x86_64.pkg.tar.lz
|
||||
sha256sums=(9018b7ac51edd8aac828f5b18ff3ea1ee4c015c47911dbb05d30d0a962300d1f) # linux-firmware
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,28 @@ pkgbase=linux-firmware
|
|||
pkgname=(linux-firmware-whence linux-firmware amd-ucode
|
||||
linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}
|
||||
)
|
||||
_tag=20240811
|
||||
pkgver=20240809.59460076
|
||||
_tag=20240909
|
||||
pkgver=20240909.552ed9b8
|
||||
pkgrel=1
|
||||
pkgdesc="Firmware files for Linux"
|
||||
url="https://gitlab.com/kernel-firmware/linux-firmware"
|
||||
license=('GPL2' 'GPL3' 'custom')
|
||||
license=(
|
||||
GPL-2.0-only
|
||||
GPL-2.0-or-later
|
||||
GPL-3.0-only
|
||||
custom
|
||||
)
|
||||
arch=('any')
|
||||
makedepends=('git' 'rdfind')
|
||||
options=(!strip !debug)
|
||||
makedepends=(
|
||||
git
|
||||
rdfind
|
||||
)
|
||||
options=(
|
||||
!strip
|
||||
!debug
|
||||
)
|
||||
source=("git+$url.git?signed#tag=${_tag}")
|
||||
sha256sums=('2ff3645681d23658fa5e6ca5f9b8b383b5510c2ff46532679b8e95d693a3f0eb')
|
||||
b2sums=('1578c2a2fc4696a21d463f03745dc5bf2fe1266001e3ceac698f52c4b891c1d045c788c6ac57555182f8cf78b6dd973e84fed34884092dc36850c63643d067f9')
|
||||
validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
|
||||
|
||||
_backports=(
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
git
|
||||
rdfind
|
||||
|
||||
|
||||
|
|
|
|||
101
pacman/PKGBUILD
101
pacman/PKGBUILD
|
|
@ -6,41 +6,56 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=pacman
|
||||
pkgver=6.1.0
|
||||
pkgrel=05 # related to arch/pacman 6.1.0-3
|
||||
#pkgver=7.0.0.r1.g7cf2b01
|
||||
pkgver=7.0.0.r3.g7736133
|
||||
pkgrel=01
|
||||
# use annotated tag and patch level commit from release branch (can be empty for no patches)
|
||||
_git_tag=7.0.0
|
||||
#_git_patch_level_commit=7cf2b0186d873be4218fe5be127dd029a0af03fe
|
||||
_git_patch_level_commit=77361331ae3864c6ea880e715c5864d59336f275
|
||||
pkgdesc="A library-based package manager with dependency support modified for joborun from arch"
|
||||
url="https://www.archlinux.org/pacman/"
|
||||
groups=(base jobbot)
|
||||
depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist'
|
||||
'jobo-mirror' 'gawk' 'coreutils' 'gnupg' 'grep' 'archlinux-keyring'
|
||||
'obarun-keyring' 'joborun-keyring' 'lzip')
|
||||
# NOTE: Joborun linux is switching default pkg compression to lzip at level -5
|
||||
# which matches current xz compression ratio but at a fraction of RAM use
|
||||
# and relatively even speed. So lzip becomes a standard system dependency
|
||||
# as it will also be used by pacman during installation. Gradually all
|
||||
# pkgs will be offered as *.pkg.tar.lz For a while there will be mixed.
|
||||
makedepends=('meson' 'asciidoc' 'doxygen' 'gettext' 'spdlog')
|
||||
checkdepends=('python' 'fakechroot')
|
||||
optdepends=('perl-locale-gettext: translation support in makepkg-template')
|
||||
#makedepends=('git' 'meson' 'asciidoc' 'doxygen') # 'gettext' 'spdlog')
|
||||
makedepends=(git meson asciidoc doxygen)
|
||||
checkdepends=(python fakechroot)
|
||||
provides=('libalpm.so')
|
||||
conflicts=('pacman-git')
|
||||
backup=(etc/pacman.conf
|
||||
etc/makepkg.conf)
|
||||
etc/makepkg.conf
|
||||
etc/makepkg.conf.d/rust.conf)
|
||||
#options=('strip' 'debug')
|
||||
options=('strip')
|
||||
source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
|
||||
#options=('strip')
|
||||
#source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
|
||||
source=("git+https://gitlab.archlinux.org/pacman/pacman.git#tag=v${_git_tag}?signed"
|
||||
revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
|
||||
"$pkgname-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch"
|
||||
"$pkgname-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch"
|
||||
"$pkgname-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch"
|
||||
"$pkgname-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch"
|
||||
"$pkgname-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch"
|
||||
"$pkgname-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch"
|
||||
pacman.conf
|
||||
makepkg.conf)
|
||||
makepkg.conf
|
||||
alpm.sysusers
|
||||
rust.conf)
|
||||
## install="pacman.install"
|
||||
|
||||
pkgver() {
|
||||
cd "$pkgname"
|
||||
git describe --abbrev=7 --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
# apply patch level commits on top of annotated tag
|
||||
if [[ -n ${_git_patch_level_commit} ]]; then
|
||||
if [[ v${_git_tag} != $(git describe --tags --abbrev=0 "${_git_patch_level_commit}") ]] then
|
||||
error "patch level commit ${_git_patch_level_commit} is not a descendant of v${_git_tag}"
|
||||
exit 1
|
||||
fi
|
||||
git rebase "${_git_patch_level_commit}"
|
||||
fi
|
||||
|
||||
# handle patches
|
||||
local -a patches
|
||||
|
|
@ -62,11 +77,12 @@ prepare() {
|
|||
}
|
||||
|
||||
build() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
meson --prefix=/usr \
|
||||
--buildtype=plain \
|
||||
-Ddoc=enabled \
|
||||
-Duse-git-version=true \
|
||||
-Ddoxygen=enabled \
|
||||
-Dscriptlet-shell=/usr/bin/bash \
|
||||
-Dldconfig=/usr/bin/ldconfig \
|
||||
|
|
@ -76,12 +92,18 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
meson test -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
depends=(bash coreutils curl gawk glibc gnupg gpgme grep libarchive pacman-mirrorlist
|
||||
jobo-mirror archlinux-keyring obarun-keyring joborun-keyring lzip)
|
||||
optdepends=('pacman-contrib: various helper utilities'
|
||||
'base-devel: required to use makepkg'
|
||||
'perl-locale-gettext: translation support in makepkg-template')
|
||||
|
||||
DESTDIR="$pkgdir" meson install -C build
|
||||
|
||||
|
|
@ -89,15 +111,8 @@ package() {
|
|||
install -dm755 "$pkgdir/etc"
|
||||
install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
|
||||
install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
|
||||
|
||||
# local wantsdir="$pkgdir/usr/lib/systemd/system/sockets.target.wants"
|
||||
local wantsdir="$pkgdir/usr/lib/pacman/sockets.target.wants"
|
||||
install -dm755 "$wantsdir"
|
||||
|
||||
local unit
|
||||
for unit in dirmngr gpg-agent gpg-agent-{browser,extra,ssh} keyboxd; do
|
||||
ln -s "../${unit}@.socket" "$wantsdir/${unit}@etc-pacman.d-gnupg.socket"
|
||||
done
|
||||
install -D -m644 "$srcdir/alpm.sysusers" "${pkgdir}"/usr/lib/sysusers.d/alpm.conf
|
||||
install -m644 "$srcdir/rust.conf" "$pkgdir/etc/makepkg.conf.d"
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -110,17 +125,17 @@ license=('GPL-2.0-or-later')
|
|||
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
|
||||
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
|
||||
|
||||
sha256sums=(5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9 # pacman-6.1.0.tar.xz
|
||||
d12ce27098e2426f8e482b4334e9d3dbe7f57524a536a289990f8b99e5e3a8aa # pacman-6.1.0.tar.xz.sig
|
||||
sha256sums=(06d082c3ce6f0811ca728515aa82d69d372800bd3ada99f5c445ef9429b6e3a6 # pacman
|
||||
b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2 # revertme-makepkg-remove-libdepends-and-libprovides.patch
|
||||
94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217 # pacman-fix-msg-unknown-key.patch
|
||||
0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377 # pacman-man-gitlab.patch
|
||||
7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842 # pacman-make-aligned-titles.patch
|
||||
2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0 # pacman-repo-add-parseopts.patch
|
||||
160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f # pacman-drop-result-warn.patch
|
||||
1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721 # pacman-fix-debugedit.patch
|
||||
ff4605ef1146e6a5d428b199c9fda984e0649a434b9d07cc85c43fc012c25a5e # pacman.conf
|
||||
3e5a8edab365c52b2e957681b8a567b9600afd1c24d037f538369c4935b52d5b) # makepkg.conf
|
||||
|
||||
## f4da4be2b2ecf695ea56a1adaa553a2ef3026c9ee3577633a35abc0445b8ae40 pacman-6.1.0-05-x86_64.pkg.tar.lz
|
||||
f9b8970e04b66ce044ace0e8f6eaa8d5e673c26b9ba3fcc55a6296465c674756 # pacman.conf
|
||||
fb4fe3ccf8be9151eacf833624dfbe28b4652c678ee7efd0095662a93e3a3a42 # makepkg.conf
|
||||
c8760d7ebb6c9817d508c691c67084be251cd9c8811ee1ccf92c1278bad74c1c # alpm.sysusers
|
||||
59a8bbdc32830c90dbce5ead9f90074a2bb31cd85ec92bc5f92251bb4bcf8a1d) # rust.conf
|
||||
|
||||
## acf1aae8c2a0fefb68a7b5c8d148ddb943788c9465fee2b117324c7bb3e35048 pacman-7.0.0.r3.g7736133-01-x86_64.pkg.tar.lz
|
||||
## f9b8970e04b66ce044ace0e8f6eaa8d5e673c26b9ba3fcc55a6296465c674756 # pacman.conf
|
||||
0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179 # pacman.conf.1
|
||||
0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179 # pacman.conf-arch
|
||||
## fb4fe3ccf8be9151eacf833624dfbe28b4652c678ee7efd0095662a93e3a3a42 # makepkg.conf
|
||||
d99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c # makepkg.conf.1
|
||||
d99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c # makepkg.conf-arch
|
||||
|
|
|
|||
|
|
@ -2,47 +2,78 @@
|
|||
# Maintainer: Morten Linderud <foxboron@archlinux.org>
|
||||
|
||||
pkgname=pacman
|
||||
pkgver=6.1.0
|
||||
pkgrel=3
|
||||
pkgver=7.0.0.r3.g7736133
|
||||
pkgrel=1
|
||||
# use annotated tag and patch level commit from release branch (can be empty for no patches)
|
||||
_git_tag=7.0.0
|
||||
_git_patch_level_commit=77361331ae3864c6ea880e715c5864d59336f275
|
||||
pkgdesc="A library-based package manager with dependency support"
|
||||
arch=('x86_64')
|
||||
url="https://www.archlinux.org/pacman/"
|
||||
license=('GPL-2.0-or-later')
|
||||
depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist'
|
||||
'gettext' 'gawk' 'coreutils' 'gnupg' 'grep')
|
||||
makedepends=('meson' 'asciidoc' 'doxygen')
|
||||
checkdepends=('python' 'fakechroot')
|
||||
optdepends=('perl-locale-gettext: translation support in makepkg-template')
|
||||
depends=(
|
||||
bash
|
||||
coreutils
|
||||
curl
|
||||
gawk
|
||||
gettext
|
||||
glibc
|
||||
gnupg
|
||||
gpgme
|
||||
grep
|
||||
libarchive
|
||||
pacman-mirrorlist
|
||||
systemd
|
||||
)
|
||||
makedepends=(
|
||||
asciidoc
|
||||
doxygen
|
||||
git
|
||||
meson
|
||||
)
|
||||
checkdepends=(
|
||||
fakechroot
|
||||
python
|
||||
)
|
||||
optdepends=(
|
||||
'base-devel: required to use makepkg'
|
||||
'perl-locale-gettext: translation support in makepkg-template'
|
||||
)
|
||||
provides=('libalpm.so')
|
||||
backup=(etc/pacman.conf
|
||||
etc/makepkg.conf)
|
||||
options=('strip')
|
||||
etc/makepkg.conf
|
||||
etc/makepkg.conf.d/rust.conf)
|
||||
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
|
||||
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
|
||||
source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
|
||||
source=("git+https://gitlab.archlinux.org/pacman/pacman.git#tag=v${_git_tag}?signed"
|
||||
revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
|
||||
"$pkgname-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch"
|
||||
"$pkgname-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch"
|
||||
"$pkgname-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch"
|
||||
"$pkgname-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch"
|
||||
"$pkgname-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch"
|
||||
"$pkgname-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch"
|
||||
pacman.conf
|
||||
makepkg.conf)
|
||||
sha256sums=('5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9'
|
||||
'SKIP'
|
||||
makepkg.conf
|
||||
alpm.sysusers
|
||||
rust.conf)
|
||||
sha256sums=('06d082c3ce6f0811ca728515aa82d69d372800bd3ada99f5c445ef9429b6e3a6'
|
||||
'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2'
|
||||
'94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217'
|
||||
'0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377'
|
||||
'7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842'
|
||||
'2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0'
|
||||
'160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f'
|
||||
'1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721'
|
||||
'656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a'
|
||||
'2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef')
|
||||
'0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179'
|
||||
'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c'
|
||||
'c8760d7ebb6c9817d508c691c67084be251cd9c8811ee1ccf92c1278bad74c1c'
|
||||
'59a8bbdc32830c90dbce5ead9f90074a2bb31cd85ec92bc5f92251bb4bcf8a1d')
|
||||
|
||||
pkgver() {
|
||||
cd "$pkgname"
|
||||
git describe --abbrev=7 --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
# apply patch level commits on top of annotated tag
|
||||
if [[ -n ${_git_patch_level_commit} ]]; then
|
||||
if [[ v${_git_tag} != $(git describe --tags --abbrev=0 "${_git_patch_level_commit}") ]] then
|
||||
error "patch level commit ${_git_patch_level_commit} is not a descendant of v${_git_tag}"
|
||||
exit 1
|
||||
fi
|
||||
git rebase "${_git_patch_level_commit}"
|
||||
fi
|
||||
|
||||
# handle patches
|
||||
local -a patches
|
||||
|
|
@ -64,7 +95,7 @@ prepare() {
|
|||
}
|
||||
|
||||
build() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
meson --prefix=/usr \
|
||||
--buildtype=plain \
|
||||
|
|
@ -78,13 +109,13 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
meson test -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$pkgname-$pkgver"
|
||||
cd "$pkgname"
|
||||
|
||||
DESTDIR="$pkgdir" meson install -C build
|
||||
|
||||
|
|
@ -92,6 +123,8 @@ package() {
|
|||
install -dm755 "$pkgdir/etc"
|
||||
install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
|
||||
install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
|
||||
install -D -m644 "$srcdir/alpm.sysusers" "${pkgdir}"/usr/lib/sysusers.d/alpm.conf
|
||||
install -m644 "$srcdir/rust.conf" "$pkgdir/etc/makepkg.conf.d"
|
||||
|
||||
local wantsdir="$pkgdir/usr/lib/systemd/system/sockets.target.wants"
|
||||
install -dm755 "$wantsdir"
|
||||
|
|
|
|||
1
pacman/alpm.sysusers
Normal file
1
pacman/alpm.sysusers
Normal file
|
|
@ -0,0 +1 @@
|
|||
u alpm - "Arch Linux Package Management" -
|
||||
|
|
@ -1 +1 @@
|
|||
rm -rf {*.tar.xz*,src,pkg}
|
||||
rm -rf {*.tar.xz*,src,pkg,pacman}
|
||||
|
|
|
|||
|
|
@ -7,5 +7,6 @@ cmake
|
|||
bash-completion
|
||||
gettext
|
||||
spdlog
|
||||
git
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -48,13 +48,15 @@ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
|
|||
LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
|
||||
-Wl,-z,pack-relative-relocs"
|
||||
LTOFLAGS="-flto=auto"
|
||||
RUSTFLAGS="-Cforce-frame-pointers=yes"
|
||||
# this becomes part of the special rust.conf in makepkg.d/
|
||||
#RUSTFLAGS="-Cforce-frame-pointers=yes"
|
||||
#-- Make Flags: change this for DistCC/SMP systems
|
||||
#MAKEFLAGS="-j2"
|
||||
#-- Debugging flags
|
||||
DEBUG_CFLAGS="-g"
|
||||
DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
|
||||
DEBUG_RUSTFLAGS="-C debuginfo=2"
|
||||
# this becomes part of the special rust.conf in makepkg.d/
|
||||
#DEBUG_RUSTFLAGS="-C debuginfo=2"
|
||||
|
||||
#########################################################################
|
||||
# BUILD ENVIRONMENT
|
||||
|
|
@ -95,6 +97,7 @@ BUILDENV=(!distcc !color !ccache check !sign)
|
|||
#-- purge: Remove files specified by PURGE_TARGETS
|
||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
||||
#-- lto: Add compile flags for building with link time optimization
|
||||
#-- autodeps: Automatically add depends/provides
|
||||
#
|
||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
|
||||
|
||||
|
|
@ -114,6 +117,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
|
|||
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
|
||||
#-- Directory to store source code in for debug packages
|
||||
# DBGSRCDIR="/usr/src/debug"
|
||||
#-- Prefix and directories for library autodeps
|
||||
LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
|
||||
|
||||
#########################################################################
|
||||
# PACKAGE OUTPUT
|
||||
|
|
|
|||
|
|
@ -48,13 +48,11 @@ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
|
|||
LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
|
||||
-Wl,-z,pack-relative-relocs"
|
||||
LTOFLAGS="-flto=auto"
|
||||
RUSTFLAGS="-Cforce-frame-pointers=yes"
|
||||
#-- Make Flags: change this for DistCC/SMP systems
|
||||
#MAKEFLAGS="-j2"
|
||||
#-- Debugging flags
|
||||
DEBUG_CFLAGS="-g"
|
||||
DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
|
||||
DEBUG_RUSTFLAGS="-C debuginfo=2"
|
||||
|
||||
#########################################################################
|
||||
# BUILD ENVIRONMENT
|
||||
|
|
@ -83,7 +81,7 @@ BUILDENV=(!distcc color !ccache check !sign)
|
|||
# These are default values for the options=() settings
|
||||
#########################################################################
|
||||
#
|
||||
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
|
||||
# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
|
||||
# A negated option will do the opposite of the comments below.
|
||||
#
|
||||
#-- strip: Strip symbols from binaries/libraries
|
||||
|
|
@ -95,6 +93,7 @@ BUILDENV=(!distcc color !ccache check !sign)
|
|||
#-- purge: Remove files specified by PURGE_TARGETS
|
||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
||||
#-- lto: Add compile flags for building with link time optimization
|
||||
#-- autodeps: Automatically add depends/provides
|
||||
#
|
||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
|
||||
|
||||
|
|
@ -114,6 +113,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
|
|||
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
|
||||
#-- Directory to store source code in for debug packages
|
||||
DBGSRCDIR="/usr/src/debug"
|
||||
#-- Prefix and directories for library autodeps
|
||||
LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
|
||||
|
||||
#########################################################################
|
||||
# PACKAGE OUTPUT
|
||||
|
|
@ -141,7 +142,7 @@ DBGSRCDIR="/usr/src/debug"
|
|||
COMPRESSGZ=(gzip -c -f -n)
|
||||
COMPRESSBZ2=(bzip2 -c -f)
|
||||
COMPRESSXZ=(xz -c -z -)
|
||||
COMPRESSZST=(zstd -c -T0 --ultra -20 -)
|
||||
COMPRESSZST=(zstd -c -T0 -)
|
||||
COMPRESSLRZ=(lrzip -q)
|
||||
COMPRESSLZO=(lzop -q)
|
||||
COMPRESSZ=(compress -c -f)
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ Color
|
|||
CheckSpace
|
||||
VerbosePkgLists
|
||||
ParallelDownloads = 2
|
||||
DownloadUser = alpm
|
||||
DisableSandbox
|
||||
ILoveCandy
|
||||
|
||||
# By default, pacman accepts packages signed by keys that its local keyring
|
||||
|
|
@ -208,7 +210,7 @@ Include = /etc/pacman.d/mirrorlist
|
|||
#### and you will break your system -- please don't ask us to fix it!
|
||||
#### Artix is designed to use exclusively ONE init and service manager, not two or more!
|
||||
|
||||
#[gremlins]
|
||||
#[system-gremlins]
|
||||
##SigLevel = DatabaseOptional
|
||||
##Include = /etc/pacman.d/mirrorlist-artix
|
||||
#Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ Architecture = auto
|
|||
CheckSpace
|
||||
#VerbosePkgLists
|
||||
#ParallelDownloads = 5
|
||||
DownloadUser = alpm
|
||||
#DisableSandbox
|
||||
|
||||
# By default, pacman accepts packages signed by keys that its local keyring
|
||||
# trusts (see pacman-key and its man page), as well as unsigned packages.
|
||||
|
|
|
|||
19
pacman/rust.conf
Normal file
19
pacman/rust.conf
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
#!/hint/bash
|
||||
# shellcheck disable=2034
|
||||
|
||||
#
|
||||
# /etc/makepkg.conf.d/rust.conf
|
||||
#
|
||||
|
||||
#########################################################################
|
||||
# RUST LANGUAGE SUPPORT
|
||||
#########################################################################
|
||||
|
||||
# Flags used for the Rust compiler, similar in spirit to CFLAGS. Read
|
||||
# linkman:rustc[1] for more details on the available flags.
|
||||
RUSTFLAGS="-Cforce-frame-pointers=yes"
|
||||
|
||||
# Additional compiler flags appended to `RUSTFLAGS` for use in debugging.
|
||||
# Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for
|
||||
# more details on the available flags.
|
||||
DEBUG_RUSTFLAGS="-C debuginfo=2"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 0m10.092s
|
||||
user 0m22.674s
|
||||
sys 0m2.466s
|
||||
real 0m33.124s
|
||||
user 1m27.086s
|
||||
sys 0m14.310s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue