commit: 4d77d571a7fbc96fc1c2fee2f8709eee9c73010d Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Mar 28 06:41:56 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Mar 28 07:39:12 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4d77d571
targets: Remove redundancy filenames Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/base/stagebase.py | 3 +-- targets/embedded/{embedded-chroot.sh => chroot.sh} | 0 targets/embedded/{embedded-controller.sh => controller.sh} | 4 ++-- targets/embedded/{embedded-fs-runscript.sh => fs-runscript.sh} | 0 .../{embedded-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/grp/{grp-chroot.sh => chroot.sh} | 0 targets/grp/{grp-controller.sh => controller.sh} | 0 targets/grp/{grp-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/livecd-stage1/{livecd-stage1-chroot.sh => chroot.sh} | 0 .../{livecd-stage1-controller.sh => controller.sh} | 2 +- .../{livecd-stage1-preclean-chroot.sh => preclean-chroot.sh} | 0 .../{livecd-stage2-controller.sh => controller.sh} | 0 targets/netboot/{netboot-chroot.sh => chroot.sh} | 0 targets/netboot/{netboot-combine.sh => combine.sh} | 0 targets/netboot/{netboot-controller.sh => controller.sh} | 10 +++++----- targets/netboot/{netboot-image.sh => image.sh} | 0 targets/netboot2/{netboot2-controller.sh => controller.sh} | 4 ++-- targets/netboot2/{netboot2-copyfile.sh => copyfile.sh} | 0 targets/netboot2/{netboot2-pkg.sh => pkg.sh} | 0 targets/stage1/{stage1-chroot.sh => chroot.sh} | 0 targets/stage1/{stage1-controller.sh => controller.sh} | 4 ++-- .../stage1/{stage1-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/stage2/{stage2-chroot.sh => chroot.sh} | 0 targets/stage2/{stage2-controller.sh => controller.sh} | 4 ++-- .../stage2/{stage2-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/stage3/{stage3-chroot.sh => chroot.sh} | 0 targets/stage3/{stage3-controller.sh => controller.sh} | 4 ++-- .../stage3/{stage3-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/stage4/{stage4-chroot.sh => chroot.sh} | 0 targets/stage4/{stage4-controller.sh => controller.sh} | 4 ++-- .../stage4/{stage4-preclean-chroot.sh => preclean-chroot.sh} | 0 targets/tinderbox/{tinderbox-chroot.sh => chroot.sh} | 0 targets/tinderbox/{tinderbox-controller.sh => controller.sh} | 0 .../{tinderbox-preclean-chroot.sh => preclean-chroot.sh} | 0 34 files changed, 19 insertions(+), 20 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0a825700..939e03e2 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -522,8 +522,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_controller_file(self): self.settings["controller_file"] = normpath(self.settings["sharedir"] + - "/targets/" + self.settings["target"] + "/" + self.settings["target"] - + "-controller.sh") + "/targets/" + self.settings["target"] + "/" + "controller.sh") def set_iso_volume_id(self): if self.settings["spec_prefix"] + "/volid" in self.settings: diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/chroot.sh similarity index 100% rename from targets/embedded/embedded-chroot.sh rename to targets/embedded/chroot.sh diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/controller.sh similarity index 93% rename from targets/embedded/embedded-controller.sh rename to targets/embedded/controller.sh index c0b62ea3..7501d694 100755 --- a/targets/embedded/embedded-controller.sh +++ b/targets/embedded/controller.sh @@ -11,7 +11,7 @@ case ${1} in shift export clst_packages="$*" exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${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_shdir}/embedded/embedded-fs-runscript.sh \ +# ${clst_shdir}/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 \ diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/fs-runscript.sh similarity index 100% rename from targets/embedded/embedded-fs-runscript.sh rename to targets/embedded/fs-runscript.sh diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/preclean-chroot.sh similarity index 100% rename from targets/embedded/embedded-preclean-chroot.sh rename to targets/embedded/preclean-chroot.sh diff --git a/targets/grp/grp-chroot.sh b/targets/grp/chroot.sh similarity index 100% rename from targets/grp/grp-chroot.sh rename to targets/grp/chroot.sh diff --git a/targets/grp/grp-controller.sh b/targets/grp/controller.sh similarity index 100% rename from targets/grp/grp-controller.sh rename to targets/grp/controller.sh diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/preclean-chroot.sh similarity index 100% rename from targets/grp/grp-preclean-chroot.sh rename to targets/grp/preclean-chroot.sh diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/chroot.sh similarity index 100% rename from targets/livecd-stage1/livecd-stage1-chroot.sh rename to targets/livecd-stage1/chroot.sh diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/controller.sh similarity index 87% rename from targets/livecd-stage1/livecd-stage1-controller.sh rename to targets/livecd-stage1/controller.sh index 7bf3bce1..ced2634e 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/controller.sh @@ -10,7 +10,7 @@ case $1 in export clst_packages="$*" mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/chroot.sh echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt ;; diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/preclean-chroot.sh similarity index 100% rename from targets/livecd-stage1/livecd-stage1-preclean-chroot.sh rename to targets/livecd-stage1/preclean-chroot.sh diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/controller.sh similarity index 100% rename from targets/livecd-stage2/livecd-stage2-controller.sh rename to targets/livecd-stage2/controller.sh diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/chroot.sh similarity index 100% rename from targets/netboot/netboot-chroot.sh rename to targets/netboot/chroot.sh diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/combine.sh similarity index 100% rename from targets/netboot/netboot-combine.sh rename to targets/netboot/combine.sh diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/controller.sh similarity index 85% rename from targets/netboot/netboot-controller.sh rename to targets/netboot/controller.sh index 93feb266..7d327325 100755 --- a/targets/netboot/netboot-controller.sh +++ b/targets/netboot/controller.sh @@ -11,7 +11,7 @@ case ${1} in clst_root_path="/" \ clst_packages="$*" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/chroot.sh ;; busybox) @@ -30,7 +30,7 @@ case ${1} in clst_myemergeopts="${clst_myemergeopts} -O" \ clst_packages="busybox" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/chroot.sh ;; pre-kmerge) @@ -61,15 +61,15 @@ case ${1} in clst_myemergeopts="${clst_myemergeopts} --nodeps" \ clst_packages="netboot-base" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/chroot.sh clst_files="${@}" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-image.sh + ${clst_shdir}/${clst_target}/image.sh ;; finish) - ${clst_shdir}/${clst_target}/${clst_target}-combine.sh + ${clst_shdir}/${clst_target}/combine.sh ;; clean) diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/image.sh similarity index 100% rename from targets/netboot/netboot-image.sh rename to targets/netboot/image.sh diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/controller.sh similarity index 93% rename from targets/netboot2/netboot2-controller.sh rename to targets/netboot2/controller.sh index 322d9a86..6f012403 100755 --- a/targets/netboot2/netboot2-controller.sh +++ b/targets/netboot2/controller.sh @@ -10,7 +10,7 @@ case ${1} in clst_root_path="/" \ clst_packages="$*" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh + ${clst_shdir}/${clst_target}/pkg.sh ;; pre-kmerge) @@ -56,7 +56,7 @@ case ${1} in # Copy remaining files over to the initramfs target clst_files="${@}" \ exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh + ${clst_shdir}/${clst_target}/copyfile.sh ;; final) diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/copyfile.sh similarity index 100% rename from targets/netboot2/netboot2-copyfile.sh rename to targets/netboot2/copyfile.sh diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/pkg.sh similarity index 100% rename from targets/netboot2/netboot2-pkg.sh rename to targets/netboot2/pkg.sh diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/chroot.sh similarity index 100% rename from targets/stage1/stage1-chroot.sh rename to targets/stage1/chroot.sh diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/controller.sh similarity index 80% rename from targets/stage1/stage1-controller.sh rename to targets/stage1/controller.sh index ac813de0..f9dd4b9b 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/controller.sh @@ -18,12 +18,12 @@ case "$1" in # Enter chroot, execute our build script exec_in_chroot \ - "${clst_shdir}/${clst_target}/${clst_target}-chroot.sh" \ + "${clst_shdir}/${clst_target}/chroot.sh" \ || exit 1 ;; preclean) - exec_in_chroot "${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh" || exit 1 + exec_in_chroot "${clst_shdir}/${clst_target}/preclean-chroot.sh" || exit 1 ;; clean) diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/preclean-chroot.sh similarity index 100% rename from targets/stage1/stage1-preclean-chroot.sh rename to targets/stage1/preclean-chroot.sh diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/chroot.sh similarity index 100% rename from targets/stage2/stage2-chroot.sh rename to targets/stage2/chroot.sh diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/controller.sh similarity index 73% rename from targets/stage2/stage2-controller.sh rename to targets/stage2/controller.sh index 25e51208..efa57648 100755 --- a/targets/stage2/stage2-controller.sh +++ b/targets/stage2/controller.sh @@ -13,11 +13,11 @@ case $1 in shift export clst_packages="$*" exec_in_chroot \ - ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + ${clst_shdir}/${clst_target}/chroot.sh ;; preclean) - exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/preclean-chroot.sh ;; clean) diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/preclean-chroot.sh similarity index 100% rename from targets/stage2/stage2-preclean-chroot.sh rename to targets/stage2/preclean-chroot.sh diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/chroot.sh similarity index 100% rename from targets/stage3/stage3-chroot.sh rename to targets/stage3/chroot.sh diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/controller.sh similarity index 70% rename from targets/stage3/stage3-controller.sh rename to targets/stage3/controller.sh index df1479ea..f1ca6883 100755 --- a/targets/stage3/stage3-controller.sh +++ b/targets/stage3/controller.sh @@ -12,11 +12,11 @@ case $1 in run) shift export clst_packages="$*" - exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/chroot.sh ;; preclean) - exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/preclean-chroot.sh ;; clean) diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/preclean-chroot.sh similarity index 100% rename from targets/stage3/stage3-preclean-chroot.sh rename to targets/stage3/preclean-chroot.sh diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/chroot.sh similarity index 100% rename from targets/stage4/stage4-chroot.sh rename to targets/stage4/chroot.sh diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/controller.sh similarity index 91% rename from targets/stage4/stage4-controller.sh rename to targets/stage4/controller.sh index d42f302f..d3cc612e 100755 --- a/targets/stage4/stage4-controller.sh +++ b/targets/stage4/controller.sh @@ -37,11 +37,11 @@ case $1 in build_packages) shift export clst_packages="$*" - exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh + exec_in_chroot ${clst_shdir}/${clst_target}/chroot.sh ;; preclean) - exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path} + exec_in_chroot ${clst_shdir}/${clst_target}/preclean-chroot.sh ${clst_root_path} ;; rc-update) diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/preclean-chroot.sh similarity index 100% rename from targets/stage4/stage4-preclean-chroot.sh rename to targets/stage4/preclean-chroot.sh diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/chroot.sh similarity index 100% rename from targets/tinderbox/tinderbox-chroot.sh rename to targets/tinderbox/chroot.sh diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/controller.sh similarity index 100% rename from targets/tinderbox/tinderbox-controller.sh rename to targets/tinderbox/controller.sh diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/preclean-chroot.sh similarity index 100% rename from targets/tinderbox/tinderbox-preclean-chroot.sh rename to targets/tinderbox/preclean-chroot.sh