git » mk-desktop-image.git » commit af51a6f

Adapt to new package dir format

author Urja (ARMLFS builder)
2024-07-12 16:36:36 UTC
committer Urja (ARMLFS builder)
2024-07-12 16:37:10 UTC
parent ff9c7070183a6de758d957df483308bcc3401edb

Adapt to new package dir format

make.sh +2 -1
pacman.conf +3 -3

diff --git a/make.sh b/make.sh
index 4ef3590..848f07a 100755
--- a/make.sh
+++ b/make.sh
@@ -35,6 +35,7 @@ mkdir -p $BS/var/lib/pacman
 pacman --config pacman.conf -Sy -b $BS/var/lib/pacman -r $BS
 
 cp packages.txt $BS/pkglist.txt
+yes | pacman -Scc
 pacman --config pacman.conf -S --noconfirm  --noscriptlet -b $BS/var/lib/pacman -r $BS minimal
 
 # Greeter background image
@@ -78,7 +79,7 @@ mount --bind /dev dev
 mkdir -p var/cache/pacman/pkg
 mkdir -p /tmp/ds{cache,work}
 cp /etc/resolv.conf etc/
-mount -t overlay -o lowerdir=/sources/pkg-kde5:/sources/pkg-base:/sources/pkg-core,upperdir=/tmp/dscache,workdir=/tmp/dswork overlay var/cache/pacman/pkg
+mount -t overlay -o lowerdir=/sources/pkg/armv7h/kde5:/sources/pkg/armv7h/base:/sources/pkg/armv7h/core,upperdir=/tmp/dscache,workdir=/tmp/dswork overlay var/cache/pacman/pkg
 chmod +x ./$1
 chroot . ./$1
 umount proc sys dev var/cache/pacman/pkg
diff --git a/pacman.conf b/pacman.conf
index ca8447a..8899ddf 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -82,10 +82,10 @@ SigLevel = Never
 Server = https://a64box.urja.dev/kbbpkgs/$arch
 
 [kde5]
-Server = https://a64box.urja.dev/armlfs/pkg/kde5
+Server = https://a64box.urja.dev/armlfs/pkg/$arch/kde5
 
 [base]
-Server = https://a64box.urja.dev/armlfs/pkg/base
+Server = https://a64box.urja.dev/armlfs/pkg/$arch/base
 
 [core]
-Server = https://a64box.urja.dev/armlfs/pkg/core
+Server = https://a64box.urja.dev/armlfs/pkg/$arch/core