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

Update makepkg & pacman config inline with upstream v7 #100

Merged
merged 4 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion aur
Submodule aur updated from c05bfc to d24735
17 changes: 14 additions & 3 deletions conf/makepkg-chroot.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# /etc/aurto/makepkg-chroot.conf
#
# Used in aurto chroot builds
# /etc/makepkg.conf
#

#########################################################################
Expand Down Expand Up @@ -51,14 +50,26 @@ 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"

#########################################################################
# 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"


#########################################################################
# BUILD ENVIRONMENT
#########################################################################
Expand Down Expand Up @@ -147,7 +158,7 @@ LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
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)
Expand Down
7 changes: 4 additions & 3 deletions conf/pacman-chroot.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# /etc/aurto/pacman-chroot.conf
#
# Used in aurto chroot builds
# /etc/pacman.conf
#
# See the pacman.conf(5) manpage for option and repository directives

Expand Down Expand Up @@ -38,7 +37,10 @@ Architecture = auto
## Note: We cannot check disk space from within a chroot environment
#CheckSpace
#VerbosePkgLists
#ParallelDownloads = 5
ParallelDownloads = 5
DownloadUser = alpm
## Note: sandbox causes "error: restricting filesystem access failed because landlock is not supported by the kernel!"
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.
Expand Down Expand Up @@ -94,7 +96,6 @@ Include = /etc/pacman.d/mirrorlist
[multilib]
Include = /etc/pacman.d/mirrorlist

# Aurto custom package repository
[aurto]
SigLevel = Never
Server = file:///var/cache/pacman/aurto
5 changes: 4 additions & 1 deletion makelocalaur.PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pkgname=aurto
pkgver=###VERSION
pkgrel=999
pkgdesc="A simple aur tool for managing a local 'aurto' repository"
pkgdesc="An AUR tool for managing an auto-updating local 'aurto' package repository using aurutils."
arch=('x86_64' 'aarch64' 'armv7h')
url="https://github.com/alexheretic/aurto"
license=('MIT')
Expand All @@ -15,10 +15,13 @@ depends=('aurutils'
'curl'
'less'
'sudo'
'zstd'
'ninja')
optdepends=()
makedepends=('cargo')
install="aurto.install"
# ring doesn't build with lto enabled: https://github.com/briansmith/ring/issues/1444
options=(!lto)
source=("aurto-git.tar.gz")
sha256sums=('eb94c0a2920ddea570621da7326f3d60c30401e8c42073b5b3ed3b1216c1ce4b')
backup=('usr/lib/systemd/system/check-aurto-git-trigger.timer'
Expand Down
12 changes: 6 additions & 6 deletions trust-check/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading