[patch] crossdev-prefix.patch

0001-Prefix-support.patch (text/plain), 7.89 KB, created by Benda Xu on 2013-07-28 01:39:05 UTC

From 49802e28d56169229ce5120b6dd2e688ff77a32a Mon Sep 17 00:00:00 2001
From: XU Benda <[e-mail]>
Date: Sun, 28 Jul 2013 10:37:32 +0900
Subject: [PATCH] Prefix support:

  1. use EPREFIX style suggested by vapier in bug 473484
  2. default PORTAGE_CONFIGROOT to EPREFIX
  3. EPREFIX for host
---
 Makefile                       |  2 ++
 crossdev                       | 58 +++++++++++++++++++++++-------------------
 wrappers/Makefile              |  3 +++
 wrappers/cross-emerge          |  2 +-
 wrappers/emerge-wrapper        |  4 +--
 wrappers/etc/portage/make.conf |  2 +-
 6 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index a36fa1f..26c5b37 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@
 include settings.mk
 
 all:
+	sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" crossdev
+	$(MAKE) -C wrappers
 
 install:
 	$(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/
diff --git a/crossdev b/crossdev
index 8290c12..f708b95 100755
--- a/crossdev
+++ b/crossdev
@@ -12,9 +12,15 @@ if [[ ${ROOT:-/} != "/" ]] ; then
 	exit 2
 fi
 
+EPREFIX="/home/benda/gnto"
+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then
+	EPREFIX=""
+fi
+
+: ${PORTAGE_CONFIGROOT:="${EPREFIX}"}
 CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
 
-source /etc/init.d/functions.sh || exit 1
+source "${EPREFIX}"/etc/init.d/functions.sh || exit 1
 esyslog() { :; }
 die_logs() {
 	echo
@@ -316,7 +322,7 @@ setup_portage_vars() {
 	CROSSDEV_OVERLAY=${CROSSDEV_OVERLAY%% *}
 
 	# make sure we have a valid logdir
-	: ${PORT_LOGDIR:=/var/log/portage}
+	: ${PORT_LOGDIR:=${EPREFIX}/var/log/portage}
 	mkdir -p "${PORT_LOGDIR}"
 }
 
@@ -337,13 +343,13 @@ uninstall() {
 	done
 	rm -rf "${CONFIGROOT}"/env/cross-${CTARGET}
 	rmdir "${CONFIGROOT}"/env 2>/dev/null
-	rm -f /etc/revdep-rebuild/05cross-${CTARGET}
-	rmdir /etc/revdep-rebuild 2>/dev/null
+	rm -f "${EPREFIX}"/etc/revdep-rebuild/05cross-${CTARGET}
+	rmdir "${EPREFIX}"/etc/revdep-rebuild 2>/dev/null
 
-	rmdir /var/db/pkg/cross-${CTARGET} 2>/dev/null
-	if [[ -d /var/db/pkg/cross-${CTARGET} ]] ; then
+	rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET} 2>/dev/null
+	if [[ -d ${EPREFIX}/var/db/pkg/cross-${CTARGET} ]] ; then
 		export CLEAN_DELAY=0
-		cd /var/db/pkg
+		cd "${EPREFIX}"/var/db/pkg
 		local pkgs=( cross-${CTARGET}/* )
 		emerge -qC ${pkgs[@]/#/=} || exit 1
 	else
@@ -356,29 +362,29 @@ uninstall() {
 		gcc-{ar,nm,ranlib} gccbug gprof ld nm objcopy objdump \
 		ranlib readelf size strings strip windmc windres
 	do
-		rm -f /usr/bin/${CTARGET}-${f} /usr/${CTARGET}/bin/${f}
+		rm -f "${EPREFIX}"/usr/bin/${CTARGET}-${f} "${EPREFIX}"/usr/${CTARGET}/bin/${f}
 	done
-	rm -f /usr/${CTARGET}/{sys-include,usr}
-	rmdir /usr/${CTARGET}/{include/asm,include} 2>/dev/null
-	rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov}
-	rm -f /etc/env.d/{binutils,gcc}/config-${CTARGET}
+	rm -f "${EPREFIX}"/usr/${CTARGET}/{sys-include,usr}
+	rmdir "${EPREFIX}"/usr/${CTARGET}/{include/asm,include} 2>/dev/null
+	rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{gcc,{c,g}++,cpp,gfortran,gcov}
+	rm -f "${EPREFIX}"/etc/env.d/{binutils,gcc}/config-${CTARGET}
 
 	# clean out files from crossdev itself
-	[[ -e /var/db/pkg/cross-${CTARGET} ]] && rmdir /var/db/pkg/cross-${CTARGET}
-	rm -f /usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} /usr/bin/emerge-${CTARGET}
+	[[ -e ${EPREFIX}/var/db/pkg/cross-${CTARGET} ]] && rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET}
+	rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} "${EPREFIX}"/usr/bin/emerge-${CTARGET}
 
 	for f in make.{conf,globals,profile} ; do
-		f="/usr/${CTARGET}/etc/${f}"
+		f="${EPREFIX}/usr/${CTARGET}/etc/${f}"
 		[[ -L ${f} ]] && rm -f ${f}
-		f="/usr/${CTARGET}/etc/portage/${f##*/}"
+		f="${EPREFIX}/usr/${CTARGET}/etc/portage/${f##*/}"
 		[[ -L ${f} ]] && rm -f ${f}
 	done
-	find /usr/share/crossdev/etc/ -type f | \
+	find "${EPREFIX}"/usr/share/crossdev/etc/ -type f | \
 	while read f ; do
 		f1=${f}
 		[[ ! -e ${f1} ]] && continue
 		m1=$(set -- `md5sum ${f1}`; echo $1)
-		f2=/usr/${CTARGET}${f#/usr/share/crossdev}
+		f2=${EPREFIX}/usr/${CTARGET}${f#/usr/share/crossdev}
 		[[ ! -e ${f2} ]] && continue
 		m2=$(set -- `md5sum ${f2}`; echo $1)
 		if [[ ${m1} == ${m2} ]] ; then
@@ -387,7 +393,7 @@ uninstall() {
 	done
 
 	# clean out the sysroot, prompting the user if need be
-	for d in /usr/lib/gcc{,-lib}/${CTARGET} /usr/${CTARGET} ; do
+	for d in "${EPREFIX}"/usr/lib/gcc{,-lib}/${CTARGET} "${EPREFIX}"/usr/${CTARGET} ; do
 		if [[ ! -d ${d} ]] ; then
 			rm -f "${d}"
 		else
@@ -441,9 +447,9 @@ hr() {
 			|| c=${c##* }
 	fi
 	local ext=${1:-  _  -  ~  -}
-	local sext=${ext//?/ }
+	local sext=${ext/?/ }
 	local br=$(printf "%$((c + ${#ext}))s")
-	local banner=${br//${sext}/${ext}}
+	local banner=${br/${sext}/${ext}}
 	echo "${banner:0:${c}}"
 }
 ver_get_op() {
@@ -602,7 +608,7 @@ show_target_cfg() {
 setup_portage_vars
 if [[ -z ${CROSSDEV_OVERLAY} ]] ; then
 	eerror "You need to specify an output overlay.  Please use --ov-output or set"
-	eerror "PORTDIR_OVERLAY in your make.conf.  A standard setting is: /usr/local/portage"
+	eerror "PORTDIR_OVERLAY in your make.conf.  A standard setting is: ${EPREFIX}/usr/local/portage"
 	exit 1
 fi
 
@@ -987,21 +993,21 @@ done
 set_metadata
 
 # filter out revdep rebuild stuff #182601
-mkdir -p /etc/revdep-rebuild
-echo "SEARCH_DIRS_MASK=/usr/${CTARGET}" > /etc/revdep-rebuild/05cross-${CTARGET}
+mkdir -p "${EPREFIX}"/etc/revdep-rebuild
+echo "SEARCH_DIRS_MASK=${EPREFIX}/usr/${CTARGET}" > "${EPREFIX}"/etc/revdep-rebuild/05cross-${CTARGET}
 
 hr
 
 #######################################
 ### Create links for helper scripts ###
 
-mkdir -p /usr/${CTARGET}
+mkdir -p "${EPREFIX}"/usr/${CTARGET}
 emerge-wrapper --target ${CTARGET} --init || exit 1
 
 #################
 emerged_with_use() {
 	local pkg=$1 use=$2
-	grep -qs ${use} /var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
+	grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE
 }
 set_eopts_on_pkg_status() {
 	emerged_with_use "$@" \
diff --git a/wrappers/Makefile b/wrappers/Makefile
index eaa4115..a2bb3bd 100644
--- a/wrappers/Makefile
+++ b/wrappers/Makefile
@@ -9,6 +9,9 @@ SITE = $(PREFIX)/share/crossdev/include/site
 TOPDIR =
 
 all:
+	sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" cross-emerge
+	sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" emerge-wrapper
+	sed -i -e "s,@GENTOO_PORTAGE_EPREFIX@,$(EPREFIX),g" etc/portage/make.conf
 
 install:
 	$(INSTALL_DIR) $(DESTDIR)/$(PREFIX)/bin/ $(DESTDIR)/$(SITE)
diff --git a/wrappers/cross-emerge b/wrappers/cross-emerge
index 7af770b..fad6fba 100755
--- a/wrappers/cross-emerge
+++ b/wrappers/cross-emerge
@@ -9,7 +9,7 @@ if [ -z "${CHOST}" ] ; then
 fi
 export CHOST
 
-: ${SYSROOT=/usr/${CHOST}}
+: ${SYSROOT=@GENTOO_PORTAGE_EPREFIX@/usr/${CHOST}}
 : ${PORTAGE_CONFIGROOT=${SYSROOT}}
 export SYSROOT PORTAGE_CONFIGROOT
 
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper
index be81f95..d641799 100755
--- a/wrappers/emerge-wrapper
+++ b/wrappers/emerge-wrapper
@@ -96,7 +96,7 @@ cross_wrap_bin()
 
 cross_wrap()
 {
-	SYSROOT=/usr/${CHOST}
+	SYSROOT=@GENTOO_PORTAGE_EPREFIX@/usr/${CHOST}
 	cross_wrap_bin "$@" || return $?
 	if [[ -d ${SYSROOT} ]] && [[ ! -d ${SYSROOT}/etc ]] ; then
 		cross_wrap_etc "$@"
@@ -120,7 +120,7 @@ cross_init()
 	# recommended anymore ...
 	[[ ${0##*/} != emerge-wrapper ]] && err "I wont understand things"
 
-	for CHOST in `find /usr/lib/gcc -maxdepth 1 -mindepth 1 -type d` ; do
+	for CHOST in `find @GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc -maxdepth 1 -mindepth 1 -type d` ; do
 		CHOST=${CHOST##*/}
 		[[ ${CHOST} == ${CBUILD} ]] && continue
 		type -P -- ${CHOST}-gcc >/dev/null || continue
diff --git a/wrappers/etc/portage/make.conf b/wrappers/etc/portage/make.conf
index 82e489b..460926f 100644
--- a/wrappers/etc/portage/make.conf
+++ b/wrappers/etc/portage/make.conf
@@ -5,7 +5,7 @@ ARCH=__ARCH__
 HOSTCC=__CBUILD__-gcc
 E_MACHINE=__E_MACHINE__
 
-ROOT=/usr/${CHOST}/
+ROOT=@GENTOO_PORTAGE_EPREFIX@/usr/${CHOST}/
 
 ACCEPT_KEYWORDS="__ARCH__ ~__ARCH__"
 
-- 
1.8.3.2