[gentoo-catalyst] Bringing a consistent format to paths patch #2

[gentoo-catalyst] Bringing a consistent format to paths patch #2

[Brian Dolbec]

This follows along the same as the previous patch.  Remove an 
extra slash in the final path.

[gentoo-catalyst] [PATCH] Remove an extra slash in the path.

[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

[gentoo-catalyst] Re: [PATCH] Remove an extra slash in the path.

[W. Trevor King]

[-- 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 --]

[gentoo-catalyst]

[Brian Dolbec]

This update adds the two other paths mentioned.

[gentoo-catalyst] [PATCH] Remove an extra slash in the path.

[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

[gentoo-catalyst] Re: [PATCH] Remove an extra slash in the path.

[W. Trevor King]

[-- 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 --]

[gentoo-catalyst]

[Axel Kerbec]

[gentoo-catalyst]

[Luca Casagrande]

remove
-- 
"E' molto più bello sapere qualcosa di tutto, che tutto di una cosa (Blaise 
Pascal)."

GENTOO-GIS Development Team
jabber: casagrande@jabber.linux.it

 

-- 
gentoo-catalyst@gentoo.org mailing list

[gentoo-catalyst]

[adam]

help

-- 
gentoo-catalyst@gentoo.org mailing list

Re: [gentoo-catalyst]

[adam]

Sorry folks, I thought the list manager software would respond with a
list of options.  ;-}

On Fri, 2005-04-22 at 11:01 -0400, adam wrote:
> help
> 


-- 
gentoo-catalyst@gentoo.org mailing list

Re: [gentoo-catalyst]

[James Dio]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

And I was about to call the insane asylum. 

On Fri, 2005-04-22 at 11:03 -0400, adam wrote:
> Sorry folks, I thought the list manager software would respond with a
> list of options.  ;-}
> 
> On Fri, 2005-04-22 at 11:01 -0400, adam wrote:
> > help
> > 
> 
> 
-- 
James Dio
www.psunit.com
jim@psunit.com      #Normal EMAIL
jim-list@psunit.com #Mailing list

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]