comments for the package lists helps. also, updating bundled apacman version
This commit is contained in:
parent
4b4cbd0f63
commit
6f3e812d35
14
.gitignore
vendored
14
.gitignore
vendored
@ -22,13 +22,13 @@
|
|||||||
/extrasrc
|
/extrasrc
|
||||||
|
|
||||||
# You should really generate local copies of these, as they're pretty private.
|
# You should really generate local copies of these, as they're pretty private.
|
||||||
extra/pre-build.d/etc/openvpn/client.conf
|
**/etc/openvpn
|
||||||
overlay/etc/ssh/*
|
**/etc/ssh
|
||||||
overlay/home/*
|
**/home
|
||||||
overlay/etc/systemd/system/multi-user.target.wants/openvpn@client.service
|
etc/systemd/system/multi-user.target.wants/openvpn@client.service
|
||||||
ssl/
|
**ssl/
|
||||||
!ssl/.keepme
|
!**ssl/.keepme
|
||||||
!ssl/openssl.cnf
|
!**ssl/openssl.cnf
|
||||||
|
|
||||||
# and we DEFINITELY don't need these.
|
# and we DEFINITELY don't need these.
|
||||||
__pycache__/
|
__pycache__/
|
||||||
|
@ -179,9 +179,14 @@ def prepChroot(build, bdisk):
|
|||||||
tpl = env.get_template('VERSION_INFO.txt.j2')
|
tpl = env.get_template('VERSION_INFO.txt.j2')
|
||||||
tpl_out = tpl.render(build = build, bdisk = bdisk, hostname = host.getHostname())
|
tpl_out = tpl.render(build = build, bdisk = bdisk, hostname = host.getHostname())
|
||||||
for a in arch:
|
for a in arch:
|
||||||
with open('{0}/root.{1}/root/VERSION_INFO.txt'.format(chrootdir, a), "w+") as f:
|
with open('{0}/root.{1}/root/VERSION_INFO.txt'.format(chrootdir, a), 'w+') as f:
|
||||||
f.write(tpl_out)
|
f.write(tpl_out)
|
||||||
with open(tempdir + '/VERSION_INFO.txt', "w+") as f:
|
with open(tempdir + '/VERSION_INFO.txt', 'w+') as f:
|
||||||
|
f.write(tpl_out)
|
||||||
|
tpl = env.get_template('VARS.txt.j2')
|
||||||
|
tpl_out = tpl.render(bdisk = bdisk)
|
||||||
|
for a in arch:
|
||||||
|
with open('{0}/root.{1}/root/VARS.txt'.format(chrootdir, a), 'w+') as f:
|
||||||
f.write(tpl_out)
|
f.write(tpl_out)
|
||||||
return(build)
|
return(build)
|
||||||
|
|
||||||
|
@ -11,10 +11,11 @@
|
|||||||
#buildonly=1
|
#buildonly=1
|
||||||
#cachevcs=1
|
#cachevcs=1
|
||||||
#ignorearch=1
|
#ignorearch=1
|
||||||
#keepkeys=1
|
keepkeys=1
|
||||||
needed=1
|
needed=1
|
||||||
#noaur=1
|
#noaur=1
|
||||||
noconfirm=1
|
noconfirm=1
|
||||||
|
nodatabase=1
|
||||||
noedit=1
|
noedit=1
|
||||||
nofail=1
|
nofail=1
|
||||||
#preview=1
|
#preview=1
|
||||||
@ -37,6 +38,10 @@ skipcache=1
|
|||||||
#pacmanconf="/etc/pacman.conf"
|
#pacmanconf="/etc/pacman.conf"
|
||||||
#downdir="/var/cache/pacman/pkg"
|
#downdir="/var/cache/pacman/pkg"
|
||||||
#savedir="/var/cache/apacman/pkg"
|
#savedir="/var/cache/apacman/pkg"
|
||||||
|
#database="/var/lib/apacman"
|
||||||
|
#pacmandb="/var/lib/pacman/sync/aur.db"
|
||||||
|
#pkgfiledb="/var/cache/pkgfile/aur.files"
|
||||||
|
#localrepo="aur"
|
||||||
#editor="nano -w"
|
#editor="nano -w"
|
||||||
#pager="less -R"
|
#pager="less -R"
|
||||||
#RPCURL="https://aur.archlinux.org/rpc.php?type"
|
#RPCURL="https://aur.archlinux.org/rpc.php?type"
|
||||||
@ -55,4 +60,3 @@ skipcache=1
|
|||||||
#COLOR5='\e[1;34m'
|
#COLOR5='\e[1;34m'
|
||||||
#COLOR6='\e[1;33m'
|
#COLOR6='\e[1;33m'
|
||||||
#COLOR7='\e[1;31m'
|
#COLOR7='\e[1;31m'
|
||||||
|
|
||||||
|
@ -1 +1,6 @@
|
|||||||
# This can be used for 32-bit only packages
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
Binary file not shown.
BIN
extra/pre-build.d/root/apacman-3.1-1-any.pkg.tar.xz
Normal file
BIN
extra/pre-build.d/root/apacman-3.1-1-any.pkg.tar.xz
Normal file
Binary file not shown.
@ -1,3 +1,9 @@
|
|||||||
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
||||||
arch-install-scripts
|
arch-install-scripts
|
||||||
archiso
|
archiso
|
||||||
bzip2
|
bzip2
|
||||||
|
@ -1,4 +1,9 @@
|
|||||||
# You can include comments, such as this. AUR packages are allowed.
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
||||||
# We need to install all X drivers.
|
# We need to install all X drivers.
|
||||||
abs
|
abs
|
||||||
acpi
|
acpi
|
||||||
@ -19,7 +24,7 @@ bin86
|
|||||||
bind-tools
|
bind-tools
|
||||||
binutils
|
binutils
|
||||||
bluez-utils
|
bluez-utils
|
||||||
bonnie++
|
bonnie\\+\\+
|
||||||
boxbackup-client
|
boxbackup-client
|
||||||
boxbackup-server
|
boxbackup-server
|
||||||
bozocrack-git
|
bozocrack-git
|
||||||
|
@ -48,7 +48,7 @@ pacman -S --noconfirm --needed base syslinux wget rsync unzip jshon sed sudo abs
|
|||||||
# And get rid of files it wants to replace
|
# And get rid of files it wants to replace
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
# Force update all currently installed packages in case the tarball's out of date
|
# Force update all currently installed packages in case the tarball's out of date
|
||||||
pacman -Syyu --force --noconfirm
|
pacman -Su --force --noconfirm
|
||||||
# And in case the keys updated...
|
# And in case the keys updated...
|
||||||
pacman-key --refresh-keys
|
pacman-key --refresh-keys
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
@ -60,6 +60,7 @@ pacman --noconfirm -U /root/apacman*.tar.xz &&\
|
|||||||
mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman &&\
|
mkdir /var/tmp/apacman && chmod 0750 /var/tmp/apacman &&\
|
||||||
chown root:aurbuild /var/tmp/apacman
|
chown root:aurbuild /var/tmp/apacman
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
|
apacman -Syy
|
||||||
apacman -S --noconfirm --noedit --skipinteg --needed -S apacman apacman-deps apacman-utils expac
|
apacman -S --noconfirm --noedit --skipinteg --needed -S apacman apacman-deps apacman-utils expac
|
||||||
apacman --gendb
|
apacman --gendb
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
@ -95,8 +96,7 @@ ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so
|
|||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
apacman --noconfirm --noedit --skipinteg -S --needed linux
|
apacman --noconfirm --noedit --skipinteg -S --needed linux
|
||||||
apacman --gendb
|
apacman --gendb
|
||||||
cp -a /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
|
mv /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
|
||||||
cp -af /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
|
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
|
|
||||||
# And install EXTRA functionality packages, if there are any.
|
# And install EXTRA functionality packages, if there are any.
|
||||||
@ -136,7 +136,7 @@ else
|
|||||||
usermod -L root
|
usermod -L root
|
||||||
fi
|
fi
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
cp -af /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
|
mv /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
|
||||||
# And install arch-specific extra packages, if there are any.
|
# And install arch-specific extra packages, if there are any.
|
||||||
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.arch | tr '\n' ' ')
|
PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.arch | tr '\n' ' ')
|
||||||
if [[ -n "${PKGLIST}" ]];
|
if [[ -n "${PKGLIST}" ]];
|
||||||
@ -146,8 +146,11 @@ then
|
|||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
fi
|
fi
|
||||||
# Cleanup
|
# Cleanup
|
||||||
yes | pacman -Scc
|
#yes | pacman -Scc # doesn't parse yes(1) output correctly, it seems.
|
||||||
|
# TODO: look into https://wiki.archlinux.org/index.php/Pacman/Tips_and_tricks#Removing_unused_packages_.28orphans.29
|
||||||
|
paccache -rk0
|
||||||
rm -f /root/.bash_history
|
rm -f /root/.bash_history
|
||||||
rm -f /root/.viminfo
|
rm -f /root/.viminfo
|
||||||
rm -f /root/apacman-*.pkg.tar.xz
|
rm -f /root/apacman-*.pkg.tar.xz
|
||||||
rm -f /root/pre-build.sh
|
rm -f /root/pre-build.sh
|
||||||
|
pkill -9 dirmngr
|
||||||
|
@ -1 +1,6 @@
|
|||||||
# This can be used for 64-bit only packages
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
# Commented lines are supported (via a preceding # only).
|
||||||
|
# Packages from the AUR can be specified.
|
||||||
|
# If you require a package with a regex special character in the name
|
||||||
|
# (i.e.: .\?+[]{} etc.)
|
||||||
|
# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
|
||||||
|
# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
|
Loading…
Reference in New Issue
Block a user