mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix installed packages
This commit is contained in:
parent
f614f1e445
commit
db534a1e76
3 changed files with 6 additions and 6 deletions
|
@ -18,4 +18,6 @@ for i in $(cat packages.txt); do
|
||||||
pacman -S ${i} --noconfirm --overwrite '*'
|
pacman -S ${i} --noconfirm --overwrite '*'
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
# remove false positives
|
||||||
|
grep -v "linux-firmware-marvell pambase pacman-mirrorlist licenses" uninstalled.txt >uninstalled.txt
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
# vim: set ft=sh ts=4 sw=4 et:
|
||||||
|
|
|
@ -155,10 +155,11 @@ if ! [[ -e "/.vconsole-run" ]]; then
|
||||||
fi
|
fi
|
||||||
if ! [[ -e "/.clean-pacman-db" ]]; then
|
if ! [[ -e "/.clean-pacman-db" ]]; then
|
||||||
touch /.clean-pacman-db
|
touch /.clean-pacman-db
|
||||||
_RM_PACMAN_DB="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell \
|
_RM_PACMAN_DB="base grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell \
|
||||||
libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
|
libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
|
||||||
libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap mtools \
|
libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap memtest86+ \
|
||||||
libsysprof-capture libnsl libksba gdbm binutils cdrtools systemd-ukify"
|
memtest86+-efi mkinitcpio-busybox mtools libsysprof-capture libnsl libksba gdbm binutils \
|
||||||
|
cdrtools systemd-ukify python python-pe"
|
||||||
for i in ${_RM_PACMAN_DB}; do
|
for i in ${_RM_PACMAN_DB}; do
|
||||||
rm -rf /var/lib/pacman/local/"${i}"-[0-9]* &>/dev/null
|
rm -rf /var/lib/pacman/local/"${i}"-[0-9]* &>/dev/null
|
||||||
done
|
done
|
||||||
|
|
|
@ -214,9 +214,6 @@ build ()
|
||||||
add_file /usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit
|
add_file /usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit
|
||||||
add_file /usr/share/p11-kit/modules/p11-kit-trust.module
|
add_file /usr/share/p11-kit/modules/p11-kit-trust.module
|
||||||
|
|
||||||
### add secure boot MOK
|
|
||||||
add_full_dir /usr/share/archboot/keys
|
|
||||||
|
|
||||||
### remove conflicting mkinitcpio files and grub
|
### remove conflicting mkinitcpio files and grub
|
||||||
rm ${BUILDROOT}/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service \
|
rm ${BUILDROOT}/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service \
|
||||||
${BUILDROOT}/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service \
|
${BUILDROOT}/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service \
|
||||||
|
|
Loading…
Reference in a new issue