diff options
author | 2012-09-09 20:16:15 +0100 | |
---|---|---|
committer | 2012-09-09 20:16:15 +0100 | |
commit | 8e2d43ed4c0b36e9e9aaac74ce34e9d9d1b7171a (patch) | |
tree | 77fe4b70130c950c659d7cca616303dcced2ade3 | |
parent | 9b9e198770c3980d8db91997af348f0b07fbf99e (diff) | |
download | paludis-8e2d43ed4c0b36e9e9aaac74ce34e9d9d1b7171a.tar.gz paludis-8e2d43ed4c0b36e9e9aaac74ce34e9d9d1b7171a.tar.xz |
Completely remove IMAGE in Gentoo EAPIs
10 files changed, 13 insertions, 16 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting_setup.sh b/paludis/repositories/e/e_repository_TEST_symlink_rewriting_setup.sh index 19e5eecf5..ff38af652 100755 --- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting_setup.sh +++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting_setup.sh @@ -37,9 +37,9 @@ CHOST="i286-badger-linux-gnu" END cat <<END > cat/pkg/pkg-1.ebuild || exit 1 SLOT="0" -PLATFORMS="test" +KEYWORDS="test" src_install() { - ln -s "\${IMAGE}/foo" "\${IMAGE}/bar" || die + ln -s "\${D}/foo" "\${D}/bar" || die } END cd .. diff --git a/paludis/repositories/e/eapis/pbin-1+0.conf b/paludis/repositories/e/eapis/pbin-1+0.conf index 24e6526c2..020d316b3 100644 --- a/paludis/repositories/e/eapis/pbin-1+0.conf +++ b/paludis/repositories/e/eapis/pbin-1+0.conf @@ -17,7 +17,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+1.conf b/paludis/repositories/e/eapis/pbin-1+1.conf index 50d90a15f..6355a7874 100644 --- a/paludis/repositories/e/eapis/pbin-1+1.conf +++ b/paludis/repositories/e/eapis/pbin-1+1.conf @@ -17,7 +17,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+2.conf b/paludis/repositories/e/eapis/pbin-1+2.conf index 1465a69f8..8dab1d9cd 100644 --- a/paludis/repositories/e/eapis/pbin-1+2.conf +++ b/paludis/repositories/e/eapis/pbin-1+2.conf @@ -17,7 +17,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_prepare src_configure src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+3.conf b/paludis/repositories/e/eapis/pbin-1+3.conf index a6bc3da3c..9e79f3b65 100644 --- a/paludis/repositories/e/eapis/pbin-1+3.conf +++ b/paludis/repositories/e/eapis/pbin-1+3.conf @@ -18,7 +18,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_prepare src_configure src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+4.conf b/paludis/repositories/e/eapis/pbin-1+4.conf index e5822d38f..f604d7216 100644 --- a/paludis/repositories/e/eapis/pbin-1+4.conf +++ b/paludis/repositories/e/eapis/pbin-1+4.conf @@ -18,7 +18,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_prepare src_configure src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+5.conf b/paludis/repositories/e/eapis/pbin-1+5.conf index d2ceb18f2..7ccd5a75e 100644 --- a/paludis/repositories/e/eapis/pbin-1+5.conf +++ b/paludis/repositories/e/eapis/pbin-1+5.conf @@ -18,7 +18,7 @@ directory_variables = \ build:PORTDIR build:DISTDIR ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_prepare src_configure src_compile src_test src_install diff --git a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf index a496effb9..020b59729 100644 --- a/paludis/repositories/e/eapis/pbin-1+paludis-1.conf +++ b/paludis/repositories/e/eapis/pbin-1+paludis-1.conf @@ -15,7 +15,7 @@ non_empty_variables = \ build:USERLAND build:KERNEL build:ARCH ROOT ignore_pivot_env_variables = \ - A S D WORKDIR IMAGE + A S D WORKDIR ignore_pivot_env_functions = \ src_unpack src_compile src_test src_install diff --git a/paludis/repositories/e/ebuild/0/builtin_init.bash b/paludis/repositories/e/ebuild/0/builtin_init.bash index fca0f9919..78e70f47b 100644 --- a/paludis/repositories/e/ebuild/0/builtin_init.bash +++ b/paludis/repositories/e/ebuild/0/builtin_init.bash @@ -72,9 +72,6 @@ builtin_init() [[ -n "${PALUDIS_PREFIX_IMAGE_VAR}" ]] && export $PALUDIS_PREFIX_IMAGE_VAR=${D} - IMAGE="${D}" - declare -r IMAGE="${IMAGE}" - export S="${WORKDIR}/${P}" ebuild_load_em_up_dan diff --git a/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash b/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash index b325e1a76..ef3dec52d 100644 --- a/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash +++ b/paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash @@ -19,11 +19,11 @@ builtin_installbin() { if [[ ${!PALUDIS_ARCHIVES_VAR%.tar.bz2} != ${!PALUDIS_ARCHIVES_VAR} ]] ; then - echo tar jvxpf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${IMAGE}"/ --exclude PBIN 1>&2 - tar jvxpf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${IMAGE}"/ --exclude PBIN || die "Couldn't extract image" + echo tar jvxpf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${!PALUDIS_IMAGE_DIR_VAR}"/ --exclude PBIN 1>&2 + tar jvxpf "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} -C "${!PALUDIS_IMAGE_DIR_VAR}"/ --exclude PBIN || die "Couldn't extract image" elif [[ ${!PALUDIS_ARCHIVES_VAR%.pax.bz2} != ${!PALUDIS_ARCHIVES_VAR} ]] ; then - echo unpaxinate img "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} "${IMAGE}" 1>&2 - unpaxinate img "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} "${IMAGE}" || die "Couldn't extract image" + echo unpaxinate img "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} "${!PALUDIS_IMAGE_DIR_VAR}" 1>&2 + unpaxinate img "${!PALUDIS_BINARY_DISTDIR_VARIABLE}"/${!PALUDIS_ARCHIVES_VAR} "${!PALUDIS_IMAGE_DIR_VAR}" || die "Couldn't extract image" else die "Unrecognised extension for '${!PALUDIS_ARCHIVES_VAR}'" fi |