mirror of
https://github.com/erenfro/gen2stage4.git
synced 2024-11-13 02:38:57 -05:00
add new portage paths with optional portageq logic (#18)
* add new portage paths added /var/db/repos/gentoo and /var/cache/distfiles to hard-coded list of excludes. Portage has moved (when?) according to https://wiki.gentoo.org/wiki//usr/portage * Added portageq logic Added portageq logic to detect where portage stores its tree and distfiles. If this fails, fall back to a default list declared in EXCLUDES_DEFAULT_PORTAGE
This commit is contained in:
parent
44e700f71d
commit
d4ded4bd5f
1 changed files with 21 additions and 2 deletions
23
mkstage4.sh
23
mkstage4.sh
|
@ -16,6 +16,13 @@ USER_EXCL=""
|
|||
S_KERNEL=0
|
||||
x86_64=0
|
||||
PARALLEL=0
|
||||
HAS_PORTAGEQ=0
|
||||
|
||||
if [ `which portageq` ]
|
||||
then
|
||||
HAS_PORTAGEQ=1
|
||||
fi
|
||||
|
||||
if [ `getconf LONG_BIT` = "64" ]
|
||||
then
|
||||
x86_64=1
|
||||
|
@ -143,18 +150,30 @@ EXCLUDES="\
|
|||
--exclude=${TARGET}run/* \
|
||||
--exclude=${TARGET}sys/* \
|
||||
--exclude=${TARGET}tmp/* \
|
||||
--exclude=${TARGET}usr/portage/* \
|
||||
--exclude=${TARGET}var/lock/* \
|
||||
--exclude=${TARGET}var/log/* \
|
||||
--exclude=${TARGET}var/run/* \
|
||||
--exclude=${TARGET}var/lib/docker/*"
|
||||
--exclude=${TARGET}var/lib/docker/* "
|
||||
|
||||
EXCLUDES_DEFAULT_PORTAGE="\
|
||||
--exclude=${TARGET}var/db/repos/gentoo/* \
|
||||
--exclude=${TARGET}var/cache/distfiles/* \
|
||||
--exclude=${TARGET}usr/portage/*"
|
||||
|
||||
EXCLUDES+=$USER_EXCL
|
||||
|
||||
if [ "$TARGET" == "/" ]
|
||||
then
|
||||
EXCLUDES+=" --exclude=${STAGE4_FILENAME#/}"
|
||||
if [ ${HAS_PORTAGEQ} == 1 ]
|
||||
then
|
||||
EXCLUDES+=" --exclude=$(portageq get_repo_path / gentoo)/*"
|
||||
EXCLUDES+=" --exclude=$(portageq distdir)/*"
|
||||
else
|
||||
EXCLUDES+="${EXCLUDES_DEFAULT_PORTAGE}"
|
||||
fi
|
||||
else
|
||||
EXCLUDES+="${EXCLUDES_DEFAULT_PORTAGE}"
|
||||
fi
|
||||
|
||||
if [ ${EXCLUDE_CONNMAN} -eq 1 ]
|
||||
|
|
Loading…
Reference in a new issue