* [gentoo-catalyst] Bringing a consistent format to paths patch #2
@ 2014-01-11 19:45 Brian Dolbec
2014-01-11 19:45 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
0 siblings, 1 reply; 6+ messages in thread
From: Brian Dolbec @ 2014-01-11 19:45 UTC (permalink / raw
To: gentoo-catalyst
This follows along the same as the previous patch. Remove an
extra slash in the final path.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-catalyst] [PATCH] Remove an extra slash in the path.
2014-01-11 19:45 [gentoo-catalyst] Bringing a consistent format to paths patch #2 Brian Dolbec
@ 2014-01-11 19:45 ` Brian Dolbec
2014-01-11 20:48 ` [gentoo-catalyst] " W. Trevor King
2014-01-12 1:31 ` [gentoo-catalyst] Brian Dolbec
0 siblings, 2 replies; 6+ messages in thread
From: Brian Dolbec @ 2014-01-11 19:45 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Brian Dolbec
---
targets/stage1/stage1-controller.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3671095..d38ac73 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -14,7 +14,7 @@ case $1 in
install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
# Setup make.conf and make.profile link in "ROOT in chroot":
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf ${clst_root_path}/etc/portage
# Enter chroot, execute our build script
exec_in_chroot \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-catalyst] Re: [PATCH] Remove an extra slash in the path.
2014-01-11 19:45 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
@ 2014-01-11 20:48 ` W. Trevor King
2014-01-12 1:31 ` [gentoo-catalyst] Brian Dolbec
1 sibling, 0 replies; 6+ messages in thread
From: W. Trevor King @ 2014-01-11 20:48 UTC (permalink / raw
To: gentoo-catalyst
[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]
On Sat, Jan 11, 2014 at 11:45:23AM -0800, Brian Dolbec wrote:
> diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
> index 3671095..d38ac73 100755
> --- a/targets/stage1/stage1-controller.sh
> +++ b/targets/stage1/stage1-controller.sh
> @@ -14,7 +14,7 @@ case $1 in
> install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
>
> # Setup make.conf and make.profile link in "ROOT in chroot":
> - copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
> + copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf ${clst_root_path}/etc/portage
This looks good to me. clst_root_path should always be an absolute
path, and I can get through stage1 with this patch applied. However,
shouldn't the previous few lines be:
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
install -d ${clst_chroot_path}${clst_root_path}/etc/portage
Without the extra slash between clst_chroot_path and clst_root_path?
I'm fine with leaving those for a separate patch if we just want to
apply this one as-is.
Cheers,
Trevor
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-catalyst]
2014-01-11 19:45 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
2014-01-11 20:48 ` [gentoo-catalyst] " W. Trevor King
@ 2014-01-12 1:31 ` Brian Dolbec
2014-01-12 1:31 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
1 sibling, 1 reply; 6+ messages in thread
From: Brian Dolbec @ 2014-01-12 1:31 UTC (permalink / raw
To: gentoo-catalyst
This update adds the two other paths mentioned.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-catalyst] [PATCH] Remove an extra slash in the path.
2014-01-12 1:31 ` [gentoo-catalyst] Brian Dolbec
@ 2014-01-12 1:31 ` Brian Dolbec
2014-01-12 1:59 ` [gentoo-catalyst] " W. Trevor King
0 siblings, 1 reply; 6+ messages in thread
From: Brian Dolbec @ 2014-01-12 1:31 UTC (permalink / raw
To: gentoo-catalyst; +Cc: Brian Dolbec
---
targets/stage1/stage1-controller.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3671095..8dbd16b 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -10,11 +10,11 @@ case $1 in
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
- install -d ${clst_chroot_path}/${clst_root_path}/etc
- install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
+ install -d ${clst_chroot_path}${clst_root_path}/etc
+ install -d ${clst_chroot_path}${clst_root_path}/etc/portage
# Setup make.conf and make.profile link in "ROOT in chroot":
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf ${clst_root_path}/etc/portage
# Enter chroot, execute our build script
exec_in_chroot \
--
1.8.3.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-catalyst] Re: [PATCH] Remove an extra slash in the path.
2014-01-12 1:31 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
@ 2014-01-12 1:59 ` W. Trevor King
0 siblings, 0 replies; 6+ messages in thread
From: W. Trevor King @ 2014-01-12 1:59 UTC (permalink / raw
To: gentoo-catalyst
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
On Sat, Jan 11, 2014 at 05:31:12PM -0800, Brian Dolbec wrote:
> - install -d ${clst_chroot_path}/${clst_root_path}/etc
> - install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
> + install -d ${clst_chroot_path}${clst_root_path}/etc
> + install -d ${clst_chroot_path}${clst_root_path}/etc/portage
>
> # Setup make.conf and make.profile link in "ROOT in chroot":
> - copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
> + copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf ${clst_root_path}/etc/portage
Looks good to me, and it successfully builds my stage1.
Cheers,
Trevor
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-12 1:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-11 19:45 [gentoo-catalyst] Bringing a consistent format to paths patch #2 Brian Dolbec
2014-01-11 19:45 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
2014-01-11 20:48 ` [gentoo-catalyst] " W. Trevor King
2014-01-12 1:31 ` [gentoo-catalyst] Brian Dolbec
2014-01-12 1:31 ` [gentoo-catalyst] [PATCH] Remove an extra slash in the path Brian Dolbec
2014-01-12 1:59 ` [gentoo-catalyst] " W. Trevor King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox