summaryrefslogtreecommitdiff
path: root/libvasile
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 17:42:57 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 17:42:57 +0100
commit699cb3baa9ad52bd242eca902e9807d8f2c41b23 (patch)
tree3316528ed12eb073cd6709c79b44c2c934ada91a /libvasile
parentc79f7cb3dd4159357e923906c75d0a0c86f17534 (diff)
adjust to layout changes, only fetch minimal overlay info in binmode
Diffstat (limited to 'libvasile')
-rwxr-xr-xlibvasile39
1 files changed, 27 insertions, 12 deletions
diff --git a/libvasile b/libvasile
index 2c109e2..e1678ad 100755
--- a/libvasile
+++ b/libvasile
@@ -158,8 +158,8 @@ chrootstop () {
umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
umount -l "$overlaydir"/dev > /dev/null 2>&1
umount -l "$overlaydir"/tmp > /dev/null 2>&1
- umount -l "$overlaydir"/usr/ports/gentoo/packages > /dev/null 2>&1
- umount -l "$overlaydir"/usr/ports/gentoo/distfiles > /dev/null 2>&1
+ umount -l "$overlaydir"/var/cache/packages > /dev/null 2>&1
+ umount -l "$overlaydir"/var/cache/distfiles > /dev/null 2>&1
umount -l "$overlaydir" > /dev/null 2>&1
umount -l "$rodir" > /dev/null 2>&1
}
@@ -168,8 +168,8 @@ chrootstart () {
# mount core squashfs in overlay
mount -t squashfs "$chrootx64" "$rodir"
mount -t overlay -o lowerdir="$rodir",upperdir="$rwdir",workdir="$workdir" overlay "$overlaydir"
- mount -o bind packages "$overlaydir"/usr/ports/gentoo/packages
- mount -o bind distfiles "$overlaydir"/usr/ports/gentoo/distfiles
+ mount -o bind packages "$overlaydir"/var/cache/packages
+ mount -o bind distfiles "$overlaydir"/var/cache/distfiles
mount -t proc proc "$overlaydir"/proc
mount -t sysfs sysfs "$overlaydir"/sys
mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
@@ -213,7 +213,7 @@ makepkg () {
isostart () {
# mount iso image core
- mount -o bind packages "$isorsynctarget"/usr/ports/gentoo/packages
+ mount -o bind packages "$isorsynctarget"/var/cache/packages
mount -t proc proc "$isorsynctarget"/proc
mount -t sysfs sysfs "$isorsynctarget"/sys
mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$isorsynctarget"/dev
@@ -230,7 +230,7 @@ isostop () {
umount -l "$isorsynctarget"/dev/shm > /dev/null 2>&1
umount -l "$isorsynctarget"/dev > /dev/null 2>&1
umount -l "$isorsynctarget"/tmp > /dev/null 2>&1
- umount -l "$isorsynctarget"/usr/ports/gentoo/packages > /dev/null 2>&1
+ umount -l "$isorsynctarget"/var/cache/packages > /dev/null 2>&1
}
isousertree () {
@@ -377,7 +377,7 @@ removeportagetree() {
# remove portage tree, but leave packages and distfiles directories intact
einfo "Removing gentoo portage tree"
if [ -d ""$gentooportdir"/.git" ] ; then
- find "$gentooportdir" -mindepth 1 -name "packages" -prune -o -name "distfiles" -prune -o -exec rm -rf {} \; > /dev/null 2>&1
+ find "$gentooportdir" -mindepth 1 -exec rm -rf {} \; > /dev/null 2>&1
fi
}
@@ -445,8 +445,8 @@ fetchminimalportagetree() {
fi
}
-fetchoverlays () {
- # fetch redcore overlay
+fetchfulloverlays () {
+ # fetch full redcore overlay
if [ ! -d ""$redcoreportdir"/.git" ] ; then
einfo "Injecting "$releasename"-"$releasetarget" overlay"
cd "$redcoreportdir" && git init > /dev/null 2>&1
@@ -456,6 +456,21 @@ fetchoverlays () {
fi
}
+fetchminimaloverlays () {
+ # fetch minimal redcore overlay
+ if [ ! -d ""$redcoreportdir"/.git" ] ; then
+ einfo "Injecting binmode (minimal) "$releasename"-"$releasetarget" overlay"
+ cd "$redcoreportdir" && git init > /dev/null 2>&1
+ git remote add origin https://gitlab.com/redcore/redcore-desktop.git
+ git config core.sparsecheckout true
+ echo "profiles/*" >> .git/info/sparse-checkout
+ echo "metadata/*" >> .git/info/sparse-checkout
+ echo "eclass/*" >> .git/info/sparse-checkout
+ git pull --depth=1 origin master
+ git branch -u origin/master master
+ fi
+}
+
setbinmodeconfig() {
# set make.conf to binmode, portage will always use binary packages from binhost
ln -sf "$portgitdir" "$portconfdir"
@@ -488,7 +503,7 @@ setsrcmodeconfig () {
binmode() {
resetmode
fetchminimalportagetree
- fetchoverlays
+ fetchminimaloverlays
fetchportageconfig
setbinmodeconfig
}
@@ -496,7 +511,7 @@ binmode() {
mixedmode() {
resetmode
fetchfullportagetree
- fetchoverlays
+ fetchfulloverlays
fetchportageconfig
setmixedmodeconfig
}
@@ -504,7 +519,7 @@ mixedmode() {
srcmode() {
resetmode
fetchfullportagetree
- fetchoverlays
+ fetchfulloverlays
fetchportageconfig
setsrcmodeconfig
}