Found the fix, added to the Makefile

parent b399b62f
......@@ -10,10 +10,10 @@
# You need live-build package installed and superuser privileges.
BUILDTYPE=$$(cat buildtype)
BASEIMG=parrotsec-$(BUILDTYPE)-armhf-rpi
BUILD_NUMBER_DATE=$$(date +'%Y%m%d')
BUILD_NUMBER_FILE=build_num.txt
BUILD_NUMBER_FILE=build_num
BUILD_NUMBER=$$(cat $(BUILD_NUMBER_FILE))
BASEIMG=parrotsec-$(BUILDTYPE)-armhf-rpi
IMAGEPREFIX=$(BASEIMG)-$(BUILD_NUMBER)
LOGFILE=$(IMAGEPREFIX).build-log.txt
LOGFILEIMG=$(IMAGEPREFIX).build-log-img.txt
......@@ -69,7 +69,7 @@ all_gitlabci:
./keyring-updater.sh
set -e; taskset 0x1 sudo lb build 2>&1 | tee $(LOGFILE)
if [ -f live-image-armhf.tar.tar.gz ]; then \
tar -jcf $(CONFIGFILE) auto/ config/ configure_gitlabCI; \
tar -jcf $(CONFIGFILE) auto/ config/ configure; \
sudo mv live-image-armhf.contents $(LISTFILE); \
sudo mv chroot.files $(CHROOTFILE); \
sudo mv chroot.packages.install $(PKGSFILE); \
......@@ -118,23 +118,24 @@ clean:
clean1:
sudo lb clean --purge
rm -f $(BASEIMG)-*
rm -rf config
rm -rf .build
rm -f buildnum.txt
rm -f $(BASEIMG)-*; true
rm -rf config; true
rm -rf .build; true
rm -f buildnum.txt; true
rm -rf ~/tools; true
if [ -d parrotsec-rpi ]; then \
sudo umount -l parrotsec-rpi/*; true; \
sudo dmsetup remove_all; \
sudo rm -rf parrotsec-rpi; \
sudo rm -rf firmware-master; true; \
sudo rm -rf rpi-firmware; true; \
fi
if [ -f $(IMAGENAME) ]; then \
rm -f $(IMAGENAME)*; \
sudo umount -l parrotsec-rpi/*; true; \
sudo dmsetup remove_all; \
sudo rm -rf parrotsec-rpi firmware-master; \
sudo rm -rf parrotsec-rpi rpi-firmware; \
fi
write-image:
......
......@@ -23,7 +23,7 @@ rm -f /etc/machine-id || true
systemctl enable ntpsec.service
# Clean apt cache and remove orphaned packages
apt -y purge *mesa* *xorg* *lightdm* *xserver* *egl* *mesa* *opengl*
apt -y purge firejail *mesa* *xorg* *lightdm* *xserver* *egl* *mesa* *opengl*
apt -y autoremove
apt -y install sudo
apt -y clean
......
......@@ -23,7 +23,9 @@ rm -f /etc/machine-id || true
systemctl enable ntpsec.service
# Clean apt cache and remove orphaned packages
apt -y purge firejail
apt -y clean
apt -y purge firejail
apt -y autoremove
# Set graphical the default target
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment