ugh.
This commit is contained in:
parent
7c6bc3a8c3
commit
0c19a797fd
@ -24,6 +24,6 @@ if __name__ == '__main__':
|
|||||||
prep.postChroot(conf['build'])
|
prep.postChroot(conf['build'])
|
||||||
build.genImg(conf['build'], conf['bdisk'])
|
build.genImg(conf['build'], conf['bdisk'])
|
||||||
build.genUEFI(conf['build'], conf['bdisk'])
|
build.genUEFI(conf['build'], conf['bdisk'])
|
||||||
fulliso = build.geniso(conf)
|
fulliso = build.genISO(conf)
|
||||||
build.displayStats(fulliso)
|
build.displayStats(fulliso)
|
||||||
print('Finished successfully at {0}.'.format(datetime.datetime.now()))
|
print('Finished successfully at {0}.'.format(datetime.datetime.now()))
|
||||||
|
@ -177,12 +177,12 @@ def prepChroot(build, bdisk, user):
|
|||||||
# v2.51-gb3bb039:3
|
# v2.51-gb3bb039:3
|
||||||
if os.path.isfile(dlpath + '/buildnum'):
|
if os.path.isfile(dlpath + '/buildnum'):
|
||||||
with open(dlpath + '/buildnum', 'r') as f:
|
with open(dlpath + '/buildnum', 'r') as f:
|
||||||
build['buildnum'] = int(f.readlines())
|
build['buildnum'] = int(f.readlines()[0])
|
||||||
else:
|
else:
|
||||||
build['buildnum'] = 0
|
build['buildnum'] = 0
|
||||||
build['buildnum'] += 1
|
build['buildnum'] += 1
|
||||||
with open(dlpath + '/buildnum', 'w+') as f:
|
with open(dlpath + '/buildnum', 'w+') as f:
|
||||||
f.write(build['buildnum'])
|
f.write(str(build['buildnum']))
|
||||||
# and now that we have that dict, let's write out the VERSION_INFO.txt file.
|
# and now that we have that dict, let's write out the VERSION_INFO.txt file.
|
||||||
loader = jinja2.FileSystemLoader(templates_dir)
|
loader = jinja2.FileSystemLoader(templates_dir)
|
||||||
env = jinja2.Environment(loader = loader)
|
env = jinja2.Environment(loader = loader)
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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++'
|
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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++'
|
|
||||||
|
@ -1,9 +1,5 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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,9 +1,5 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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
|
||||||
@ -24,7 +20,7 @@ bin86
|
|||||||
bind-tools
|
bind-tools
|
||||||
binutils
|
binutils
|
||||||
bluez-utils
|
bluez-utils
|
||||||
bonnie\\+\\+
|
#bonnie++ ## TODO: ugh. apacman has a new "regex mode"... that you can't disable. https://github.com/oshazard/apacman/issues/79
|
||||||
boxbackup-client
|
boxbackup-client
|
||||||
boxbackup-server
|
boxbackup-server
|
||||||
bozocrack-git
|
bozocrack-git
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
source /etc/bashrc
|
source /etc/bash.bashrc
|
||||||
source /root/.bashrc
|
|
||||||
|
|
||||||
# we need this fix before anything.
|
# we need this fix before anything.
|
||||||
dirmngr </dev/null > /dev/null 2>&1
|
dirmngr </dev/null > /dev/null 2>&1
|
||||||
@ -57,7 +56,7 @@ cleanPacorigs
|
|||||||
# Install multilib-devel if we're in an x86_64 chroot.
|
# Install multilib-devel if we're in an x86_64 chroot.
|
||||||
if $(egrep -q '^\[multilib' /etc/pacman.conf);
|
if $(egrep -q '^\[multilib' /etc/pacman.conf);
|
||||||
then
|
then
|
||||||
pacman --noconfirm -R gcc-libs libtool
|
pacman --noconfirm -Rdd gcc gcc-libs libtool
|
||||||
pacman --noconfirm -S --needed multilib-devel
|
pacman --noconfirm -S --needed multilib-devel
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
TGT_ARCH='x86_64'
|
TGT_ARCH='x86_64'
|
||||||
@ -86,7 +85,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
|
||||||
mv /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
|
mv -f /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
|
|
||||||
# And install EXTRA functionality packages, if there are any.
|
# And install EXTRA functionality packages, if there are any.
|
||||||
@ -126,7 +125,7 @@ else
|
|||||||
usermod -L root
|
usermod -L root
|
||||||
fi
|
fi
|
||||||
cleanPacorigs
|
cleanPacorigs
|
||||||
mv /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
|
mv -f /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}" ]];
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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++'
|
|
||||||
|
@ -1,6 +1,2 @@
|
|||||||
# Commented lines are supported (via a preceding # only).
|
# Commented lines are supported (via a preceding # only).
|
||||||
# Packages from the AUR can be specified.
|
# 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