forked from mirrored-repos/manjaro-tools
buildpkg: reduce shared conf overhead with makepkg.conf
buildiso+buildpkg: reduce shared conf overhead with pacman-mirrirs.conf
This commit is contained in:
udeved
parent
07818d7d6a
commit
9c8c05b852
12 changed files with 64 additions and 510 deletions
11
Makefile
11
Makefile
|
|
@ -23,10 +23,7 @@ LIBS_BASE = \
|
|||
SHARED_BASE = \
|
||||
data/pacman-default.conf \
|
||||
data/pacman-multilib.conf \
|
||||
data/pacman-mirrors-stable.conf \
|
||||
data/pacman-mirrors-testing.conf \
|
||||
data/pacman-mirrors-unstable.conf \
|
||||
data/pacman-arm.conf
|
||||
data/pacman-mirrors.conf
|
||||
|
||||
SETS_PKG = \
|
||||
data/pkg.d/default.set
|
||||
|
|
@ -46,10 +43,8 @@ LIBS_PKG = \
|
|||
lib/util-pkgtree.sh
|
||||
|
||||
SHARED_PKG = \
|
||||
data/makepkg-i686.conf \
|
||||
data/base-devel-udev \
|
||||
data/makepkg-x86_64.conf \
|
||||
data/makepkg-arm.conf
|
||||
data/makepkg.conf \
|
||||
data/base-devel-udev
|
||||
|
||||
SETS_ISO = \
|
||||
data/iso.d/default.set \
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ timer_start=$(get_timer)
|
|||
|
||||
[[ "${target_arch}" == 'x86_64' ]] && pacman_conf_arch='multilib'
|
||||
|
||||
mirrors_conf="${DATADIR}/pacman-mirrors-${target_branch}.conf"
|
||||
mirrors_conf=$(get_pac_mirrors_conf "${target_branch}")
|
||||
|
||||
check_root "$0" "${orig_argv[@]}"
|
||||
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ pretend=false
|
|||
is_buildset=false
|
||||
sign=false
|
||||
udev_root=false
|
||||
is_multilib=false
|
||||
|
||||
usage() {
|
||||
echo "Usage: ${0##*/} [options]"
|
||||
|
|
@ -130,7 +131,9 @@ while getopts "${opts}" arg; do
|
|||
esac
|
||||
done
|
||||
|
||||
configure_chroot_arch "${target_arch}"
|
||||
prepare_conf "${target_arch}"
|
||||
|
||||
mirrors_conf=$(get_pac_mirrors_conf "${target_branch}")
|
||||
|
||||
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${target_branch}")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,148 +0,0 @@
|
|||
#
|
||||
# /etc/makepkg.conf
|
||||
#
|
||||
|
||||
#########################################################################
|
||||
# SOURCE ACQUISITION
|
||||
#########################################################################
|
||||
#
|
||||
#-- The download utilities that makepkg should use to acquire sources
|
||||
# Format: 'protocol::agent'
|
||||
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
||||
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||
'rsync::/usr/bin/rsync --no-motd -z %u %o'
|
||||
'scp::/usr/bin/scp -C %u %o')
|
||||
|
||||
# Other common tools:
|
||||
# /usr/bin/snarf
|
||||
# /usr/bin/lftpget -c
|
||||
# /usr/bin/wget
|
||||
|
||||
#-- The package required by makepkg to download VCS sources
|
||||
# Format: 'protocol::package'
|
||||
VCSCLIENTS=('bzr::bzr'
|
||||
'git::git'
|
||||
'hg::mercurial'
|
||||
'svn::subversion')
|
||||
|
||||
|
||||
#########################################################################
|
||||
# ARCHITECTURE, COMPILE FLAGS
|
||||
#########################################################################
|
||||
#
|
||||
CARCH="i686"
|
||||
CHOST="i686-pc-linux-gnu"
|
||||
|
||||
#-- Compiler and Linker Flags
|
||||
# -march (or -mcpu) builds exclusively for an architecture
|
||||
# -mtune optimizes for an architecture, but builds for whole processor family
|
||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
|
||||
#-- Make Flags: change this for DistCC/SMP systems
|
||||
#MAKEFLAGS="-j2"
|
||||
#-- Debugging flags
|
||||
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
||||
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
|
||||
|
||||
#########################################################################
|
||||
# BUILD ENVIRONMENT
|
||||
#########################################################################
|
||||
#
|
||||
# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
|
||||
# A negated environment option will do the opposite of the comments below.
|
||||
#
|
||||
#-- fakeroot: Allow building packages as a non-root user
|
||||
#-- distcc: Use the Distributed C/C++/ObjC compiler
|
||||
#-- color: Colorize output messages
|
||||
#-- ccache: Use ccache to cache compilation
|
||||
#-- check: Run the check() function if present in the PKGBUILD
|
||||
#-- sign: Generate PGP signature file
|
||||
#
|
||||
BUILDENV=(!distcc color !ccache check !sign)
|
||||
#
|
||||
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
|
||||
#-- specify a space-delimited list of hosts running in the DistCC cluster.
|
||||
#DISTCC_HOSTS=""
|
||||
#
|
||||
#-- Specify a directory for package building.
|
||||
#BUILDDIR=/tmp/makepkg
|
||||
|
||||
#########################################################################
|
||||
# GLOBAL PACKAGE OPTIONS
|
||||
# These are default values for the options=() settings
|
||||
#########################################################################
|
||||
#
|
||||
# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
||||
# A negated option will do the opposite of the comments below.
|
||||
#
|
||||
#-- strip: Strip symbols from binaries/libraries
|
||||
#-- docs: Save doc directories specified by DOC_DIRS
|
||||
#-- libtool: Leave libtool (.la) files in packages
|
||||
#-- staticlibs: Leave static library (.a) files in packages
|
||||
#-- emptydirs: Leave empty directories in packages
|
||||
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
|
||||
#-- purge: Remove files specified by PURGE_TARGETS
|
||||
#-- upx: Compress binary executable files using UPX
|
||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
||||
#
|
||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
||||
|
||||
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
|
||||
INTEGRITY_CHECK=(md5)
|
||||
#-- Options to be used when stripping binaries. See `man strip' for details.
|
||||
STRIP_BINARIES="--strip-all"
|
||||
#-- Options to be used when stripping shared libraries. See `man strip' for details.
|
||||
STRIP_SHARED="--strip-unneeded"
|
||||
#-- Options to be used when stripping static libraries. See `man strip' for details.
|
||||
STRIP_STATIC="--strip-debug"
|
||||
#-- Manual (man and info) directories to compress (if zipman is specified)
|
||||
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
|
||||
#-- Doc directories to remove (if !docs is specified)
|
||||
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
|
||||
#-- Files to be removed from all packages (if purge is specified)
|
||||
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
|
||||
|
||||
#########################################################################
|
||||
# PACKAGE OUTPUT
|
||||
#########################################################################
|
||||
#
|
||||
# Default: put built package and cached source in build directory
|
||||
#
|
||||
#-- Destination: specify a fixed directory where all packages will be placed
|
||||
#PKGDEST=/home/packages
|
||||
#-- Source cache: specify a fixed directory where source files will be cached
|
||||
#SRCDEST=/home/sources
|
||||
#-- Source packages: specify a fixed directory where all src packages will be placed
|
||||
#SRCPKGDEST=/home/srcpackages
|
||||
#-- Log files: specify a fixed directory where all log files will be placed
|
||||
#LOGDEST=/home/makepkglogs
|
||||
#-- Packager: name/email of the person or organization building packages
|
||||
#PACKAGER="John Doe <john@doe.com>"
|
||||
#-- Specify a key to use for package signing
|
||||
#GPGKEY=""
|
||||
|
||||
#########################################################################
|
||||
# COMPRESSION DEFAULTS
|
||||
#########################################################################
|
||||
#
|
||||
COMPRESSGZ=(gzip -c -f -n)
|
||||
COMPRESSBZ2=(bzip2 -c -f)
|
||||
COMPRESSXZ=(xz -c -z -)
|
||||
COMPRESSLRZ=(lrzip -q)
|
||||
COMPRESSLZO=(lzop -q)
|
||||
COMPRESSZ=(compress -c -f)
|
||||
|
||||
#########################################################################
|
||||
# EXTENSION DEFAULTS
|
||||
#########################################################################
|
||||
#
|
||||
# WARNING: Do NOT modify these variables unless you know what you are
|
||||
# doing.
|
||||
#
|
||||
PKGEXT='.pkg.tar.xz'
|
||||
SRCEXT='.src.tar.gz'
|
||||
|
||||
# vim: set ft=sh ts=2 sw=2 et:
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
#
|
||||
# /etc/makepkg.conf
|
||||
#
|
||||
|
||||
#########################################################################
|
||||
# SOURCE ACQUISITION
|
||||
#########################################################################
|
||||
#
|
||||
#-- The download utilities that makepkg should use to acquire sources
|
||||
# Format: 'protocol::agent'
|
||||
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
||||
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||
'rsync::/usr/bin/rsync --no-motd -z %u %o'
|
||||
'scp::/usr/bin/scp -C %u %o')
|
||||
|
||||
# Other common tools:
|
||||
# /usr/bin/snarf
|
||||
# /usr/bin/lftpget -c
|
||||
# /usr/bin/wget
|
||||
|
||||
#-- The package required by makepkg to download VCS sources
|
||||
# Format: 'protocol::package'
|
||||
VCSCLIENTS=('bzr::bzr'
|
||||
'git::git'
|
||||
'hg::mercurial'
|
||||
'svn::subversion')
|
||||
|
||||
#########################################################################
|
||||
# ARCHITECTURE, COMPILE FLAGS
|
||||
#########################################################################
|
||||
#
|
||||
CARCH="x86_64"
|
||||
CHOST="x86_64-pc-linux-gnu"
|
||||
|
||||
#-- Compiler and Linker Flags
|
||||
# -march (or -mcpu) builds exclusively for an architecture
|
||||
# -mtune optimizes for an architecture, but builds for whole processor family
|
||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||
CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
|
||||
#-- Make Flags: change this for DistCC/SMP systems
|
||||
#MAKEFLAGS="-j2"
|
||||
#-- Debugging flags
|
||||
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
||||
DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
|
||||
|
||||
#########################################################################
|
||||
# BUILD ENVIRONMENT
|
||||
#########################################################################
|
||||
#
|
||||
# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
|
||||
# A negated environment option will do the opposite of the comments below.
|
||||
#
|
||||
#-- fakeroot: Allow building packages as a non-root user
|
||||
#-- distcc: Use the Distributed C/C++/ObjC compiler
|
||||
#-- color: Colorize output messages
|
||||
#-- ccache: Use ccache to cache compilation
|
||||
#-- check: Run the check() function if present in the PKGBUILD
|
||||
#-- sign: Generate PGP signature file
|
||||
#
|
||||
BUILDENV=(!distcc color !ccache check !sign)
|
||||
#
|
||||
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
|
||||
#-- specify a space-delimited list of hosts running in the DistCC cluster.
|
||||
#DISTCC_HOSTS=""
|
||||
#
|
||||
#-- Specify a directory for package building.
|
||||
#BUILDDIR=/tmp/makepkg
|
||||
|
||||
#########################################################################
|
||||
# GLOBAL PACKAGE OPTIONS
|
||||
# These are default values for the options=() settings
|
||||
#########################################################################
|
||||
#
|
||||
# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
||||
# A negated option will do the opposite of the comments below.
|
||||
#
|
||||
#-- strip: Strip symbols from binaries/libraries
|
||||
#-- docs: Save doc directories specified by DOC_DIRS
|
||||
#-- libtool: Leave libtool (.la) files in packages
|
||||
#-- staticlibs: Leave static library (.a) files in packages
|
||||
#-- emptydirs: Leave empty directories in packages
|
||||
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
|
||||
#-- purge: Remove files specified by PURGE_TARGETS
|
||||
#-- upx: Compress binary executable files using UPX
|
||||
#-- debug: Add debugging flags as specified in DEBUG_* variables
|
||||
#
|
||||
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
|
||||
|
||||
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
|
||||
INTEGRITY_CHECK=(md5)
|
||||
#-- Options to be used when stripping binaries. See `man strip' for details.
|
||||
STRIP_BINARIES="--strip-all"
|
||||
#-- Options to be used when stripping shared libraries. See `man strip' for details.
|
||||
STRIP_SHARED="--strip-unneeded"
|
||||
#-- Options to be used when stripping static libraries. See `man strip' for details.
|
||||
STRIP_STATIC="--strip-debug"
|
||||
#-- Manual (man and info) directories to compress (if zipman is specified)
|
||||
MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
|
||||
#-- Doc directories to remove (if !docs is specified)
|
||||
DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
|
||||
#-- Files to be removed from all packages (if purge is specified)
|
||||
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
|
||||
|
||||
#########################################################################
|
||||
# PACKAGE OUTPUT
|
||||
#########################################################################
|
||||
#
|
||||
# Default: put built package and cached source in build directory
|
||||
#
|
||||
#-- Destination: specify a fixed directory where all packages will be placed
|
||||
#PKGDEST=/home/packages
|
||||
#-- Source cache: specify a fixed directory where source files will be cached
|
||||
#SRCDEST=/home/sources
|
||||
#-- Source packages: specify a fixed directory where all src packages will be placed
|
||||
#SRCPKGDEST=/home/srcpackages
|
||||
#-- Log files: specify a fixed directory where all log files will be placed
|
||||
#LOGDEST=/home/makepkglogs
|
||||
#-- Packager: name/email of the person or organization building packages
|
||||
#PACKAGER="John Doe <john@doe.com>"
|
||||
#-- Specify a key to use for package signing
|
||||
#GPGKEY=""
|
||||
|
||||
#########################################################################
|
||||
# COMPRESSION DEFAULTS
|
||||
#########################################################################
|
||||
#
|
||||
COMPRESSGZ=(gzip -c -f -n)
|
||||
COMPRESSBZ2=(bzip2 -c -f)
|
||||
COMPRESSXZ=(xz -c -z -)
|
||||
COMPRESSLRZ=(lrzip -q)
|
||||
COMPRESSLZO=(lzop -q)
|
||||
COMPRESSZ=(compress -c -f)
|
||||
|
||||
#########################################################################
|
||||
# EXTENSION DEFAULTS
|
||||
#########################################################################
|
||||
#
|
||||
# WARNING: Do NOT modify these variables unless you know what you are
|
||||
# doing.
|
||||
#
|
||||
PKGEXT='.pkg.tar.xz'
|
||||
SRCEXT='.src.tar.gz'
|
||||
|
||||
# vim: set ft=sh ts=2 sw=2 et:
|
||||
|
|
@ -37,8 +37,8 @@ CHOST="@CHOST@"
|
|||
# -march (or -mcpu) builds exclusively for an architecture
|
||||
# -mtune optimizes for an architecture, but builds for whole processor family
|
||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||
CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
CXXFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
CFLAGS="@CARCHFLAGS@"
|
||||
CXXFLAGS="@CARCHFLAGS@"
|
||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
|
||||
#-- Make Flags: change this for DistCC/SMP systems
|
||||
#MAKEFLAGS="-j2"
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
#
|
||||
# /etc/pacman.conf
|
||||
#
|
||||
# See the pacman.conf(5) manpage for option and repository directives
|
||||
|
||||
#
|
||||
# GENERAL OPTIONS
|
||||
#
|
||||
[options]
|
||||
# The following paths are commented out with their default values listed.
|
||||
# If you wish to use different paths, uncomment and update the paths.
|
||||
#RootDir = /
|
||||
#DBPath = /var/lib/pacman/
|
||||
#CacheDir = /var/cache/pacman/pkg/
|
||||
#LogFile = /var/log/pacman.log
|
||||
#GPGDir = /etc/pacman.d/gnupg/
|
||||
#HookDir = /etc/pacman.d/hooks/
|
||||
HoldPkg = pacman glibc
|
||||
# If upgrades are available for these packages they will be asked for first
|
||||
SyncFirst = manjaro-system archlinux-keyring manjaro-keyring
|
||||
#XferCommand = /usr/bin/curl -C - -f %u > %o
|
||||
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
|
||||
#CleanMethod = KeepInstalled
|
||||
#UseDelta = 0.7
|
||||
Architecture = @CARCH@
|
||||
|
||||
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
|
||||
#IgnorePkg =
|
||||
#IgnoreGroup =
|
||||
|
||||
#NoUpgrade =
|
||||
#NoExtract =
|
||||
|
||||
# Misc options
|
||||
#UseSyslog
|
||||
#Color
|
||||
#TotalDownload
|
||||
# We cannot check disk space from within a chroot environment
|
||||
#CheckSpace
|
||||
#VerbosePkgLists
|
||||
|
||||
# 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.
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
#RemoteFileSigLevel = Required
|
||||
|
||||
# NOTE: You must run `pacman-key --init` before first using pacman; the local
|
||||
# keyring can then be populated with the keys of all official Manjaro Linux
|
||||
# packagers with `pacman-key --populate archlinux manjaro`.
|
||||
|
||||
#
|
||||
# REPOSITORIES
|
||||
# - can be defined here or included from another file
|
||||
# - pacman will search repositories in the order defined here
|
||||
# - local/custom mirrors can be added here or in separate files
|
||||
# - repositories listed first will take precedence when packages
|
||||
# have identical names, regardless of version number
|
||||
# - URLs will have $repo replaced by the name of the current repo
|
||||
# - URLs will have $arch replaced by the name of the architecture
|
||||
#
|
||||
# Repository entries are of the format:
|
||||
# [repo-name]
|
||||
# Server = ServerName
|
||||
# Include = IncludePath
|
||||
#
|
||||
# The header [repo-name] is crucial - it must be present and
|
||||
# uncommented to enable the repo.
|
||||
#
|
||||
|
||||
# The testing repositories are disabled by default. To enable, uncomment the
|
||||
# repo name header and Include lines. You can add preferred servers immediately
|
||||
# after the header, and they will be used before the default mirrors.
|
||||
|
||||
[core]
|
||||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[extra]
|
||||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
[community]
|
||||
SigLevel = PackageRequired
|
||||
Include = /etc/pacman.d/mirrorlist
|
||||
|
||||
# An example of a custom package repository. See the pacman manpage for
|
||||
# tips on creating your own repositories.
|
||||
#[custom]
|
||||
#SigLevel = Optional TrustAll
|
||||
#Server = file:///home/custompkgs
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
##
|
||||
## /etc/pacman-mirrors.conf
|
||||
##
|
||||
|
||||
## Branch Pacman should use (stable, testing, unstable)
|
||||
Branch = testing
|
||||
|
||||
## Generation method
|
||||
## 1) rank - rank mirrors depending on their access time
|
||||
## 2) random - randomly generate the output mirrorlist
|
||||
# Method = rank
|
||||
|
||||
## Specify to use only mirrors from specific a country.
|
||||
## Can add multiple countries separated by a comma (ex: Germany,France)
|
||||
## Empty means all
|
||||
# OnlyCountry =
|
||||
|
||||
## Mirrors directory
|
||||
# MirrorlistsDir = /etc/pacman.d/mirrors
|
||||
|
||||
## Output file
|
||||
# OutputMirrorlist = /etc/pacman.d/mirrorlist
|
||||
|
||||
## When set to True prevents the regeneration of the mirrorlist if
|
||||
## pacman-mirrors is invoked with the --no-update argument.
|
||||
## Useful if you don't want the mirrorlist regenerated after a
|
||||
## pacman-mirrors package upgrade.
|
||||
# NoUpdate = False
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
##
|
||||
## /etc/pacman-mirrors.conf
|
||||
##
|
||||
|
||||
## Branch Pacman should use (stable, testing, unstable)
|
||||
Branch = unstable
|
||||
|
||||
## Generation method
|
||||
## 1) rank - rank mirrors depending on their access time
|
||||
## 2) random - randomly generate the output mirrorlist
|
||||
# Method = rank
|
||||
|
||||
## Specify to use only mirrors from specific a country.
|
||||
## Can add multiple countries separated by a comma (ex: Germany,France)
|
||||
## Empty means all
|
||||
# OnlyCountry =
|
||||
|
||||
## Mirrors directory
|
||||
# MirrorlistsDir = /etc/pacman.d/mirrors
|
||||
|
||||
## Output file
|
||||
# OutputMirrorlist = /etc/pacman.d/mirrorlist
|
||||
|
||||
## When set to True prevents the regeneration of the mirrorlist if
|
||||
## pacman-mirrors is invoked with the --no-update argument.
|
||||
## Useful if you don't want the mirrorlist regenerated after a
|
||||
## pacman-mirrors package upgrade.
|
||||
# NoUpdate = False
|
||||
|
|
@ -9,82 +9,71 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
preconf_arm(){
|
||||
local conf_dir=/tmp tarch="$1" desc="$2" flags="$3"
|
||||
cp "${DATADIR}/pacman-arm.conf" "$conf_dir/pacman-$tarch.conf"
|
||||
cp "${DATADIR}/makepkg-arm.conf" "$conf_dir/makepkg-$tarch.conf"
|
||||
sed -i "$conf_dir/makepkg-$tarch.conf" \
|
||||
-e "s|@CARCH[@]|$tarch|g" \
|
||||
-e "s|@CHOST[@]|$desc|g" \
|
||||
-e "s|@CARCHFLAGS[@]|$flags|g"
|
||||
sed -i "$conf_dir/pacman-$tarch.conf" -e "s|@CARCH[@]|$tarch|g"
|
||||
get_makepkg_conf(){
|
||||
local conf_dir=/tmp conf
|
||||
conf="$conf_dir/makepkg-$1.conf"
|
||||
|
||||
work_dir="${chroots_pkg}/${target_branch}/$tarch"
|
||||
pkg_dir="${cache_dir_pkg}/${target_branch}/$tarch"
|
||||
cp "${DATADIR}/makepkg.conf" "$conf"
|
||||
|
||||
makepkg_conf="$conf_dir/makepkg-$tarch.conf"
|
||||
pacman_conf="$conf_dir/pacman-$tarch.conf"
|
||||
}
|
||||
sed -i "$conf" \
|
||||
-e "s|@CARCH[@]|$2|g" \
|
||||
-e "s|@CHOST[@]|$3|g" \
|
||||
-e "s|@CARCHFLAGS[@]|$4|g"
|
||||
|
||||
preconf(){
|
||||
local arch="$1"
|
||||
work_dir="${chroots_pkg}/${target_branch}/${target_arch}"
|
||||
pkg_dir="${cache_dir_pkg}/${target_branch}/${target_arch}"
|
||||
if [[ "$arch" == 'multilib' ]];then
|
||||
target_arch='x86_64'
|
||||
is_multilib=true
|
||||
else
|
||||
is_multilib=false
|
||||
fi
|
||||
makepkg_conf="${DATADIR}/makepkg-${target_arch}.conf"
|
||||
pacman_conf="${DATADIR}/pacman-$arch.conf"
|
||||
echo "$conf"
|
||||
}
|
||||
|
||||
# $1: target_arch
|
||||
configure_chroot_arch(){
|
||||
prepare_conf(){
|
||||
if ! is_valid_arch_pkg "$1";then
|
||||
die "%s is not a valid arch!" "$1"
|
||||
fi
|
||||
if ! is_valid_branch "${target_branch}";then
|
||||
die "%s is not a valid branch!" "${target_branch}"
|
||||
fi
|
||||
local conf_arch chost_desc cflags
|
||||
|
||||
local carch chost cflags pac_arch='default'
|
||||
case "$1" in
|
||||
'arm')
|
||||
conf_arch="$1"
|
||||
chost_desc="armv5tel-unknown-linux-gnueabi"
|
||||
cflags="-march=armv5te "
|
||||
preconf_arm "$conf_arch" "$chost_desc" "$cflags"
|
||||
carch="$1"
|
||||
chost="armv5tel-unknown-linux-gnueabi"
|
||||
cflags="-march=armv5te -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
;;
|
||||
'armv6h')
|
||||
conf_arch="$1"
|
||||
chost_desc="armv6l-unknown-linux-gnueabihf"
|
||||
cflags="-march=armv6 -mfloat-abi=hard -mfpu=vfp "
|
||||
preconf_arm "$conf_arch" "$chost_desc" "$cflags"
|
||||
carch="$1"
|
||||
chost="armv6l-unknown-linux-gnueabihf"
|
||||
cflags="-march=armv6 -mfloat-abi=hard -mfpu=vfp -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
;;
|
||||
'armv7h')
|
||||
conf_arch="$1"
|
||||
chost_desc="armv7l-unknown-linux-gnueabihf"
|
||||
cflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 "
|
||||
preconf_arm "$conf_arch" "$chost_desc" "$cflags"
|
||||
;;
|
||||
carch="$1"
|
||||
chost="armv7l-unknown-linux-gnueabihf"
|
||||
cflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
'aarch64')
|
||||
conf_arch="$1"
|
||||
chost_desc="aarch64-unknown-linux-gnu"
|
||||
cflags="-march=armv8-a "
|
||||
preconf_arm "$conf_arch" "$chost_desc" "$cflags"
|
||||
carch="$1"
|
||||
chost="aarch64-unknown-linux-gnu"
|
||||
cflags="-march=armv8-a -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
|
||||
;;
|
||||
'multilib')
|
||||
conf_arch='multilib'
|
||||
preconf "$conf_arch"
|
||||
'x86_64'|'multilib')
|
||||
carch="x86_64"
|
||||
chost="x86_64-pc-linux-gnu"
|
||||
cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
if [[ "$1" == 'multilib' ]];then
|
||||
pac_arch='multilib'
|
||||
is_multilib=true
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
conf_arch='default'
|
||||
preconf "$conf_arch"
|
||||
'i686')
|
||||
carch="$1"
|
||||
chost="i686-pc-linux-gnu"
|
||||
cflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"
|
||||
;;
|
||||
esac
|
||||
|
||||
mirrors_conf="${DATADIR}/pacman-mirrors-${target_branch}.conf"
|
||||
pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
|
||||
|
||||
work_dir="${chroots_pkg}/${target_branch}/$1"
|
||||
pkg_dir="${cache_dir_pkg}/${target_branch}/$1"
|
||||
|
||||
[[ "$pac_arch" == 'multilib' ]] && target_arch='x86_64'
|
||||
|
||||
makepkg_conf=$(get_makepkg_conf "${target_arch}" "$carch" "$chost" "$cflags")
|
||||
}
|
||||
|
||||
pkgver_equal() {
|
||||
|
|
|
|||
10
lib/util.sh
10
lib/util.sh
|
|
@ -62,6 +62,16 @@ check_user_repos_conf(){
|
|||
done
|
||||
}
|
||||
|
||||
get_pac_mirrors_conf(){
|
||||
local conf_dir=/tmp conf
|
||||
conf="$conf_dir/pacman-mirrors-$1.conf"
|
||||
cp "${DATADIR}/pacman-mirrors.conf" "$conf"
|
||||
sed -i "$conf" \
|
||||
-e "s|^.*Branch.*|Branch = $1|"
|
||||
|
||||
echo "$conf"
|
||||
}
|
||||
|
||||
read_set(){
|
||||
local _space="s| ||g" \
|
||||
_clean=':a;N;$!ba;s/\n/ /g' \
|
||||
|
|
|
|||
Loading…
Reference in a new issue