Rename netboot2 target to netboot

diff --git a/ChangeLog b/ChangeLog
index ae3ebf9aa3b559a423843f06c65415068059a6de..cdc620163865d9970f5dc7bf0248517aa71169d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  -examples/netboot2_template.spec, +examples/netboot_template.spec,
+  +modules/catalyst/target/netboot.py, -modules/catalyst/target/netboot2.py,
+  +targets/netboot/nb-busybox.cf, +targets/netboot/netboot-controller.sh,
+  +targets/netboot/netboot-copyfile.sh, +targets/netboot/netboot-pkg.sh,
+  -targets/netboot2/nb-busybox.cf, -targets/netboot2/netboot2-controller.sh,
+  -targets/netboot2/netboot2-copyfile.sh, -targets/netboot2/netboot2-pkg.sh,
+  targets/support/kmerge.sh, +targets/support/netboot-final.sh,
+  -targets/support/netboot2-final.sh:
+  Rename netboot2 target to netboot
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/lock.py:
   Cleanups to make pychecker happy

diff --git a/examples/netboot2_template.spec b/examples/netboot_template.spec
similarity index 88%
rename from examples/netboot2_template.spec
rename to examples/netboot_template.spec
index 987cf9ed627fc51c0dd2a73184d20cf915fc6bbd..4f76b8ff44ba605c05e3356342bc114ef5eeaedc 100644 (file)
--- a/examples/netboot2_template.spec
+++ b/examples/netboot_template.spec
@@ -1,6 +1,6 @@
 subarch: mips3
 version_stamp: 2006.0
-target: netboot2
+target: netboot
 rel_type: default
 profile: uclibc/mips
 snapshot: 20060107
@@ -41,16 +41,16 @@ boot/kernel/ip28r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gn
 boot/kernel/ip30r10k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
 boot/kernel/ip32r5k/gk_kernargs: --kernel-cross-compile=mips64-unknown-linux-gnu- --makeopts=-j2
 
-netboot2/builddate: 20060107
-netboot2/busybox_config: /usr/share/genkernel/mips/nb-busybox.cf
+netboot/builddate: 20060107
+netboot/busybox_config: /usr/share/genkernel/mips/nb-busybox.cf
 
-netboot2/use:
+netboot/use:
        -*
        multicall
        readline
        ssl
 
-netboot2/packages:
+netboot/packages:
        com_err
        dropbear
        dvhtool
@@ -73,14 +73,14 @@ netboot2/packages:
        wget
        xfsprogs
 
-netboot2/packages/com_err/files:
+netboot/packages/com_err/files:
        /lib/libcom_err.so
        /lib/libcom_err.so.2
        /lib/libcom_err.so.2.1
        /usr/bin/compile_et
        /usr/lib/libcom_err.so
 
-netboot2/packages/dropbear/files:
+netboot/packages/dropbear/files:
        /usr/bin/dbclient
        /usr/bin/dbscp
        /usr/bin/dropbearconvert
@@ -88,10 +88,10 @@ netboot2/packages/dropbear/files:
        /usr/bin/dropbearmulti
        /usr/sbin/dropbear
 
-netboot2/packages/dvhtool/files:
+netboot/packages/dvhtool/files:
        /usr/sbin/dvhtool
 
-netboot2/packages/e2fsprogs/files:
+netboot/packages/e2fsprogs/files:
        /bin/chattr
        /bin/lsattr
        /bin/uuidgen
@@ -132,23 +132,23 @@ netboot2/packages/e2fsprogs/files:
        /usr/lib/libuuid.so
        /usr/sbin/mklost+found
 
-netboot2/packages/jfsutils/files:
+netboot/packages/jfsutils/files:
        /sbin/fsck.jfs
        /sbin/jfs_fsck
        /sbin/jfs_mkfs
        /sbin/jfs_tune
        /sbin/mkfs.jfs
 
-netboot2/packages/mdadm/files:
+netboot/packages/mdadm/files:
        /etc/mdadm.conf
        /sbin/mdadm
 
-netboot2/packages/nano/files:
+netboot/packages/nano/files:
        /bin/nano
        /bin/rnano
        /usr/bin/nano
 
-netboot2/packages/ncurses/files:
+netboot/packages/ncurses/files:
        /etc/terminfo
        /lib/libcurses.so
        /lib/libncurses.so
@@ -187,7 +187,7 @@ netboot2/packages/ncurses/files:
        /usr/share/terminfo/x/xterm-color
        /usr/share/terminfo/x/xterm-xfree86
 
-netboot2/packages/openssl/files:
+netboot/packages/openssl/files:
        /usr/lib/libcrypto.so
        /usr/lib/libcrypto.so.0
        /usr/lib/libcrypto.so.0.9.7
@@ -195,38 +195,38 @@ netboot2/packages/openssl/files:
        /usr/lib/libssl.so.0
        /usr/lib/libssl.so.0.9.7
 
-netboot2/packages/popt/files:
+netboot/packages/popt/files:
        /usr/lib/libpopt.so
        /usr/lib/libpopt.so.0
        /usr/lib/libpopt.so.0.0.0
 
-netboot2/packages/portmap/files:
+netboot/packages/portmap/files:
        /sbin/portmap
 
-netboot2/packages/reiserfsprogs/files:
+netboot/packages/reiserfsprogs/files:
        /sbin/fsck.reiserfs
        /sbin/mkfs.reiserfs
        /sbin/mkreiserfs
        /sbin/reiserfsck
        /sbin/reiserfstune
 
-netboot2/packages/rsync/files:
+netboot/packages/rsync/files:
        /usr/bin/rsync
 
-netboot2/packages/sdparm/files:
+netboot/packages/sdparm/files:
        /usr/bin/sdparm
 
-netboot2/packages/ss/files:
+netboot/packages/ss/files:
        /lib/libss.so
        /lib/libss.so.2
        /lib/libss.so.2.0
        /usr/bin/mk_cmds
        /usr/lib/libss.so
 
-netboot2/packages/ttcp/files:
+netboot/packages/ttcp/files:
        /usr/bin/ttcp
 
-netboot2/packages/uclibc/files:
+netboot/packages/uclibc/files:
        /etc/ld.so.cache
        /lib/ld-uClibc-0.9.27.so
        /lib/ld-uClibc.so.0
@@ -269,7 +269,7 @@ netboot2/packages/uclibc/files:
        /usr/lib/libthread_db.so
        /usr/lib/libutil.so
 
-netboot2/packages/util-linux/files:
+netboot/packages/util-linux/files:
        /sbin/fdisk
        /sbin/mkfs
        /sbin/mkswap
@@ -279,10 +279,10 @@ netboot2/packages/util-linux/files:
        /usr/bin/setterm
        /usr/bin/whereis
 
-netboot2/packages/wget/files:
+netboot/packages/wget/files:
        /usr/bin/wget
 
-netboot2/packages/xfsprogs/files:
+netboot/packages/xfsprogs/files:
        /bin/xfs_copy
        /bin/xfs_growfs
        /bin/xfs_info

diff --git a/modules/catalyst/target/netboot2.py b/modules/catalyst/target/netboot.py
similarity index 72%
rename from modules/catalyst/target/netboot2.py
rename to modules/catalyst/target/netboot.py
index bf8e939062d65f7e03791ad296f4c9d71326c9a7..534861d2635d5c2a055faea478b451dc2f22de4b 100644 (file)
--- a/modules/catalyst/target/netboot2.py
+++ b/modules/catalyst/target/netboot.py
@@ -10,33 +10,33 @@ import catalyst.util
 from catalyst.error import *
 from catalyst.spawn import *
 
-class netboot2_target(generic_stage_target):
+class netboot_target(generic_stage_target):
        def __init__(self,spec,addlargs):
                self.required_values=[
                        "boot/kernel"
                ]
                self.valid_values=self.required_values[:]
                self.valid_values.extend([
-                       "netboot2/packages",
-                       "netboot2/use",
-                       "netboot2/extra_files",
-                       "netboot2/overlay",
-                       "netboot2/busybox_config",
-                       "netboot2/root_overlay",
-                       "netboot2/linuxrc"
+                       "netboot/packages",
+                       "netboot/use",
+                       "netboot/extra_files",
+                       "netboot/overlay",
+                       "netboot/busybox_config",
+                       "netboot/root_overlay",
+                       "netboot/linuxrc"
                ])
 
                try:
-                       if "netboot2/packages" in addlargs:
-                               if type(addlargs["netboot2/packages"]) == types.StringType:
-                                       loopy=[addlargs["netboot2/packages"]]
+                       if "netboot/packages" in addlargs:
+                               if type(addlargs["netboot/packages"]) == types.StringType:
+                                       loopy=[addlargs["netboot/packages"]]
                                else:
-                                       loopy=addlargs["netboot2/packages"]
+                                       loopy=addlargs["netboot/packages"]
 
                                for x in loopy:
-                                       self.valid_values.append("netboot2/packages/"+x+"/files")
+                                       self.valid_values.append("netboot/packages/"+x+"/files")
                except:
-                       raise CatalystError,"configuration error in netboot2/packages."
+                       raise CatalystError,"configuration error in netboot/packages."
 
                generic_stage_target.__init__(self,spec,addlargs)
                self.set_build_kernel_vars()
@@ -67,24 +67,24 @@ class netboot2_target(generic_stage_target):
                        and os.path.exists(self.settings["autoresume_path"]+"copy_files_to_image"):
                                print "Resume point detected, skipping target path setup operation..."
                else:
-                       if "netboot2/packages" in self.settings:
-                               if type(self.settings["netboot2/packages"]) == types.StringType:
-                                       loopy=[self.settings["netboot2/packages"]]
+                       if "netboot/packages" in self.settings:
+                               if type(self.settings["netboot/packages"]) == types.StringType:
+                                       loopy=[self.settings["netboot/packages"]]
                                else:
-                                       loopy=self.settings["netboot2/packages"]
+                                       loopy=self.settings["netboot/packages"]
 
                        for x in loopy:
-                               if "netboot2/packages/"+x+"/files" in self.settings:
-                                   if type(self.settings["netboot2/packages/"+x+"/files"]) == types.ListType:
-                                           myfiles.extend(self.settings["netboot2/packages/"+x+"/files"])
+                               if "netboot/packages/"+x+"/files" in self.settings:
+                                   if type(self.settings["netboot/packages/"+x+"/files"]) == types.ListType:
+                                           myfiles.extend(self.settings["netboot/packages/"+x+"/files"])
                                    else:
-                                           myfiles.append(self.settings["netboot2/packages/"+x+"/files"])
+                                           myfiles.append(self.settings["netboot/packages/"+x+"/files"])
 
-                       if "netboot2/extra_files" in self.settings:
-                               if type(self.settings["netboot2/extra_files"]) == types.ListType:
-                                       myfiles.extend(self.settings["netboot2/extra_files"])
+                       if "netboot/extra_files" in self.settings:
+                               if type(self.settings["netboot/extra_files"]) == types.ListType:
+                                       myfiles.extend(self.settings["netboot/extra_files"])
                                else:
-                                       myfiles.append(self.settings["netboot2/extra_files"])
+                                       myfiles.append(self.settings["netboot/extra_files"])
 
                        try:
                                cmd("/bin/bash "+self.settings["controller_file"]+\
@@ -100,11 +100,11 @@ class netboot2_target(generic_stage_target):
                and os.path.exists(self.settings["autoresume_path"]+"setup_overlay"):
                        print "Resume point detected, skipping setup_overlay operation..."
                else:
-                       if "netboot2/overlay" in self.settings:
-                               for x in self.settings["netboot2/overlay"]:
+                       if "netboot/overlay" in self.settings:
+                               for x in self.settings["netboot/overlay"]:
                                        if os.path.exists(x):
                                                cmd("rsync -a "+x+"/ "+\
-                                                       self.settings["chroot_path"] + self.settings["merge_path"], "netboot2/overlay: "+x+" copy failed.",env=self.env)
+                                                       self.settings["chroot_path"] + self.settings["merge_path"], "netboot/overlay: "+x+" copy failed.",env=self.env)
                                catalyst.util.touch(self.settings["autoresume_path"]+"setup_overlay")
 
        def move_kernels(self):
@@ -128,7 +128,7 @@ class netboot2_target(generic_stage_target):
                                for x in self.settings[self.settings["spec_prefix"]+"/rm"]:
                                        # we're going to shell out for all these cleaning operations,
                                        # so we get easy glob handling
-                                       print "netboot2: removing " + x
+                                       print "netboot: removing " + x
                                        os.system("rm -rf " + self.settings["chroot_path"] + self.settings["merge_path"] + x)
 
        def empty(self):
@@ -136,10 +136,10 @@ class netboot2_target(generic_stage_target):
                        and os.path.exists(self.settings["autoresume_path"]+"empty"):
                        print "Resume point detected, skipping empty operation..."
                else:
-                       if "netboot2/empty" in self.settings:
-                               if type(self.settings["netboot2/empty"])==types.StringType:
-                                       self.settings["netboot2/empty"]=self.settings["netboot2/empty"].split()
-                               for x in self.settings["netboot2/empty"]:
+                       if "netboot/empty" in self.settings:
+                               if type(self.settings["netboot/empty"])==types.StringType:
+                                       self.settings["netboot/empty"]=self.settings["netboot/empty"].split()
+                               for x in self.settings["netboot/empty"]:
                                        myemp=self.settings["chroot_path"] + self.settings["merge_path"] + x
                                        if not os.path.isdir(myemp):
                                                print x,"not a directory or does not exist, skipping 'empty' operation."
@@ -161,4 +161,4 @@ class netboot2_target(generic_stage_target):
                                        "copy_files_to_image","setup_overlay","build_kernel","move_kernels",\
                                        "remove","empty","unbind","clean","clear_autoresume"]
 
-__target_map = {"netboot2":netboot2_target}
+__target_map = {"netboot":netboot_target}

diff --git a/targets/netboot2/nb-busybox.cf b/targets/netboot/nb-busybox.cf
similarity index 100%
rename from targets/netboot2/nb-busybox.cf
rename to targets/netboot/nb-busybox.cf

diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot/netboot-controller.sh
similarity index 97%
rename from targets/netboot2/netboot2-controller.sh
rename to targets/netboot/netboot-controller.sh
index a0d26b8a4e00877a14d0c3a98c6d3e928ed6cdaa..237e7850f63bab102530c3bd422ca7e7dd83311b 100644 (file)
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -57,7 +57,7 @@ case ${1} in
        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_sharedir}/targets/support/netboot-final.sh
        ;;
        clean)
                exit 0;;

diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot/netboot-copyfile.sh
similarity index 100%
rename from targets/netboot2/netboot2-copyfile.sh
rename to targets/netboot/netboot-copyfile.sh

diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot/netboot-pkg.sh
similarity index 100%
rename from targets/netboot2/netboot2-pkg.sh
rename to targets/netboot/netboot-pkg.sh

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b191e8f0a2d52ebc6fb3f233d50ea6f1e1d817e5..b4d67d88d20ba3e057e405b2f5590aa4986146ab 100644 (file)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -60,7 +60,7 @@ setup_gk_args() {
                GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
        fi
 
-       if [ "${clst_target}" == "netboot2" ]
+       if [ "${clst_target}" == "netboot" ]
        then
                GK_ARGS="${GK_ARGS} --netboot"
 

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot-final.sh
similarity index 100%
rename from targets/support/netboot2-final.sh
rename to targets/support/netboot-final.sh