diff --git a/Makefile b/Makefile index 47ff287..87690b1 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SHELL=/bin/bash -o pipefail V=1.3.1 BUILDTOOLVER ?= $(V) -PREFIX = /usr/local +PREFIX = /usr MANDIR = $(PREFIX)/share/man DATADIR = $(PREFIX)/share/devtools BUILDDIR = build @@ -21,33 +21,29 @@ SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*) MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc))) COMMITPKG_LINKS = \ - core-testingpkg \ - core-stagingpkg \ + corepkg \ extrapkg \ - extra-testingpkg \ - extra-stagingpkg \ + kdepkg \ multilibpkg \ - multilib-testingpkg \ - multilib-stagingpkg \ - kde-unstablepkg \ - gnome-unstablepkg + perlpkg \ + pythonpkg \ + xorgpkg ARCHBUILD_LINKS = \ - core-testing-x86_64-build \ - core-testing-x86_64_v3-build \ - core-staging-x86_64-build \ - core-staging-x86_64_v3-build \ + core-x86_64-build \ extra-x86_64-build \ + kde-x86_64-build \ + multilib-x86_64-build \ + perl-x86_64-build \ + python-x86_64-build \ + xorg-x86_64-build \ + core-x86_64_v3-build \ extra-x86_64_v3-build \ - extra-testing-x86_64-build \ - extra-testing-x86_64_v3-build \ - extra-staging-x86_64-build \ - extra-staging-x86_64_v3-build \ - multilib-build \ - multilib-testing-build \ - multilib-staging-build \ - kde-unstable-x86_64-build \ - gnome-unstable-x86_64-build + kde-x86_64_v3-build \ + multilib-x86_64_v3-build \ + perl-x86_64_v3-build \ + python-x86_64_v3-build \ + xorg-x86_64_v3-build COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*))) @@ -128,7 +124,7 @@ install: all for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done - for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done + for l in ${ARCHBUILD_LINKS}; do ln -sf flarebirdbuild $(DESTDIR)$(PREFIX)/bin/$$l; done ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools for f in $(notdir $(BINPROGS)); do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$f; done diff --git a/config/makepkg/x86_64.conf b/config/makepkg/x86_64.conf index 6c1bd7e..73650bd 100644 --- a/config/makepkg/x86_64.conf +++ b/config/makepkg/x86_64.conf @@ -36,7 +36,7 @@ VCSCLIENTS=('bzr::breezy' ######################################################################### # CARCH="x86_64" -CHOST="x86_64-pc-linux-gnu" +CHOST="x86_64-flarebird-linux-gnu" #-- Compiler and Linker Flags #CPPFLAGS="" @@ -50,6 +50,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ LTOFLAGS="-flto=auto" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" +MAKEFLAGS=-j$(nproc) #-- Debugging flags DEBUG_CFLAGS="-g" DEBUG_CXXFLAGS="$DEBUG_CFLAGS" @@ -95,7 +96,7 @@ BUILDENV=(!distcc color !ccache check !sign) #-- 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) +OPTIONS=(!strip docs !libtool !staticlibs emptydirs zipman !purge !debug !lto) #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 INTEGRITY_CHECK=(sha256) @@ -114,7 +115,7 @@ 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') +LIB_DIRS=('lib64:usr/lib64' 'lib32:usr/lib32') ######################################################################### # PACKAGE OUTPUT @@ -123,15 +124,15 @@ LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') # Default: put built package and cached source in build directory # #-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages +PKGDEST=${HOME}/packages #-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources +SRCDEST=${HOME}/sources #-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages +SRCPKGDEST=${HOME}/srcpackages #-- Log files: specify a fixed directory where all log files will be placed -#LOGDEST=/home/makepkglogs +LOGDEST=${HOME}/makepkglogs #-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe " +PACKAGER="FlareBird Linux Team " #-- Specify a key to use for package signing #GPGKEY="" diff --git a/config/makepkg/x86_64_v3.conf b/config/makepkg/x86_64_v3.conf index 80247eb..6d3d7f9 100644 --- a/config/makepkg/x86_64_v3.conf +++ b/config/makepkg/x86_64_v3.conf @@ -36,7 +36,7 @@ VCSCLIENTS=('bzr::breezy' ######################################################################### # CARCH="x86_64_v3" -CHOST="x86_64-pc-linux-gnu" +CHOST="x86_64-flarebird-linux-gnu" #-- Compiler and Linker Flags #CPPFLAGS="" @@ -49,7 +49,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ -Wl,-z,pack-relative-relocs" LTOFLAGS="-flto=auto" #-- Make Flags: change this for DistCC/SMP systems -#MAKEFLAGS="-j2" +MAKEFLAGS=-j$(nproc) #-- Debugging flags DEBUG_CFLAGS="-g" DEBUG_CXXFLAGS="$DEBUG_CFLAGS" @@ -95,7 +95,7 @@ BUILDENV=(!distcc color !ccache check !sign) #-- 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) +OPTIONS=(!strip docs !libtool !staticlibs emptydirs zipman !purge !debug !lto) #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 INTEGRITY_CHECK=(sha256) @@ -114,7 +114,7 @@ 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') +LIB_DIRS=('lib64:usr/lib64' 'lib32:usr/lib32') ######################################################################### # PACKAGE OUTPUT @@ -123,15 +123,15 @@ LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') # Default: put built package and cached source in build directory # #-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages +PKGDEST=${HOME}/packages #-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources +SRCDEST=${HOME}/sources #-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages +SRCPKGDEST=${HOME}/srcpackages #-- Log files: specify a fixed directory where all log files will be placed -#LOGDEST=/home/makepkglogs +LOGDEST=${HOME}/makepkglogs #-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe " +PACKAGER="FlareBird Linux Team " #-- Specify a key to use for package signing #GPGKEY="" diff --git a/config/pacman/core-testing-x86_64_v3.conf b/config/pacman/core-testing-x86_64_v3.conf deleted file mode 100644 index 4a72ab4..0000000 --- a/config/pacman/core-testing-x86_64_v3.conf +++ /dev/null @@ -1,91 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = x86_64_v3 x86_64 - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -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 diff --git a/config/pacman/core-staging-x86_64_v3.conf b/config/pacman/core-x86_64_v3.conf similarity index 92% rename from config/pacman/core-staging-x86_64_v3.conf rename to config/pacman/core-x86_64_v3.conf index b4174f9..b96b953 100644 --- a/config/pacman/core-staging-x86_64_v3.conf +++ b/config/pacman/core-x86_64_v3.conf @@ -30,10 +30,10 @@ Architecture = x86_64_v3 x86_64 # Misc options #UseSyslog -#Color +Color NoProgressBar # We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace VerbosePkgLists ParallelDownloads = 5 DownloadUser = alpm @@ -41,13 +41,13 @@ DownloadUser = alpm # 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 +#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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# packagers with `pacman-key --populate flarebird`. # # REPOSITORIES @@ -72,22 +72,25 @@ LocalFileSigLevel = Optional # 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-staging] +[core] Include = /etc/pacman.d/mirrorlist -[core-testing] +[extra] Include = /etc/pacman.d/mirrorlist -[core] +[perl] Include = /etc/pacman.d/mirrorlist -[extra-staging] +[python] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[xorg] Include = /etc/pacman.d/mirrorlist -[extra] +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/config/pacman/kde-unstable.conf b/config/pacman/core.conf similarity index 69% rename from config/pacman/kde-unstable.conf rename to config/pacman/core.conf index 85ce011..7e25213 100644 --- a/config/pacman/kde-unstable.conf +++ b/config/pacman/core.conf @@ -30,24 +30,18 @@ Architecture = auto # Misc options #UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#CheckSpace +Color +#NoProgressBar +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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional # # REPOSITORIES @@ -68,27 +62,34 @@ LocalFileSigLevel = Optional # 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. +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. -[kde-unstable] +[core] Include = /etc/pacman.d/mirrorlist -[core-testing] +[extra] Include = /etc/pacman.d/mirrorlist -[core] +[perl] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[python] Include = /etc/pacman.d/mirrorlist -[extra] +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] 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 +#Server = file:///home/packages diff --git a/config/pacman/extra-testing-x86_64_v3.conf b/config/pacman/extra-testing-x86_64_v3.conf deleted file mode 100644 index 4a72ab4..0000000 --- a/config/pacman/extra-testing-x86_64_v3.conf +++ /dev/null @@ -1,91 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = x86_64_v3 x86_64 - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -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 diff --git a/config/pacman/extra-testing.conf b/config/pacman/extra-testing.conf deleted file mode 100644 index f9f042f..0000000 --- a/config/pacman/extra-testing.conf +++ /dev/null @@ -1,91 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -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 diff --git a/config/pacman/extra-x86_64_v3.conf b/config/pacman/extra-x86_64_v3.conf index ea874ac..b96b953 100644 --- a/config/pacman/extra-x86_64_v3.conf +++ b/config/pacman/extra-x86_64_v3.conf @@ -30,10 +30,10 @@ Architecture = x86_64_v3 x86_64 # Misc options #UseSyslog -#Color +Color NoProgressBar # We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace VerbosePkgLists ParallelDownloads = 5 DownloadUser = alpm @@ -41,13 +41,13 @@ DownloadUser = alpm # 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 +#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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# packagers with `pacman-key --populate flarebird`. # # REPOSITORIES @@ -72,18 +72,27 @@ LocalFileSigLevel = Optional # 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-testing] -#Include = /etc/pacman.d/mirrorlist - [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist - [extra] Include = /etc/pacman.d/mirrorlist +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/config/pacman/extra.conf b/config/pacman/extra.conf index 84e0026..7e25213 100644 --- a/config/pacman/extra.conf +++ b/config/pacman/extra.conf @@ -30,24 +30,18 @@ Architecture = auto # Misc options #UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#CheckSpace +Color +#NoProgressBar +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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional # # REPOSITORIES @@ -68,24 +62,34 @@ LocalFileSigLevel = Optional # 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-testing] -#Include = /etc/pacman.d/mirrorlist +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist - [extra] Include = /etc/pacman.d/mirrorlist +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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 +#Server = file:///home/packages diff --git a/config/pacman/gnome-unstable.conf b/config/pacman/gnome-unstable.conf deleted file mode 100644 index 93a8e68..0000000 --- a/config/pacman/gnome-unstable.conf +++ /dev/null @@ -1,94 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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. - -[gnome-unstable] -Include = /etc/pacman.d/mirrorlist - -[core-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -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 diff --git a/config/pacman/extra-staging-x86_64_v3.conf b/config/pacman/kde-x86_64_v3.conf similarity index 92% rename from config/pacman/extra-staging-x86_64_v3.conf rename to config/pacman/kde-x86_64_v3.conf index b4174f9..b96b953 100644 --- a/config/pacman/extra-staging-x86_64_v3.conf +++ b/config/pacman/kde-x86_64_v3.conf @@ -30,10 +30,10 @@ Architecture = x86_64_v3 x86_64 # Misc options #UseSyslog -#Color +Color NoProgressBar # We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace VerbosePkgLists ParallelDownloads = 5 DownloadUser = alpm @@ -41,13 +41,13 @@ DownloadUser = alpm # 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 +#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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# packagers with `pacman-key --populate flarebird`. # # REPOSITORIES @@ -72,22 +72,25 @@ LocalFileSigLevel = Optional # 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-staging] +[core] Include = /etc/pacman.d/mirrorlist -[core-testing] +[extra] Include = /etc/pacman.d/mirrorlist -[core] +[perl] Include = /etc/pacman.d/mirrorlist -[extra-staging] +[python] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[xorg] Include = /etc/pacman.d/mirrorlist -[extra] +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/config/pacman/core-testing.conf b/config/pacman/kde.conf similarity index 69% rename from config/pacman/core-testing.conf rename to config/pacman/kde.conf index f9f042f..7e25213 100644 --- a/config/pacman/core-testing.conf +++ b/config/pacman/kde.conf @@ -30,24 +30,18 @@ Architecture = auto # Misc options #UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#CheckSpace +Color +#NoProgressBar +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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional # # REPOSITORIES @@ -68,24 +62,34 @@ LocalFileSigLevel = Optional # 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. +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. -[core-testing] +[core] Include = /etc/pacman.d/mirrorlist -[core] +[extra] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[perl] Include = /etc/pacman.d/mirrorlist -[extra] +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] 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 +#Server = file:///home/packages diff --git a/config/pacman/multilib-staging.conf b/config/pacman/multilib-staging.conf deleted file mode 100644 index 0511986..0000000 --- a/config/pacman/multilib-staging.conf +++ /dev/null @@ -1,108 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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-staging] -Include = /etc/pacman.d/mirrorlist - -[core-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-staging] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. -[multilib-staging] -Include = /etc/pacman.d/mirrorlist - -[multilib-testing] -Include = /etc/pacman.d/mirrorlist - -[multilib] -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 diff --git a/config/pacman/multilib-testing.conf b/config/pacman/multilib-testing.conf deleted file mode 100644 index f650a9c..0000000 --- a/config/pacman/multilib-testing.conf +++ /dev/null @@ -1,99 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. -[multilib-testing] -Include = /etc/pacman.d/mirrorlist - -[multilib] -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 diff --git a/config/pacman/core-staging.conf b/config/pacman/multilib-x86_64_v3.conf similarity index 91% rename from config/pacman/core-staging.conf rename to config/pacman/multilib-x86_64_v3.conf index 80be443..b96b953 100644 --- a/config/pacman/core-staging.conf +++ b/config/pacman/multilib-x86_64_v3.conf @@ -19,7 +19,7 @@ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -Architecture = auto +Architecture = x86_64_v3 x86_64 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -30,10 +30,10 @@ Architecture = auto # Misc options #UseSyslog -#Color +Color NoProgressBar # We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace VerbosePkgLists ParallelDownloads = 5 DownloadUser = alpm @@ -41,13 +41,13 @@ DownloadUser = alpm # 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 +#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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# packagers with `pacman-key --populate flarebird`. # # REPOSITORIES @@ -72,22 +72,25 @@ LocalFileSigLevel = Optional # 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-staging] +[core] Include = /etc/pacman.d/mirrorlist -[core-testing] +[extra] Include = /etc/pacman.d/mirrorlist -[core] +[perl] Include = /etc/pacman.d/mirrorlist -[extra-staging] +[python] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[xorg] Include = /etc/pacman.d/mirrorlist -[extra] +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/config/pacman/multilib.conf b/config/pacman/multilib.conf index 7d10e44..7e25213 100644 --- a/config/pacman/multilib.conf +++ b/config/pacman/multilib.conf @@ -30,24 +30,18 @@ Architecture = auto # Misc options #UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#CheckSpace +Color +#NoProgressBar +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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional # # REPOSITORIES @@ -68,27 +62,28 @@ LocalFileSigLevel = Optional # 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-testing] -#Include = /etc/pacman.d/mirrorlist +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. [core] Include = /etc/pacman.d/mirrorlist -#[extra-testing] -#Include = /etc/pacman.d/mirrorlist - [extra] Include = /etc/pacman.d/mirrorlist -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. +[perl] +Include = /etc/pacman.d/mirrorlist -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist [multilib] Include = /etc/pacman.d/mirrorlist @@ -97,4 +92,4 @@ Include = /etc/pacman.d/mirrorlist # tips on creating your own repositories. #[custom] #SigLevel = Optional TrustAll -#Server = file:///home/custompkgs +#Server = file:///home/packages diff --git a/config/pacman/extra-staging.conf b/config/pacman/perl-x86_64_v3.conf similarity index 91% rename from config/pacman/extra-staging.conf rename to config/pacman/perl-x86_64_v3.conf index 80be443..b96b953 100644 --- a/config/pacman/extra-staging.conf +++ b/config/pacman/perl-x86_64_v3.conf @@ -19,7 +19,7 @@ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -Architecture = auto +Architecture = x86_64_v3 x86_64 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -30,10 +30,10 @@ Architecture = auto # Misc options #UseSyslog -#Color +Color NoProgressBar # We cannot check disk space from within a chroot environment -#CheckSpace +CheckSpace VerbosePkgLists ParallelDownloads = 5 DownloadUser = alpm @@ -41,13 +41,13 @@ DownloadUser = alpm # 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 +#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 Arch Linux -# packagers with `pacman-key --populate archlinux`. +# packagers with `pacman-key --populate flarebird`. # # REPOSITORIES @@ -72,22 +72,25 @@ LocalFileSigLevel = Optional # 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-staging] +[core] Include = /etc/pacman.d/mirrorlist -[core-testing] +[extra] Include = /etc/pacman.d/mirrorlist -[core] +[perl] Include = /etc/pacman.d/mirrorlist -[extra-staging] +[python] Include = /etc/pacman.d/mirrorlist -[extra-testing] +[xorg] Include = /etc/pacman.d/mirrorlist -[extra] +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/config/pacman/perl.conf b/config/pacman/perl.conf new file mode 100644 index 0000000..7e25213 --- /dev/null +++ b/config/pacman/perl.conf @@ -0,0 +1,95 @@ +# +# /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 +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +#NoProgressBar +CheckSpace +VerbosePkgLists +ParallelDownloads = 5 +DownloadUser = alpm +#DisableSandbox + +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional + +# +# 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. +# + +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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/packages diff --git a/config/pacman/python-x86_64_v3.conf b/config/pacman/python-x86_64_v3.conf new file mode 100644 index 0000000..b96b953 --- /dev/null +++ b/config/pacman/python-x86_64_v3.conf @@ -0,0 +1,100 @@ +# +# /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 +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = x86_64_v3 x86_64 + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +NoProgressBar +# We cannot check disk space from within a chroot environment +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. +#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 Arch Linux +# packagers with `pacman-key --populate flarebird`. + +# +# 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] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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 diff --git a/config/pacman/python.conf b/config/pacman/python.conf new file mode 100644 index 0000000..7e25213 --- /dev/null +++ b/config/pacman/python.conf @@ -0,0 +1,95 @@ +# +# /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 +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +#NoProgressBar +CheckSpace +VerbosePkgLists +ParallelDownloads = 5 +DownloadUser = alpm +#DisableSandbox + +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional + +# +# 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. +# + +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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/packages diff --git a/config/pacman/universe.conf b/config/pacman/universe.conf deleted file mode 100644 index f47af5d..0000000 --- a/config/pacman/universe.conf +++ /dev/null @@ -1,114 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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. - -[gnome-unstable] -Include = /etc/pacman.d/mirrorlist - -[kde-unstable] -Include = /etc/pacman.d/mirrorlist - -[core-staging] -Include = /etc/pacman.d/mirrorlist - -[core-testing] -Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra-staging] -Include = /etc/pacman.d/mirrorlist - -[extra-testing] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. -[multilib-staging] -Include = /etc/pacman.d/mirrorlist - -[multilib-testing] -Include = /etc/pacman.d/mirrorlist - -[multilib] -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 diff --git a/config/pacman/unstable.conf b/config/pacman/unstable.conf deleted file mode 100644 index ae05bb1..0000000 --- a/config/pacman/unstable.conf +++ /dev/null @@ -1,85 +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 -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -NoProgressBar -# We cannot check disk space from within a chroot environment -#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. -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 Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# 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. - -[gnome-unstable] -Include = /etc/pacman.d/mirrorlist - -[kde-unstable] -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 diff --git a/config/pacman/xorg-x86_64_v3.conf b/config/pacman/xorg-x86_64_v3.conf new file mode 100644 index 0000000..b96b953 --- /dev/null +++ b/config/pacman/xorg-x86_64_v3.conf @@ -0,0 +1,100 @@ +# +# /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 +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = x86_64_v3 x86_64 + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +NoProgressBar +# We cannot check disk space from within a chroot environment +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. +#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 Arch Linux +# packagers with `pacman-key --populate flarebird`. + +# +# 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] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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 diff --git a/config/pacman/xorg.conf b/config/pacman/xorg.conf new file mode 100644 index 0000000..7e25213 --- /dev/null +++ b/config/pacman/xorg.conf @@ -0,0 +1,95 @@ +# +# /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 +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +#NoProgressBar +CheckSpace +VerbosePkgLists +ParallelDownloads = 5 +DownloadUser = alpm +#DisableSandbox + +# PGP signature checking +#SigLevel = Optional +#LocalFileSigLevel = Optional +#RemoteFileSigLevel = Optional + +# +# 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. +# + +# An example of a disabled remote package repository with multiple servers +# available. To enable, uncomment the following lines. You can add preferred +# servers immediately after the header and they will be used before the +# default mirrors. + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[perl] +Include = /etc/pacman.d/mirrorlist + +[python] +Include = /etc/pacman.d/mirrorlist + +[xorg] +Include = /etc/pacman.d/mirrorlist + +[kde] +Include = /etc/pacman.d/mirrorlist + +[multilib] +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/packages diff --git a/contrib/completion/bash/devtools.in b/contrib/completion/bash/devtools.in index 7a71aac..d32650f 100644 --- a/contrib/completion/bash/devtools.in +++ b/contrib/completion/bash/devtools.in @@ -62,7 +62,7 @@ _makerepropkg() { __devtools_complete _makerepropkg; } complete -F _makerepropkg makerepropkg -_mkarchroot_args=( +_mkflarebirdroot_args=( -U -C -M @@ -70,12 +70,12 @@ _mkarchroot_args=( -f -h ) -_mkarchroot_args_U_opts() { _filedir '*.pkg.tar.*'; } -_mkarchroot_args_C_opts() { _filedir '*.conf'; } -_mkarchroot_args_M_opts() { _filedir '*.conf'; } -_mkarchroot_args_c_opts() { _filedir -d; } -_mkarchroot_args_f_opts() { _filedir -d; } -_mkarchroot_opts() { +_mkflarebirdroot_args_U_opts() { _filedir '*.pkg.tar.*'; } +_mkflarebirdroot_args_C_opts() { _filedir '*.conf'; } +_mkflarebirdroot_args_M_opts() { _filedir '*.conf'; } +_mkflarebirdroot_args_c_opts() { _filedir -d; } +_mkflarebirdroot_args_f_opts() { _filedir -d; } +_mkflarebirdroot_opts() { local args args=$(__pkgctl_word_count_after_subcommand) if (( args == 0 )); then @@ -84,11 +84,11 @@ _mkarchroot_opts() { _devtools_completions_all_packages fi } -_mkarchroot() { __devtools_complete _mkarchroot; } -complete -F _mkarchroot mkarchroot +_mkflarebirdroot() { __devtools_complete _mkflarebirdroot; } +complete -F _mkflarebirdroot mkflarebirdroot -_arch_nspawn_args=( +_flarebird_nspawn_args=( -C -M -c @@ -96,19 +96,19 @@ _arch_nspawn_args=( -s -h ) -_arch_nspawn_args_C_opts() { _filedir '*.conf'; } -_arch_nspawn_args_M_opts() { _filedir '*.conf'; } -_arch_nspawn_args_c_opts() { _filedir -d; } -_arch_nspawn_args_f_opts() { _filedir; } -_arch_nspawn_opts() { +_flarebird_nspawn_args_C_opts() { _filedir '*.conf'; } +_flarebird_nspawn_args_M_opts() { _filedir '*.conf'; } +_flarebird_nspawn_args_c_opts() { _filedir -d; } +_flarebird_nspawn_args_f_opts() { _filedir; } +_flarebird_nspawn_opts() { local args args=$(__pkgctl_word_count_after_subcommand) if (( args == 0 )); then _filedir -d fi } -_arch_nspawn() { __devtools_complete _arch_nspawn; } -complete -F _arch_nspawn arch-nspawn +_flarebird_nspawn() { __devtools_complete _flarebird_nspawn; } +complete -F _flarebird_nspawn flarebird-nspawn _sogrep_args=( diff --git a/contrib/completion/zsh/_devtools.in b/contrib/completion/zsh/_devtools.in index def44d4..f0b3b84 100644 --- a/contrib/completion/zsh/_devtools.in +++ b/contrib/completion/zsh/_devtools.in @@ -1,4 +1,4 @@ -#compdef archbuild arch-nspawn archrelease commitpkg pkgctl diffpkg finddeps makechrootpkg mkarchroot extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild checkpkg sogrep offload-build makerepropkg +#compdef flarebirdbuild flarebird-nspawn flarebirdrelease commitpkg pkgctl diffpkg finddeps makechrootpkg mkflarebirdroot extrapkg=commitpkg corepkg=commitpkg kdepkg=commitpkg pythonpkg=commitpkg perlpkg=commitpkg xorgpkg=commitpkg multilibpkg=commitpkg core-x86_64-build=flarebirdbuild extra-x86_64-build=flarebirdbuild kde-x86_64-build=flarebirdbuild multilib-x86_64-build=flarebirdbuild perl-x86_64-build=flarebirdbuild python-x86_64-build=flarebirdbuild xorg-x86_64-build=flarebirdbuild checkpkg sogrep offload-build makerepropkg # # SPDX-License-Identifier: GPL-3.0-or-later @@ -20,7 +20,7 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-issue.sh _colors=(never always auto) -_archbuild_args=( +_flarebirdbuild_args=( '-c[Recreate the chroot before building]' '-r[Create chroots in this directory]:base_dir:_files -/' '-h[Display usage]' @@ -284,7 +284,7 @@ _pkgctl_search_args=( '1:query' ) -_arch_nspawn_args=( +_flarebird_nspawn_args=( '-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"' '-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"' '*-c[Set pacman cache]:pacman_cache:_files -/' @@ -294,7 +294,7 @@ _arch_nspawn_args=( '1:chroot_dir:_files -/' ) -_archrelease_args=( +_flarebirdrelease_args=( '-f[Force release without checks]' "*:arch:($DEVTOOLS_VALID_TAGS[*])" ) @@ -343,7 +343,7 @@ _makechrootpkg_args=( "-x[Spawn an interactive shell to inspect the chroot (never, always, failure)]:inspect:($DEVTOOLS_VALID_INSPECT_MODES[*])" ) -_mkarchroot_args=( +_mkflarebirdroot_args=( '-U[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"' '-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"' '-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"' diff --git a/contrib/makepkg/PKGBUILD.proto b/contrib/makepkg/PKGBUILD.proto index e8690e4..98d86ff 100644 --- a/contrib/makepkg/PKGBUILD.proto +++ b/contrib/makepkg/PKGBUILD.proto @@ -1,46 +1,33 @@ #!/hint/bash # shellcheck disable=2034 -# This is an example PKGBUILD file, so that shellcheck can know what -# variables to expect be set after including a PKGBUILD. - -# Maintainer: Your Name -pkgname=NAME -pkgver=VERSION +pkgname= +pkgver= pkgrel=1 -epoch= pkgdesc="" -arch=() +arch=('') url="" -license=('GPL') +license=('') groups=() depends=() makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() backup=() options=() install= -changelog= -source=("$pkgname-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") -noextract=() +source=() md5sums=() validpgpkeys=() prepare() { - : + : } build() { - : + : } check() { - : + : } package() { diff --git a/doc/man/devtools.7.asciidoc b/doc/man/devtools.7.asciidoc index 9156d50..999dede 100644 --- a/doc/man/devtools.7.asciidoc +++ b/doc/man/devtools.7.asciidoc @@ -13,7 +13,7 @@ unified command-line frontend called 'pkgctl' that aids to conveniently interact with all the different tools this collection provides. The toolset varies from tools for building packages in a clean chroot -('mkarchroot', 'archbuild', ...), packaging related tools ('sogrep', 'diffpkg', +('mkflarebirdroot', 'flarebirdbuild', ...), packaging related tools ('sogrep', 'diffpkg', 'lddd') and tools for repository management such as ('pkgrepo'). Programs @@ -24,10 +24,10 @@ for details. pkgctl(1) Unified command-line frontend for devtools -archbuild(1) +flarebirdbuild(1) Build an Arch Linux package inside a clean chroot -arch-nspawn(1) +flarebird-nspawn(1) Run a command or OS in a light-weight namespace container checkpkg(1) @@ -48,7 +48,7 @@ find-libprovides(1) lddd(1) Find broken library links on your system -mkarchroot(1) +mkflarebirdroot(1) Creates an arch chroot in a specified location with a specified set of packages diff --git a/doc/man/arch-nspawn.1.asciidoc b/doc/man/flarebird-nspawn.1.asciidoc similarity index 72% rename from doc/man/arch-nspawn.1.asciidoc rename to doc/man/flarebird-nspawn.1.asciidoc index ae6532b..477a6bf 100644 --- a/doc/man/arch-nspawn.1.asciidoc +++ b/doc/man/flarebird-nspawn.1.asciidoc @@ -1,18 +1,18 @@ -arch-nspawn(1) -============== +flarebird-nspawn(1) +=================== Name ---- -arch-nspawn - Run a command or OS in a light-weight namespace container +flarebird-nspawn - Run a command or OS in a light-weight namespace container Synopsis -------- -arch-nspawn [options] working-dir [systemd-nspawn arguments] +flarebird-nspawn [options] working-dir [systemd-nspawn arguments] Description ----------- -'arch-nspawn' is a wrapper around systemd-nspawn to run command or OS in a +'flarebird-nspawn' is a wrapper around systemd-nspawn to run command or OS in a namespace container such as a directory including base utilities of a OS. It is used to build package(s) in given clean and defined environment. diff --git a/doc/man/archbuild.1.asciidoc b/doc/man/flarebirdbuild.1.asciidoc similarity index 53% rename from doc/man/archbuild.1.asciidoc rename to doc/man/flarebirdbuild.1.asciidoc index 9c1973d..4091d1a 100644 --- a/doc/man/archbuild.1.asciidoc +++ b/doc/man/flarebirdbuild.1.asciidoc @@ -1,18 +1,18 @@ -archbuild(1) -============ +flarebirdbuild(1) +================= Name ---- -archbuild - a script to build an Arch Linux package inside a clean chroot. +flarebirdbuild - a script to build an Arch Linux package inside a clean chroot. Synopsis -------- -archbuild [options] -- [makechrootpkg args] +flarebirdbuild [options] -- [makechrootpkg args] Description ----------- -'archbuild' is a script to build an Arch Linux package. archbuild is part of devtools but should only be used via one of the included symlinks: +'flarebirdbuild' is a script to build an Arch Linux package. flarebirdbuild is part of devtools but should only be used via one of the included symlinks: * extra-x86_64-build * gnome-unstable-x86_64-build @@ -23,7 +23,7 @@ Description * staging-x86_64-build * testing-x86_64-build -The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'reponame-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/pacman.conf.d. The makepkg configuration is loaded from 'repo-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/makepkg.conf.d. +The symlink used to run it will be inspected by flarebirdbuild, to determine which target you want it to use. It will load the available pacman configuration from 'reponame-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/pacman.conf.d. The makepkg configuration is loaded from 'repo-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/makepkg.conf.d. It will also load the bind mount configuration from 'mount.d/arch' in {pkgdatadir}. The file format is that each line starting with ro and rw will be used, other lines will be ignored, and the rest of the used line is out/path:in/path preceded by a space as a separator. ro means it is a read-only mount, rw means a read-write mount. diff --git a/doc/man/makechrootpkg.1.asciidoc b/doc/man/makechrootpkg.1.asciidoc index 34ba199..c3a02e7 100644 --- a/doc/man/makechrootpkg.1.asciidoc +++ b/doc/man/makechrootpkg.1.asciidoc @@ -22,7 +22,7 @@ by default. The working copy will be created as needed The chroot "root" directory must be created via the following command: - mkarchroot /root base-devel + mkflarebirdroot /root base-devel This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER from makepkg.conf(5), if those variables are not part of the diff --git a/doc/man/mkarchroot.1.asciidoc b/doc/man/mkflarebirdroot.1.asciidoc similarity index 73% rename from doc/man/mkarchroot.1.asciidoc rename to doc/man/mkflarebirdroot.1.asciidoc index edbb17e..ab35d9f 100644 --- a/doc/man/mkarchroot.1.asciidoc +++ b/doc/man/mkflarebirdroot.1.asciidoc @@ -1,18 +1,18 @@ -mkarchroot(1) -============= +mkflarebirdroot(1) +================== Name ---- -mkarchroot - Creates an arch chroot in a specified location with a specified set of packages +mkflarebirdroot - Creates an arch chroot in a specified location with a specified set of packages Synopsis -------- -mkarchroot [options] [location] [packages] +mkflarebirdroot [options] [location] [packages] Description ----------- -'mkarchroot' is a script to create an Arch Linux chroot at a specified location +'mkflarebirdroot' is a script to create an Arch Linux chroot at a specified location with specified packages. Typically used by 'makechrootpkg' to create build chroots. Apart from installing specified packages the chroot is created with an en_US.UTF-8 and de_DE.UTF-8 locale and a generated machine-id. diff --git a/doc/man/offload-build.1.asciidoc b/doc/man/offload-build.1.asciidoc index 6b39711..0401fe6 100644 --- a/doc/man/offload-build.1.asciidoc +++ b/doc/man/offload-build.1.asciidoc @@ -13,7 +13,7 @@ Description ----------- Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user -that can run archbuild in a non-interactive manner, e.g. must be able to +that can run flarebirdbuild in a non-interactive manner, e.g. must be able to elevate permissions using passwordless sudo. Options @@ -35,15 +35,15 @@ Options *-h, --help*:: Show a help text. -Passing options to archbuild +Passing options to flarebirdbuild ---------------------------- -Options after a delimiting -- are passed on to archbuild on the remote. -archbuild in turn supports passing arguments on to makechrootpkg, which in turn +Options after a delimiting -- are passed on to flarebirdbuild on the remote. +flarebirdbuild in turn supports passing arguments on to makechrootpkg, which in turn supports passing options to makepkg. Since each uses -- to delimit options that are forwarded, make sure to escape them properly: - `offload-build offload-args -- archbuild-args -- makechrootpkg-args -- makepkg-args` + `offload-build offload-args -- flarebirdbuild-args -- makechrootpkg-args -- makepkg-args` Example: To use a second `testing-x86_64-build` instance with another copydir: diff --git a/doc/man/pkgctl-build.1.asciidoc b/doc/man/pkgctl-build.1.asciidoc index 6b90806..749e626 100644 --- a/doc/man/pkgctl-build.1.asciidoc +++ b/doc/man/pkgctl-build.1.asciidoc @@ -15,7 +15,7 @@ Description Build packages in clean chroot environment, offering various options and functionalities to customize the package building process. -By default, chroot environments are located in '/var/lib/archbuild/'. +By default, chroot environments are located in '/var/lib/flarebirdbuild/'. Build Options ------------- diff --git a/src/commitpkg.in b/src/commitpkg.in index deb02be..9e927e9 100644 --- a/src/commitpkg.in +++ b/src/commitpkg.in @@ -152,10 +152,10 @@ fi server=${PACKAGING_REPO_RELEASE_HOST} rsyncopts=("${RSYNC_OPTS[@]}" --perms --chmod='ug=rw,o=r') -archreleaseopts=() +flarebirdreleaseopts=() while getopts ':l:a:s:f' flag; do case $flag in - f) archreleaseopts+=('-f') ;; + f) flarebirdreleaseopts+=('-f') ;; s) server=$OPTARG ;; l) rsyncopts+=("--bwlimit=$OPTARG") ;; a) commit_arch=$OPTARG ;; @@ -282,7 +282,7 @@ for _arch in "${arch[@]}"; do done if [[ ${#commit_arches[*]} -gt 0 ]]; then - archrelease "${archreleaseopts[@]}" "${commit_arches[@]/#/$repo-}" || die + flarebirdrelease "${flarebirdreleaseopts[@]}" "${commit_arches[@]/#/$repo-}" || die fi if [[ ${#uploads[*]} -gt 0 ]]; then diff --git a/src/arch-nspawn.in b/src/flarebird-nspawn.in similarity index 95% rename from src/arch-nspawn.in rename to src/flarebird-nspawn.in index 6bcafa5..9d9e9f9 100644 --- a/src/arch-nspawn.in +++ b/src/flarebird-nspawn.in @@ -59,10 +59,10 @@ shift 1 nspawn_args=( --quiet --directory="$working_dir" - --setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" + --setenv="PATH=/usr/sbin:/usr/bin" --register=no --slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")" - --machine="arch-nspawn-$$" + --machine="flarebird-nspawn-$$" --as-pid2 --console=autopipe --timezone=off @@ -129,9 +129,9 @@ copy_hostconf () { umask 0022 # Sanity check -if [[ ! -f "$working_dir/.arch-chroot" ]]; then +if [[ ! -f "$working_dir/.flarebird-chroot" ]]; then die "'%s' does not appear to be an Arch chroot." "$working_dir" -elif [[ $(cat "$working_dir/.arch-chroot") != "$CHROOT_VERSION" ]]; then +elif [[ $(cat "$working_dir/.flarebird-chroot") != "$CHROOT_VERSION" ]]; then die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$CHROOT_VERSION" fi diff --git a/src/archbuild.in b/src/flarebirdbuild.in similarity index 97% rename from src/archbuild.in rename to src/flarebirdbuild.in index 2f3faf9..859ba05 100644 --- a/src/archbuild.in +++ b/src/flarebirdbuild.in @@ -43,7 +43,7 @@ for arch_mount in "${arch_mounts[@]}"; do fi done -chroots='/var/lib/archbuild' +chroots='/var/lib/flarebirdbuild' clean_first=false pacman_config="@pkgdatadir@/pacman.conf.d/${repo}.conf" @@ -95,14 +95,14 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" (umask 0022; mkdir -p "${chroots}/${repo}-${arch}") - setarch "${set_arch}" mkarchroot \ + setarch "${set_arch}" mkflarebirdroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ "${chroots}/${repo}-${arch}/root" \ "${base_packages[@]}" || abort else lock 9 "${chroots}/${repo}-${arch}/root.lock" "Locking clean chroot" - arch-nspawn \ + flarebird-nspawn \ -C "${pacman_config}" \ -M "${makepkg_config}" \ "${chroots}/${repo}-${arch}/root" \ diff --git a/src/archrelease.in b/src/flarebirdrelease.in similarity index 94% rename from src/archrelease.in rename to src/flarebirdrelease.in index 84aed28..aa0040a 100644 --- a/src/archrelease.in +++ b/src/flarebirdrelease.in @@ -28,7 +28,7 @@ done shift $(( OPTIND - 1 )) if ! (( $# )); then - echo 'Usage: archrelease [-f] ...' + echo 'Usage: flarebirdrelease [-f] ...' exit 1 fi @@ -36,13 +36,13 @@ fi if [[ -z $FORCE ]]; then for tag in "$@"; do if ! in_array "$tag" "${DEVTOOLS_VALID_TAGS[@]}"; then - die "archrelease: Invalid tag: '%s' (use -f to force release)" "$tag" + die "flarebirdrelease: Invalid tag: '%s' (use -f to force release)" "$tag" fi done fi if [[ ! -f PKGBUILD ]]; then - die 'archrelease: PKGBUILD not found' + die 'flarebirdrelease: PKGBUILD not found' fi # shellcheck source=contrib/makepkg/PKGBUILD.proto diff --git a/src/lddd.in b/src/lddd.in index 80c22c4..886fe6c 100644 --- a/src/lddd.in +++ b/src/lddd.in @@ -12,7 +12,7 @@ source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh ifs=$IFS IFS="${IFS}:" -libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)" +libdirs="/lib64 /usr/lib64 /usr/local/lib64 $(cat /etc/ld.so.conf.d/*)" extras= TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX) diff --git a/src/makechrootpkg.in b/src/makechrootpkg.in index e7cbc9c..5e346b9 100644 --- a/src/makechrootpkg.in +++ b/src/makechrootpkg.in @@ -57,7 +57,7 @@ usage() { echo '' echo 'The chroot "root" directory must be created via the following' echo 'command:' - echo ' mkarchroot /root base-devel' + echo ' mkflarebirdroot /root base-devel' echo '' echo 'This script reads {SRC,SRCPKG,PKG,LOG}DEST, MAKEFLAGS and PACKAGER' echo 'from makepkg.conf(5), if those variables are not part of the' @@ -150,7 +150,7 @@ install_packages() { pkgnames=("${install_pkgs[@]##*/}") cp -- "${install_pkgs[@]}" "$copydir/root/" - arch-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \ + flarebird-nspawn "$copydir" "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \ pacman -U --noconfirm --ask=4 -- "${pkgnames[@]/#//root/}" ret=$? rm -- "${pkgnames[@]/#/$copydir/root/}" @@ -321,7 +321,7 @@ check_root SOURCE_DATE_EPOCH,BUILDTOOL,BUILDTOOLVER,GNUPGHOME,SRCDEST,SRCPKGDEST # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") [[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir" -[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir" +[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkflarebirdroot %s/root base-devel" "$chrootdir" if [[ ${copy:0:1} = / ]]; then copydir=$copy @@ -367,7 +367,7 @@ if [[ ! -d $copydir ]] || (( clean_first )); then sync_chroot "$chrootdir" "$copydir" "$copy" fi -(( update_first )) && arch-nspawn "$copydir" \ +(( update_first )) && flarebird-nspawn "$copydir" \ "${bindmounts_ro[@]}" "${bindmounts_rw[@]}" "${bindmounts_tmpfs[@]}" \ pacman -Syuu --noconfirm @@ -396,7 +396,7 @@ nspawn_build_args=( "${bindmounts_tmpfs[@]}" ) -if arch-nspawn "$copydir" \ +if flarebird-nspawn "$copydir" \ "${nspawn_build_args[@]}" \ /chrootbuild "${makepkg_args[@]}" then @@ -413,7 +413,7 @@ if [[ $inspect == always ]] || ( [[ $inspect == failure ]] && (( ret != 0 )) ); else error "Build failed, inspecting %s" "$copydir" fi - arch-nspawn "$copydir" \ + flarebird-nspawn "$copydir" \ "${nspawn_build_args[@]}" \ --user=builduser \ --chdir=/build @@ -444,7 +444,7 @@ else for remotepkg in "${remotepkgs[@]}"; do if [[ $remotepkg != file://* ]]; then msg2 "Downloading current versions" - arch-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}" + flarebird-nspawn "$copydir" pacman --noconfirm -Swdd "${pkgnames[@]}" mapfile -t remotepkgs < <(pacman --config "$copydir"/etc/pacman.conf \ --dbpath "$copydir"/var/lib/pacman \ -Sddp "${pkgnames[@]}") diff --git a/src/makerepropkg.in b/src/makerepropkg.in index a31f8d5..293cd6e 100644 --- a/src/makerepropkg.in +++ b/src/makerepropkg.in @@ -20,7 +20,7 @@ declare -A buildinfo declare -a buildenv buildopts installed installpkgs archiveurl='https://archive.archlinux.org/packages' -buildroot=/var/lib/archbuild/reproducible +buildroot=/var/lib/flarebirdbuild/reproducible diffoscope=0 makepkg_options=() @@ -238,7 +238,7 @@ else warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback" makepkg_conf=@pkgdatadir@/makepkg.conf.d/${CARCH}.conf fi -printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1 +printf '%s\n' "${allpkgfiles[@]}" | mkflarebirdroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1 # use makechrootpkg to prep the build directory makechrootpkg -r "${namespace}" -l build -- --packagelist || exit 1 @@ -254,7 +254,7 @@ makechrootpkg -r "${namespace}" -l build -- --packagelist || exit 1 install -d -o "${SUDO_UID:-$UID}" -g "$(id -g "${SUDO_UID:-$UID}")" "${namespace}/build/${BUILDDIR}" # kick off the build -arch-nspawn "${namespace}/build" \ +flarebird-nspawn "${namespace}/build" \ --bind="${PWD}:/startdir" \ --bind="${SRCDEST}:/srcdest" \ /chrootbuild -C --noconfirm --log --holdver --skipinteg "${makepkg_options[@]}" diff --git a/src/mkarchroot.in b/src/mkflarebirdroot.in similarity index 93% rename from src/mkarchroot.in rename to src/mkflarebirdroot.in index 06cf5d2..57754b8 100644 --- a/src/mkarchroot.in +++ b/src/mkflarebirdroot.in @@ -94,12 +94,11 @@ done unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' -printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" echo 'LANG=C.UTF-8' > "$working_dir/etc/locale.conf" -echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" +echo "$CHROOT_VERSION" > "$working_dir/.flarebird-chroot" systemd-machine-id-setup --root="$working_dir" -exec arch-nspawn \ +exec flarebird-nspawn \ "${nspawn_args[@]}" \ - "$working_dir" locale-gen + "$working_dir" diff --git a/src/offload-build.in b/src/offload-build.in index 45b5ee8..4cdc440 100644 --- a/src/offload-build.in +++ b/src/offload-build.in @@ -29,8 +29,8 @@ usage() { Usage: ${BASH_SOURCE[0]##*/} [--repo REPO] [--arch ARCHITECTURE] [--server SERVER] -- [ARCHBUILD_ARGS] Build a PKGBUILD on a remote server using makechrootpkg. Requires a remote user - that can run archbuild without password auth. Options passed after a -- are - passed on to archbuild, and eventually to makechrootpkg. + that can run flarebirdbuild without password auth. Options passed after a -- are + passed on to flarebirdbuild, and eventually to makechrootpkg. OPTIONS -r, --repo Build against a specific repository (current: $repo) @@ -70,12 +70,12 @@ while (( $# )); do done # multilib must be handled specially -archbuild_arch="${arch}" +flarebirdbuild_arch="${arch}" if [[ $repo = multilib* ]]; then - archbuild_arch= + flarebirdbuild_arch= fi -archbuild_cmd=("${repo}${archbuild_arch:+-$archbuild_arch}-build" "$@") +flarebirdbuild_cmd=("${repo}${flarebirdbuild_arch:+-$flarebirdbuild_arch}-build" "$@") [[ -z ${WORKDIR:-} ]] && setup_workdir export TEMPDIR=$(mktemp --tmpdir="${WORKDIR}" --directory offload-build.XXXXXXXXXX) @@ -112,9 +112,9 @@ msg "Extracting srcpkg" ssh "${SSH_OPTS[@]}" -- "$server" "cd ${remote_temp@Q} && bsdtar --strip-components 1 -xvf $(basename "$srcpkg")" || die # Run the build command on the server -msg "Running archbuild" +msg "Running flarebirdbuild" # shellcheck disable=SC2145 -if ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${archbuild_cmd[@]@Q}"; then +if ssh "${SSH_OPTS[@]}" -t -- "$server" "cd ${remote_temp@Q} && export LOGDEST="" && ${flarebirdbuild_cmd[@]@Q}"; then msg "Build complete" # Get an array of files that should be downloaded from the server