diff options
4 files changed, 17 insertions, 2 deletions
diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh b/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh index 2205d2a..6c1964f 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/installdeps.sh @@ -13,5 +13,17 @@ source /etc/profile eselect news read all eselect news purge etc-update --automode -5 - +emerge app-portage/layman +layman -L +layman -a lisp +echo 'source "/var/lib/layman/make.conf"' >> /etc/portage/make.conf +cat >/var/lib/layman/make.conf <<EOF +ENABLED=" +/var/lib/layman/lisp" +DISABLED=" +" +PORTDIR_OVERLAY=" +\$ENABLED +\$PORTDIR_OVERLAY" +EOF exit 0 diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf index 9415cf7..b06fde6 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/make.conf @@ -6,7 +6,7 @@ FFLAGS="${CFLAGS}" USE="cacert -X -webstart -alsa -cups -gtk -vala -introspection" PYTHON_TARGETS="python2_7 python3_6 python3_7 python3_8" PYTHON_SINGLE_TARGET="python3_7" -CURL_SSL="nss" +CURL_SSL="openssl" GRUB_PLATFORMS="pc" ABI_X86="64 32" EMERGE_DEFAULT_OPTS="--quiet-build=y --with-bdeps=y --nospinner --verbose-conflicts --changed-deps-report=n --keep-going=y" diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/package.accept_keywords b/salt/gentoo_baseimage/gentoo_baseimage/files/package.accept_keywords new file mode 100644 index 0000000..fa916c1 --- /dev/null +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/package.accept_keywords @@ -0,0 +1 @@ +app-portage/layman ~amd64 diff --git a/salt/gentoo_baseimage/gentoo_baseimage/files/package.use b/salt/gentoo_baseimage/gentoo_baseimage/files/package.use index a80a609..20dedfe 100644 --- a/salt/gentoo_baseimage/gentoo_baseimage/files/package.use +++ b/salt/gentoo_baseimage/gentoo_baseimage/files/package.use @@ -2,3 +2,5 @@ x11-libs/cairo X app-text/ghostscript-gpl cups net-analyzer/net-snmp elf lm-sensors netlink pci python_single_target_python2_7 net-mail/mailman python_single_target_python2_7 +dev-vcs/git -cvs -subversion -perl +app-portage/layman -cvs gpg -mercurial -subversion sync-plugin-portage |