Force REPODEST

.gitlab-ci.yml

@@ -26,7 +26,8 @@ lint:
   interruptible: true
   script:
     - |
-      sudo apk add alpine-sdk lua-aports doas
+      sudo apk add alpine-sdk lua-aports doas lzop
+      sudo rm /bin/lzop
       doas addgroup $USER abuild
       export PATH="$PATH:$CI_PROJECT_DIR/.gitlab/bin"
       sudo -Eu $USER build.sh
@@ -47,7 +48,8 @@ lint:
   interruptible: true
   script:
     - |
-      sudo apk add alpine-sdk lua-aports doas gzip xz qemu-$CI_QEMU_TARGET_ARCH
+      sudo apk add alpine-sdk lua-aports doas gzip xz lzop qemu-$CI_QEMU_TARGET_ARCH
+      sudo rm /bin/lzop
       doas addgroup $USER abuild
       export PATH="$PATH:$CI_PROJECT_DIR/.gitlab/bin"
       build-rootfs.sh alpine$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_ALPINE_TARGET_ARCH --rootfsdir $HOME/sysroot-$CI_ALPINE_TARGET_ARCH

.gitlab/bin/build.sh

@@ -136,6 +136,7 @@ setup_system() {
 	chmod 700 $HOME/.abuild/$ABUILD_KEY_NAME.rsa
 	echo "PACKAGER_PRIVKEY=$HOME/.abuild/$ABUILD_KEY_NAME.rsa" >> $HOME/.abuild/abuild.conf
 	doas cp $HOME/.abuild/$ABUILD_KEY_NAME.rsa.pub /etc/apk/keys/$ABUILD_KEY_NAME.rsa.pub
+	echo "REPODEST=$HOME/packages" >> $HOME/.abuild/abuild.conf
 
 	doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf
 	( . /etc/abuild.conf && echo "Building with $JOBS jobs" )

user/linux-rm/APKBUILD

@@ -132,9 +132,6 @@ build() {
 			return 1
 		fi
 
-		# sometimes uses busybox lzop
-		alias lzop=/usr/bin/lzop
-
 		make ARCH="$_carch" CC="${CC:-gcc}" \
 			KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
 	done