Attachment #245771 for bug #335340

View | Details | Raw Unified | Return to bug 335340
Collapse All | Expand All

Lines 596-601 save_ebuild_env() { Link Here

(-)a/bin/isolated-functions.sh (+1 lines)
596	PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \	596	PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \
597	PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \	597	PORTAGE_BASHRC PM_EBUILD_HOOK_DIR PORTAGE_BASHRCS_SOURCED \
598	PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \	598	PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
		599	PORTAGE_BUNZIP2_COMMAND PORTAGE_BZIP2_COMMAND \
599	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \	600	PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
600	PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \	601	PORTAGE_DEPCACHEDIR PORTAGE_EBUILD_EXIT_FILE PORTAGE_GID \
601	PORTAGE_GRPNAME PORTAGE_INST_GID \	602	PORTAGE_GRPNAME PORTAGE_INST_GID \

Lines 855-861 dyn_package() { Link Here

(-)a/bin/misc-functions.sh (-1 / +1 lines)
855	PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2"	855	PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2"
856	mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" \|\| die "mkdir failed"	856	mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" \|\| die "mkdir failed"
857	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . \| \	857	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . \| \
858	bzip2 -cf > "$PORTAGE_BINPKG_TMPFILE"	858	$PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE"
859	assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"	859	assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"
860	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \	860	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
861	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \	861	"${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \

Lines 70-75 EMERGE_WARNING_DELAY="10" Link Here

(-)a/cnf/make.globals (+2 lines)
70	# This option will be removed and forced to yes.	70	# This option will be removed and forced to yes.
71	AUTOCLEAN="yes"	71	AUTOCLEAN="yes"
72		72
		73	PORTAGE_BZIP2_COMMAND="bzip2"
		74
73	# Don't compress files with these suffixes.	75	# Don't compress files with these suffixes.
74	PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"	76	PORTAGE_COMPRESS_EXCLUDE_SUFFIXES="css gif htm[l]? jp[e]?g js pdf png"
75		77




This variable contains options to be passed to the tar command for creation
of binary packages.
.TP
\fBPORTAGE_BUNZIP2_COMMAND\fR = \fI[bunzip2 command string]\fR
This variable should contain a command that is suitable for portage to call
for bunzip2 extraction operations.
.TP
\fBPORTAGE_BZIP2_COMMAND\fR = \fI[bzip2 command string]\fR
This variable should contain a command that is suitable for portage to call
for bzip2 compression operations. \fBPORTAGE_BZIP2_COMMAND\fR will also be
called for extraction operation, with -d appended, unless the
\fBPORTAGE_BUNZIP2_COMMAND\fR variable is set.
.TP
\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR
This variable contains the command used to compress documentation during the
install phase.

Lines 274-279 class Binpkg(CompositeTask): Link Here

(-)a/pym/_emerge/Binpkg.py (+1 lines)
274	return	274	return
275		275
276	extractor = BinpkgExtractorAsync(background=self.background,	276	extractor = BinpkgExtractorAsync(background=self.background,
		277	env=self.settings.environ(),
277	image_dir=self._image_dir,	278	image_dir=self._image_dir,
278	pkg=self.pkg, pkg_path=self._pkg_path,	279	pkg=self.pkg, pkg_path=self._pkg_path,
279	logfile=self.settings.get("PORTAGE_LOG_FILE"),	280	logfile=self.settings.get("PORTAGE_LOG_FILE"),

Lines 16-25 class BinpkgExtractorAsync(SpawnProcess): Link Here

(-)a/pym/_emerge/BinpkgExtractorAsync.py (-3 / +2 lines)
16	"bzip2 -dqc -- %s \| tar -xp -C %s -f -" % \	16	("${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- %s \| tar -xp -C %s -f -" % \
17	portage._shell_quote(self.image_dir))]	17	portage._shell_quote(self.image_dir)))]
18		18
19	self.env = self.pkg.root_config.settings.environ()
20	SpawnProcess._start(self)	19	SpawnProcess._start(self)
21		20

Lines 43-49 environ_whitelist += [ Link Here

(-)a/pym/portage/__init__.py (-2 / +3 lines)
43	"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",	43	"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",
44	"PORTAGE_BINPKG_TMPFILE",	44	"PORTAGE_BINPKG_TMPFILE",
45	"PORTAGE_BIN_PATH",	45	"PORTAGE_BIN_PATH",
46	"PORTAGE_BUILDDIR", "PORTAGE_COLORMAP",	46	"PORTAGE_BUILDDIR", "PORTAGE_BUNZIP2_COMMAND", "PORTAGE_BZIP2_COMMAND",
		47	"PORTAGE_COLORMAP",
47	"PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",	48	"PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",
48	"PORTAGE_EBUILD_EXIT_FILE", "PORTAGE_FEATURES",	49	"PORTAGE_EBUILD_EXIT_FILE", "PORTAGE_FEATURES",
49	"PORTAGE_GID", "PORTAGE_GRPNAME",	50	"PORTAGE_GID", "PORTAGE_GRPNAME",
Lines 8896-8902 pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, Link Here
8896		8896
8897	writemsg_stdout(_(">>> Extracting %s\n") % mypkg)	8897	writemsg_stdout(_(">>> Extracting %s\n") % mypkg)
8898	retval = portage.process.spawn_bash(	8898	retval = portage.process.spawn_bash(
8899	"bzip2 -dqc -- '%s' \| tar -xp -C '%s' -f -" % (mytbz2, pkgloc),	8899	"${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- %s \| tar -xp -C %s -f -" % (mytbz2, pkgloc),
8900	env=mysettings.environ())	8900	env=mysettings.environ())
8901	if retval != os.EX_OK:	8901	if retval != os.EX_OK:
8902	writemsg(_("!!! Error Extracting '%s'\n") % mytbz2, noiselevel=-1)	8902	writemsg(_("!!! Error Extracting '%s'\n") % mytbz2, noiselevel=-1)

Lines 52-57 environ_filter += [ Link Here

(-)a/cnf/make.globals (+1 lines)
52		53
53	ACCEPT_LICENSE="* -@EULA"	54	ACCEPT_LICENSE="* -@EULA"
54	ACCEPT_PROPERTIES="*"	55	ACCEPT_PROPERTIES="*"
		56	PORTAGE_BZIP2_COMMAND="bzip2"
55		57
56	# Repository Paths	58	# Repository Paths
57	PORTDIR=/usr/portage	59	PORTDIR=/usr/portage





		_unpack_tar() {
			if [ "${y}" == "tar" ]; then
				$1 -c -- "$srcdir$x" | tar xof -
				assert "$myfail"
			else
				$1 -c -- "${srcdir}${x}" > ${x%.*} || die "$myfail"
			fi
		}


				tar xozf "$srcdir$x" || die "$myfail"
				;;
			tbz|tbz2)
				${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- "$srcdir$x" | tar xof -
				assert "$myfail"
				;;
			ZIP|zip|jar)
				unzip -qo "${srcdir}${x}" || die "$myfail"
				;;
			gz|Z|z)
				_unpack_tar "gzip -d"
				;;
			bz2|bz)
				_unpack_tar "${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d}"
				;;
			7Z|7z)
				local my_output

				fi
				;;
			lzma)
				_unpack_tar "lzma -d"
				;;
			xz)
				if hasq $eapi 0 1 2 ; then
					vecho "unpack ${x}: file format not recognized. Ignoring."
				else
					_unpack_tar "xz -d"
				fi
				;;
			*)

		--filter-path --filter-sandbox --allow-extra-vars > environment
	assert "save_ebuild_env failed"

	${PORTAGE_BZIP2_COMMAND} -f9 environment

	cp "${EBUILD}" "${PF}.ebuild"
	[ -n "${PORTAGE_REPO_NAME}" ]  && echo "${PORTAGE_REPO_NAME}" > repository

			save_ebuild_env --exclude-init-phases | \
				filter_readonly_variables --filter-path \
				--filter-sandbox --allow-extra-vars \
				| ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
		fi
		;;
- 

Return to bug 335340

Lines 349-358 unpack() { Link Here

(-)a/bin/ebuild.sh (-10 / +9 lines)
349		349
350	_unpack_tar() {	350	_unpack_tar() {
351	if [ "${y}" == "tar" ]; then	351	if [ "${y}" == "tar" ]; then
352	$1 -dc "$srcdir$x" \| tar xof -	352	$1 -c -- "$srcdir$x" \| tar xof -
353	assert "$myfail"	353	assert "$myfail"
354	else	354	else
355	$1 -dc "${srcdir}${x}" > ${x%.*} \|\| die "$myfail"	355	$1 -c -- "${srcdir}${x}" > ${x%.*} \|\| die "$myfail"
356	fi	356	fi
357	}	357	}
358		358
Lines 365-381 unpack() { Link Here
365	tar xozf "$srcdir$x" \|\| die "$myfail"	365	tar xozf "$srcdir$x" \|\| die "$myfail"
366	;;	366	;;
367	tbz\|tbz2)	367	tbz\|tbz2)
368	bzip2 -dc "$srcdir$x" \| tar xof -	368	${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d} -c -- "$srcdir$x" \| tar xof -
369	assert "$myfail"	369	assert "$myfail"
370	;;	370	;;
371	ZIP\|zip\|jar)	371	ZIP\|zip\|jar)
372	unzip -qo "${srcdir}${x}" \|\| die "$myfail"	372	unzip -qo "${srcdir}${x}" \|\| die "$myfail"
373	;;	373	;;
374	gz\|Z\|z)	374	gz\|Z\|z)
375	_unpack_tar gzip	375	_unpack_tar "gzip -d"
376	;;	376	;;
377	bz2\|bz)	377	bz2\|bz)
378	_unpack_tar bzip2	378	_unpack_tar "${PORTAGE_BUNZIP2_COMMAND:-${PORTAGE_BZIP2_COMMAND} -d}"
379	;;	379	;;
380	7Z\|7z)	380	7Z\|7z)
381	local my_output	381	local my_output
Lines 422-434 unpack() { Link Here
422	fi	422	fi
423	;;	423	;;
424	lzma)	424	lzma)
425	_unpack_tar lzma	425	_unpack_tar "lzma -d"
426	;;	426	;;
427	xz)	427	xz)
428	if hasq $eapi 0 1 2 ; then	428	if hasq $eapi 0 1 2 ; then
429	vecho "unpack ${x}: file format not recognized. Ignoring."	429	vecho "unpack ${x}: file format not recognized. Ignoring."
430	else	430	else
431	_unpack_tar xz	431	_unpack_tar "xz -d"
432	fi	432	fi
433	;;	433	;;
434	*)	434	*)
Lines 1156-1162 dyn_install() { Link Here
1156	--filter-path --filter-sandbox --allow-extra-vars > environment	1156	--filter-path --filter-sandbox --allow-extra-vars > environment
1157	assert "save_ebuild_env failed"	1157	assert "save_ebuild_env failed"
1158		1158
1159	bzip2 -f9 environment	1159	${PORTAGE_BZIP2_COMMAND} -f9 environment
1160		1160
1161	cp "${EBUILD}" "${PF}.ebuild"	1161	cp "${EBUILD}" "${PF}.ebuild"
1162	[ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository	1162	[ -n "${PORTAGE_REPO_NAME}" ] && echo "${PORTAGE_REPO_NAME}" > repository
Lines 2125-2131 ebuild_main() { Link Here
2125	save_ebuild_env --exclude-init-phases \| \	2125	save_ebuild_env --exclude-init-phases \| \
2126	filter_readonly_variables --filter-path \	2126	filter_readonly_variables --filter-path \
2127	--filter-sandbox --allow-extra-vars \	2127	--filter-sandbox --allow-extra-vars \
2128	\| bzip2 -c -f9 > "$PORTAGE_UPDATE_ENV"	2128	\| ${PORTAGE_BZIP2_COMMAND} -c -f9 > "$PORTAGE_UPDATE_ENV"
2129	fi	2129	fi
2130	;;	2130	;;
2131	-

Lines 594-599 setting as the base URI. Link Here

(-)a/man/make.conf.5 (+10 lines)
594	This variable contains options to be passed to the tar command for creation	594	This variable contains options to be passed to the tar command for creation
595	of binary packages.	595	of binary packages.
596	.TP	596	.TP
		597	\fBPORTAGE_BUNZIP2_COMMAND\fR = \fI[bunzip2 command string]\fR
		598	This variable should contain a command that is suitable for portage to call
		599	for bunzip2 extraction operations.
		600	.TP
		601	\fBPORTAGE_BZIP2_COMMAND\fR = \fI[bzip2 command string]\fR
		602	This variable should contain a command that is suitable for portage to call
		603	for bzip2 compression operations. \fBPORTAGE_BZIP2_COMMAND\fR will also be
		604	called for extraction operation, with -d appended, unless the
		605	\fBPORTAGE_BUNZIP2_COMMAND\fR variable is set.
		606	.TP
597	\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR	607	\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR
598	This variable contains the command used to compress documentation during the	608	This variable contains the command used to compress documentation during the
599	install phase.	609	install phase.