diff --git a/fresh-install/main.sh b/fresh-install/main.sh index c78ece0..db7cb78 100755 --- a/fresh-install/main.sh +++ b/fresh-install/main.sh @@ -213,19 +213,22 @@ pacman_packages=( lldb ocaml ocaml-ctypes - ocaml-findlib - python-myst-parser - lua53 - z3 - ocaml-stdlib-shims - llvm - patchutils - python-httplib2 python-pyparsing ffmpeg lua52 cabextract mingw-w64-gcc + lib32-gst-plugins-base-libs + lib32-gnutls + lib32-gmp + lib32-libcups + lib32-libpulse + lib32-libxcomposite + lib32-libxinerama + lib32-opencl-icd-loader + lib32-pcsclite + lib32-sdl2 + samba ) for pkg in "${pacman_packages[@]}"; do @@ -504,23 +507,11 @@ aur_packages=( # "https://aur.archlinux.org/mpv-git.git mpv-git" "https://aur.archlinux.org/unzrip-git.git unzrip-git" "https://aur.archlinux.org/python-vdf.git python-vdf" - - "https://aur.archlinux.org/lib32-gmp-git.git lib32-gmp-git" - "https://aur.archlinux.org/lib32-nettle-git.git lib32-nettle-git" - "https://aur.archlinux.org/lib32-gnutls-git lib32-gnutls-git" - "https://aur.archlinux.org/lib32-gst-plugins-base-libs-git lib32-gst-plugins-base-libs-git" - "https://aur.archlinux.org/lib32-libcups-git lib32-libcups-git" - "https://aur.archlinux.org/lib32-libpulse-git lib32-libpulse-git" - "https://aur.archlinux.org/lib32-libxcomposite-git lib32-libxcomposite-git" - "https://aur.archlinux.org/lib32-libxcomposite-git lib32-libxcomposite-git" - "https://aur.archlinux.org/lib32-libxinerama-git lib32-libxinerama-git" - "https://aur.archlinux.org/lib32-opencl-icd-loader-git lib32-opencl-icd-loader-git" - "https://aur.archlinux.org/lib32-pcsclite-git lib32-pcsclite-git" - "https://aur.archlinux.org/samba-git samba-git" - "https://aur.archlinux.org/sane-git sane-git" - "https://aur.archlinux.org/lib32-sdl2-git lib32-sdl2-git" - "https://aur.archlinux.org/unixodbc-git unixodbc-git" - "https://aur.archlinux.org/lib32-v4l-utils-git lib32-v4l-utils-git" + "https://aur.archlinux.org/lib32-gmp-hg.git lib32-gmp" + "https://aur.archlinux.org/sane-git.git sane-git" + #"https://aur.archlinux.org/lib32-sdl2-git.git lib32-sdl2-git" + "https://aur.archlinux.org/unixodbc-git.git unixodbc-git" + "https://aur.archlinux.org/lib32-v4l-utils-git.git lib32-v4l-utils-git" "https://aur.archlinux.org/wine-git.git wine-git" "https://aur.archlinux.org/winetricks-git.git winetricks-git" @@ -535,6 +526,7 @@ aur_packages=( "https://aur.archlinux.org/deluge-git.git deluge-git" "https://aur.archlinux.org/nvm-git.git nvm-git" "https://aur.archlinux.org/unityhub-beta.git unityhub-beta" + "https://aur.archlinux.org/keepassxc-git.git keepassxc-git" ) for pkg in "${aur_packages[@]}"; do diff --git a/fresh-install/makepkg.conf b/fresh-install/makepkg.conf new file mode 100644 index 0000000..ac4c95f --- /dev/null +++ b/fresh-install/makepkg.conf @@ -0,0 +1,167 @@ +#!/hint/bash +# shellcheck disable=2034 + +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -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::breezy' + 'fossil::fossil' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="x86_64" +CHOST="x86_64-pc-linux-gnu" + +#-- Compiler and Linker Flags +#CPPFLAGS="" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" +CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" +LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \ + -Wl,-z,pack-relative-relocs" +LTOFLAGS="-flto=auto" +RUSTFLAGS="-Cforce-frame-pointers=yes" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" +#-- Debugging flags +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="-C debuginfo=2" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- 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 +######################################################################### +# +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- 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 +#-- debug: Add debugging flags as specified in DEBUG_* variables +#-- lto: Add compile flags for building with link time optimization +#-- autodeps: Automatically add depends/provides +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto) + +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 +INTEGRITY_CHECK=(sha256) +#-- 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) +#-- Directory to store source code in for debug packages +DBGSRCDIR="/usr/src/debug" +#-- Prefix and directories for library autodeps +LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# 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 " +#-- Specify a key to use for package signing +#GPGKEY="" + +######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSZST=(zstd -c -T0 --ultra -20 -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) +COMPRESSLZ4=(lz4 -q) +COMPRESSLZ=(lzip -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +PKGEXT='.pkg.tar.zst' +SRCEXT='.src.tar.gz' + +######################################################################### +# OTHER +######################################################################### +# +#-- Command used to run pacman as root, instead of trying sudo and su +#PACMAN_AUTH=() +# vim: set ft=sh ts=2 sw=2 et: