Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/, wrappers/etc/portage/
Date: Mon, 23 Dec 2013 02:54:41
Message-Id: 1387767261.bf32d4ed37582c92624317f78c3cb011f019093c.vapier@gentoo
1 commit: bf32d4ed37582c92624317f78c3cb011f019093c
2 Author: Joakim Tjernlund <Joakim.Tjernlund <AT> transmode <DOT> se>
3 AuthorDate: Tue Dec 10 16:33:42 2013 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 23 02:54:21 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/crossdev.git;a=commit;h=bf32d4ed
7
8 make.profile: move from /etc to /etc/portage
9
10 This is where make.profile belongs in current portage
11
12 ---
13 wrappers/Makefile | 2 +-
14 wrappers/etc/portage/bashrc | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/wrappers/Makefile b/wrappers/Makefile
18 index eaa4115..144ecc1 100644
19 --- a/wrappers/Makefile
20 +++ b/wrappers/Makefile
21 @@ -18,6 +18,6 @@ install:
22 sed -i -e s@__PREFIX__@$(PREFIX)@g $(DESTDIR)/$(PREFIX)/bin/emerge-wrapper
23 sed -i -e s@__TOPDIR__@$(SITE)@g $(DESTDIR)/$(SITE)/config.site
24 mv $(DESTDIR)/$(SITE)/config.site $(DESTDIR)/$(PREFIX)/share/
25 - ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/make.profile
26 + ln -sf $(PORTDIR)/profiles/embedded $(DESTDIR)/$(PREFIX)/share/crossdev/etc/portage/make.profile
27
28 .PHONY: all install
29
30 diff --git a/wrappers/etc/portage/bashrc b/wrappers/etc/portage/bashrc
31 index e78b634..4ca2768 100644
32 --- a/wrappers/etc/portage/bashrc
33 +++ b/wrappers/etc/portage/bashrc
34 @@ -1,4 +1,4 @@
35 -[[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc
36 +[[ $(basename $(readlink -f $PORTAGE_CONFIGROOT/etc/portage/make.profile)) == "embedded" ]] && . ${PORTDIR}/profiles/base/profile.bashrc
37
38 post_src_install() {
39 [[ -d ${D} ]] || return 0