Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 214619
Collapse All | Expand All

(-)pym/portage.py (-1 / +2 lines)
Lines 1013-1019 Link Here
1013
		"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
1013
		"PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
1014
		"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
1014
		"PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
1015
		"PORTAGE_BASHRC",
1015
		"PORTAGE_BASHRC",
1016
		"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TMPFILE",
1016
		"PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TAR_OPTS",
1017
		"PORTAGE_BINPKG_TMPFILE",
1017
		"PORTAGE_BIN_PATH",
1018
		"PORTAGE_BIN_PATH",
1018
		"PORTAGE_BUILDDIR", "PORTAGE_COLORMAP",
1019
		"PORTAGE_BUILDDIR", "PORTAGE_COLORMAP",
1019
		"PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",
1020
		"PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",
(-)bin/misc-functions.sh (-1 / +2 lines)
Lines 534-540 Link Here
534
	# Sandbox is disabled in case the user wants to use a symlink
534
	# Sandbox is disabled in case the user wants to use a symlink
535
	# for $PKGDIR and/or $PKGDIR/All.
535
	# for $PKGDIR and/or $PKGDIR/All.
536
	export SANDBOX_ON="0"
536
	export SANDBOX_ON="0"
537
	tar ${tar_options} -cf - . | bzip2 -f > "${pkg_tmp}" || \
537
	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \
538
		bzip2 -f > "${pkg_tmp}" || \
538
		die "Failed to create tarball"
539
		die "Failed to create tarball"
539
	cd ..
540
	cd ..
540
	export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
541
	export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
(-)bin/isolated-functions.sh (-1 / +1 lines)
Lines 466-472 Link Here
466
			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
466
			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
467
			NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
467
			NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
468
			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
468
			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
469
			PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
469
			PORTAGE_BINPKG_TAR_OPTS PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
470
			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
470
			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
471
			PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
471
			PORTAGE_DEPCACHEDIR PORTAGE_GID PORTAGE_INST_GID \
472
			PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
472
			PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
(-)man/make.conf.5 (+4 lines)
Lines 366-371 Link Here
366
for more information.  Note that it should point to the 'All' directory on 
366
for more information.  Note that it should point to the 'All' directory on 
367
the host that creates the binary packages and not to the root of the \fBPKGDIR\fR.
367
the host that creates the binary packages and not to the root of the \fBPKGDIR\fR.
368
.TP
368
.TP
369
.B PORTAGE_BINPKG_TAR_OPTS
370
This variable contains options to be passed to the tar command for creation
371
of binary packages.
372
.TP
369
\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR
373
\fBPORTAGE_COMPRESS\fR = \fI"bzip2"\fR
370
This variable contains the command used to compress documentation during the
374
This variable contains the command used to compress documentation during the
371
install phase.
375
install phase.
(-)bin/misc-functions.sh (-1 / +1 lines)
Lines 374-380 Link Here
374
		set +o noglob
374
		set +o noglob
375
		quiet_mode || einfo "Removing ${no_inst}"
375
		quiet_mode || einfo "Removing ${no_inst}"
376
		# normal stuff
376
		# normal stuff
377
		rm -Rf ${root}/${no_inst} >&/dev/null
377
		rm -Rf "${root}"/${no_inst} >&/dev/null
378
378
379
		# we also need to handle globs (*.a, *.h, etc)
379
		# we also need to handle globs (*.a, *.h, etc)
380
		find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null
380
		find "${root}" -path "${no_inst}" -exec rm -fR {} \; >/dev/null
(-)pym/portage.py (-3 / +6 lines)
Lines 4678-4688 Link Here
4678
			phase_retval = exit_status_check(phase_retval)
4678
			phase_retval = exit_status_check(phase_retval)
4679
			if phase_retval == os.EX_OK:
4679
			if phase_retval == os.EX_OK:
4680
				# Post phase logic and tasks that have been factored out of
4680
				# Post phase logic and tasks that have been factored out of
4681
				# ebuild.sh.
4681
				# ebuild.sh. Call preinst_mask last so that INSTALL_MASK can
4682
				# can be used to wipe out any gmon.out files created during
4683
				# previous functions (in case any tools were built with -pg
4684
				# in CFLAGS).
4682
				myargs = [_shell_quote(misc_sh_binary),
4685
				myargs = [_shell_quote(misc_sh_binary),
4683
					"preinst_bsdflags", "preinst_mask",
4686
					"preinst_bsdflags",
4684
					"preinst_sfperms", "preinst_selinux_labels",
4687
					"preinst_sfperms", "preinst_selinux_labels",
4685
					"preinst_suid_scan"]
4688
					"preinst_suid_scan", "preinst_mask"]
4686
				_doebuild_exit_status_unlink(
4689
				_doebuild_exit_status_unlink(
4687
					mysettings.get("EBUILD_EXIT_STATUS_FILE"))
4690
					mysettings.get("EBUILD_EXIT_STATUS_FILE"))
4688
				mysettings["EBUILD_PHASE"] = ""
4691
				mysettings["EBUILD_PHASE"] = ""
(-)bin/misc-functions.sh (-3 / +9 lines)
Lines 407-412 Link Here
407
		 eerror "${FUNCNAME}: D is unset"
407
		 eerror "${FUNCNAME}: D is unset"
408
		 return 1
408
		 return 1
409
	fi
409
	fi
410
411
	# Make sure $PWD is not ${D} so that we don't leave gmon.out files
412
	# in there in case any tools were built with -pg in CFLAGS.
413
	cd "${T}"
414
410
	# remove man pages, info pages, docs if requested
415
	# remove man pages, info pages, docs if requested
411
	for f in man info doc; do
416
	for f in man info doc; do
412
		if hasq no${f} $FEATURES; then
417
		if hasq no${f} $FEATURES; then
Lines 525-531 Link Here
525
}
530
}
526
531
527
dyn_package() {
532
dyn_package() {
528
	cd "${PORTAGE_BUILDDIR}/image"
533
	# Make sure $PWD is not ${D} so that we don't leave gmon.out files
534
	# in there in case any tools were built with -pg in CFLAGS.
535
	cd "${T}"
529
	install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}"
536
	install_mask "${PORTAGE_BUILDDIR}/image" "${PKG_INSTALL_MASK}"
530
	local pkg_dest="${PKGDIR}/All/${PF}.tbz2"
537
	local pkg_dest="${PKGDIR}/All/${PF}.tbz2"
531
	local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$"
538
	local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$"
Lines 534-543 Link Here
534
	# Sandbox is disabled in case the user wants to use a symlink
541
	# Sandbox is disabled in case the user wants to use a symlink
535
	# for $PKGDIR and/or $PKGDIR/All.
542
	# for $PKGDIR and/or $PKGDIR/All.
536
	export SANDBOX_ON="0"
543
	export SANDBOX_ON="0"
537
	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS . | \
544
	tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \
538
		bzip2 -f > "${pkg_tmp}" || \
545
		bzip2 -f > "${pkg_tmp}" || \
539
		die "Failed to create tarball"
546
		die "Failed to create tarball"
540
	cd ..
541
	export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
547
	export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
542
	python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
548
	python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')"
543
	if [ $? -ne 0 ]; then
549
	if [ $? -ne 0 ]; then

Return to bug 214619