RXT0112/Exheredludis
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Completely remove IMAGE in Gentoo EAPIs

Browse Source
This commit is contained in:
David Leverton 2012-09-09 20:16:15 +01:00
parent 9b9e198770
commit 8e2d43ed4c
10 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paludis/repositories/e/e_repository_TEST_symlink_rewriting_setup.sh
View File

@ -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 ..

2
paludis/repositories/e/eapis/pbin-1+0.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+1.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+2.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+3.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+4.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+5.conf
View File

@ -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

2
paludis/repositories/e/eapis/pbin-1+paludis-1.conf
View File

@ -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

3
paludis/repositories/e/ebuild/0/builtin_init.bash
View File

@ -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

8
paludis/repositories/e/ebuild/pbin-1/builtin_installbin.bash
View File

@ -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