* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-20 0:29 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-20 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 997b0c63affc03bf85dc48d8a9e694d3836543f4
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Dec 20 00:14:41 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=997b0c63
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-20 0:48 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-20 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 94b80df18ac2d8c63d466fd26850fec14ece4197
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Dec 20 00:47:09 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=94b80df1
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-30 1:44 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-30 1:44 UTC (permalink / raw
To: gentoo-commits
commit: bf9d5e2035f78d03b3dfc9ce95a11169fa9a0be7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Dec 29 18:54:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bf9d5e20
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-31 4:22 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-31 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 4040d63861c5040e2baff90415f57034146b14f2
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 03:58:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4040d638
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-31 4:39 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-31 4:39 UTC (permalink / raw
To: gentoo-commits
commit: 2cb8017bedfe14851d39469a8799d9062caf20f5
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 04:33:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2cb8017b
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-31 4:48 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-31 4:48 UTC (permalink / raw
To: gentoo-commits
commit: dd63f7107d0bfd0c45ca538539fd4ce065e3160e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 04:40:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dd63f710
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2013-12-31 18:14 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2013-12-31 18:14 UTC (permalink / raw
To: gentoo-commits
commit: e9468ebfd4dd3e97f6b8c2fb9db300b6e0f6905a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 17:59:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e9468ebf
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-01-02 0:04 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-01-02 0:04 UTC (permalink / raw
To: gentoo-commits
commit: 9e8846149f2bf11fba461016cc008ea5a616d8b3
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jan 1 23:55:43 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9e884614
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-01-03 5:03 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-01-03 5:03 UTC (permalink / raw
To: gentoo-commits
commit: 9f94e4d47492af7be5cace67c04d6aa82bfc40a7
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan 3 04:39:29 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9f94e4d4
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-01-03 6:12 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-01-03 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 4347b455362ef6c1e9b881cfb2dd55a7286ec7a4
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan 3 05:41:26 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4347b455
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-01-03 6:41 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-01-03 6:41 UTC (permalink / raw
To: gentoo-commits
commit: fd5c154ddf862c9582a4cba1e5468883f6b987ad
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan 3 06:40:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fd5c154d
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
2014-02-07 23:24 [gentoo-commits] proj/catalyst:master " Brian Dolbec
@ 2014-01-22 15:52 ` Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-01-22 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 70f7cfcc837b1097b52dc20765cf448cb70bb879
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 23:58:58 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Jan 11 05:17:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=70f7cfcc
chmod +x all sh scripts so they can run from the git checkout
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
^ permalink raw reply [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-06-14 5:58 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-06-14 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 771f5c4f294e5a5614a95679ed86b9ef4bf9ad0e
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Jun 14 05:46:46 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=771f5c4f
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 8dbd16b..56e1375 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..268b478 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-06-15 14:56 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-06-15 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 55d4652bb094f45dc259c31131104c710f32549c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Jun 15 14:05:53 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=55d4652b
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 8dbd16b..56e1375 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..268b478 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-09-02 2:43 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-09-02 2:43 UTC (permalink / raw
To: gentoo-commits
commit: 2770c86800ae2e655e1dc8dfda0e611d9b5efcfb
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 2 02:13:44 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2770c868
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 1b2eee2..6fab293 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-09-02 5:54 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-09-02 5:54 UTC (permalink / raw
To: gentoo-commits
commit: 031805814914a9b4fe4326ecf9021343fb8e6328
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 2 05:51:55 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=03180581
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index d029545..09a121d 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-09-02 7:12 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-09-02 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 73f7d1249117678abcc0edfdd7955a1f3001c443
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 2 06:31:59 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=73f7d124
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index d029545..09a121d 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-09-02 23:10 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-09-02 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 94eb393345b85738a510bd4c45d5cf20b34dc85a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep 2 23:08:03 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=94eb3933
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index d029545..09a121d 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, ...
@ 2014-09-11 3:08 Brian Dolbec
0 siblings, 0 replies; 19+ messages in thread
From: Brian Dolbec @ 2014-09-11 3:08 UTC (permalink / raw
To: gentoo-commits
commit: 0bf73c19ecb22b50dee867180be6d45339b6d77c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:09:01 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 03:05:38 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0bf73c19
Make shdir a complete path to ease it's use.
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
etc/catalyst.conf | 8 ++++++--
targets/embedded/embedded-controller.sh | 22 ++++++++++-----------
targets/grp/grp-controller.sh | 6 +++---
targets/livecd-stage1/livecd-stage1-controller.sh | 4 ++--
targets/livecd-stage2/livecd-stage2-controller.sh | 22 ++++++++++-----------
targets/netboot/netboot-combine.sh | 6 +++---
targets/netboot/netboot-controller.sh | 24 +++++++++++------------
targets/netboot2/netboot2-controller.sh | 16 +++++++--------
targets/stage1/stage1-controller.sh | 8 ++++----
targets/stage2/stage2-controller.sh | 6 +++---
targets/stage3/stage3-controller.sh | 6 +++---
targets/stage4/stage4-controller.sh | 22 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index d029545..09a121d 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2014-09-11 3:08 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-31 4:39 [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/livecd-stage1/, targets/stage3/, targets/stage1/, Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2014-09-11 3:08 Brian Dolbec
2014-09-02 23:10 Brian Dolbec
2014-09-02 7:12 Brian Dolbec
2014-09-02 5:54 Brian Dolbec
2014-09-02 2:43 Brian Dolbec
2014-06-15 14:56 Brian Dolbec
2014-06-14 5:58 Brian Dolbec
2014-02-07 23:24 [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-01-22 15:52 ` [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-01-03 6:41 Brian Dolbec
2014-01-03 6:12 Brian Dolbec
2014-01-03 5:03 Brian Dolbec
2014-01-02 0:04 Brian Dolbec
2013-12-31 18:14 Brian Dolbec
2013-12-31 4:48 Brian Dolbec
2013-12-31 4:22 Brian Dolbec
2013-12-30 1:44 Brian Dolbec
2013-12-20 0:48 Brian Dolbec
2013-12-20 0:29 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox