Commit a1e0bd3e authored by Francesco Bonanno's avatar Francesco Bonanno

Trying new conf for building, GUI packages are now working

parent 2006afb2
# image: amd64/debian
image: amd64/debian
before_script:
# - echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; }' >> /etc/apt/apt.conf.d/proxy
- echo 'Acquire::http { Proxy "http://172.17.0.1:3142"; }' >> /etc/apt/apt.conf.d/proxy
- apt update
- apt install -y sudo make build-essential autoconf automake autogen live-build tar gzip xz-utils gdisk unzip wget kpartx lvm2 dosfstools coreutils parted xfsprogs wget binutils tar git parted bc multiarch-support qemu-user qemu-user-static binfmt-support gcc-arm-linux-gnueabihf kmod bison flex libssl-dev util-linux rsync dmsetup
- mkdir keyring && cd keyring && wget -r -np --tries=10 -A .deb "http://archive.parrotsec.org/parrot/pool/main/p/parrot-archive-keyring/" && dpkg --force-all -i archive.parrotsec.org/parrot/pool/main/p/parrot-archive-keyring/parrot-archive-keyring*.deb && cd .. && rm -rf keyring
......@@ -9,9 +9,9 @@ before_script:
- apt download live-build debootstrap && dpkg --force-all -i live-build*.deb debootstrap*.deb
- rm -r /etc/apt/sources.list.d/parrot.list && apt update
build:
script: make clean && ./configure_gitlabCI && make all -j8
script: make clean && ./configure_gitlabCI && make all_gitlabci -j8
artifacts:
paths:
- parrotsec-*rpi*
- parrotsec-*rpi*.tar.xz
expire_in: 3 months
......@@ -62,7 +62,7 @@ all:
exit 1; \
fi
# Used only in arm64v8 gitlab CI Debian container
# Used in gitlab CI Debian container
all_gitlabci:
echo $(BUILD_NUMBER_DATE) > $(BUILD_NUMBER_FILE)
./keyring-updater.sh
......
......@@ -99,6 +99,10 @@ for i in $partitions; do
counter=$((counter + 1))
done
if [ -x `which kpartx` ]; then
kpartx -a ${device}
fi
fdisk ${device} << EOF
n
p
......@@ -117,15 +121,9 @@ EOF
partprobe ${device}
# Trying this solution instead for loopdevices in docker
partitions=$(lsblk --raw --output "MAJ:MIN" --noheadings ${device} | tail -n +2)
counter=1
for i in $partitions; do
MAJ=$(echo $i | cut -d: -f1)
MIN=$(echo $i | cut -d: -f2)
if [ ! -e "${device}p${counter}" ]; then mknod ${device}p${counter} b $MAJ $MIN; fi
counter=$((counter + 1))
done
if [ -x `which kpartx` ]; then
kpartx -a ${device}
fi
bootp=${device}p1
rootp=${device}p2
......@@ -224,6 +222,8 @@ umount ${rootfs}
losetup -D
dmsetup remove_all
echo "written ${image} , making sum files"
if [ "${image}" != "" ]; then
......
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