summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdiskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags10
-rwxr-xr-xdiskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays11
2 files changed, 15 insertions, 6 deletions
diff --git a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags
index eda80b0..3d7dcdb 100755
--- a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags
+++ b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags
@@ -8,7 +8,15 @@ set -o pipefail
8 8
9# get the directories in order 9# get the directories in order
10mkdir -p /etc/portage/profile 10mkdir -p /etc/portage/profile
11mkdir -p /etc/portage/package.keywords 11if [ -f /etc/portage/package.keywords ]; then
12 mv /etc/portage/package.keywords /etc/portage/package.keywords.bak
13 mkdir -p /etc/portage/package.keywords
14 mv /etc/portage/package.keywords.bak /etc/portage/package.keywords/prebuilt-1
15else
16 mkdir -p /etc/portage/package.keywords
17fi
18[ -d /etc/portage/package.accept_keywords ] && mv /etc/portage/package.accept_keywords/* /etc/portage/package.keywords/ && rmdir /etc/portage/package.accept_keywords
19[ -f /etc/portage/package.accept_keywords ] && mv /etc/portage/package.accept_keywords /etc/portage/package.keywords/prebuilt-2
12mkdir -p /etc/portage/package.mask 20mkdir -p /etc/portage/package.mask
13mkdir -p /etc/portage/package.unmask 21mkdir -p /etc/portage/package.unmask
14mkdir -p /etc/portage/package.use 22mkdir -p /etc/portage/package.use
diff --git a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
index 05d212e..e277572 100755
--- a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
+++ b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-03-enable-overlays
@@ -24,18 +24,19 @@ if [[ ${GENTOO_OVERLAYS} != '' ]]; then
24 # redistribution, so we have to use a version of openssl that works around 24 # redistribution, so we have to use a version of openssl that works around
25 # it (using fedora's patchset) and also use a version of cryptography that 25 # it (using fedora's patchset) and also use a version of cryptography that
26 # depends on that version of openssl. 26 # depends on that version of openssl.
27 echo '=dev-python/cryptography-2.1.3 ~amd64' >> /etc/portage/package.keywords/layman 27 echo '=dev-python/cryptography-2.1.4-r2 ~amd64' >> /etc/portage/package.keywords/layman
28 echo '=dev-libs/openssl-1.1.0g-r1 ~amd64' >> /etc/portage/package.keywords/layman 28 echo '=dev-libs/openssl-1.0.2o-r6 ~amd64' >> /etc/portage/package.keywords/layman
29 echo '=dev-libs/openssl-1.1.0g-r1' >> /etc/portage/package.unmask/layman
30 emerge -q --oneshot --jobs=2 openssl openssh 29 emerge -q --oneshot --jobs=2 openssl openssh
31 # install layman 30 # install layman
32 USE="-build" emerge --deep -q --jobs=2 layman 31 USE="-build" emerge --deep -q --jobs=2 --ignore-built-slot-operator-deps=y layman
33 # sync the initial overlay list 32 # sync the initial overlay list
34 layman -S 33 layman -S
35 # enable the various overlays 34 # enable the various overlays, ignore failures (overlay my already be enabled)
35 set +e
36 for OVERLAY in ${GENTOO_OVERLAYS}; do 36 for OVERLAY in ${GENTOO_OVERLAYS}; do
37 layman -a "${OVERLAY}" 37 layman -a "${OVERLAY}"
38 done 38 done
39 set -e
39 40
40 unfix_shm 41 unfix_shm
41fi 42fi