Merge pull request #1543 from zet809/rename_xcat_genesis_scripts_pkgname

Modify xcat-genesis-scripts-ppc64 depend on xcat-genesis-base-ppc64 a…

build-ubunturepo

@@ -254,7 +254,17 @@ then
                         fi
                         dpkg-buildpackage -uc -us
                     else
+                        if [ "$file" = "xCAT-genesis-scripts" ]; then
+                            CURDIR=$(pwd)
+                            echo "Rename control file to build pkg: mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control"
+                            mv ${CURDIR}/debian/control-${target_arch} ${CURDIR}/debian/control
+                        fi
                         dpkg-buildpackage -uc -us -a$target_arch
+                        if [ "$file" = "xCAT-genesis-scripts" ]; then
+                            CURDIR=$(pwd)
+                            echo "Move control file back: mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch}"
+                            mv ${CURDIR}/debian/control ${CURDIR}/debian/control-${target_arch}
+                        fi
                     fi
                     rc=$?
                     if [ $rc -gt 0 ]; then

xCAT-genesis-scripts/debian/control-amd64

@@ -5,10 +5,10 @@ Maintainer: xCAT <xcat-user@lists.sourceforge.net>
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.2
 
-Package: xcat-genesis-scripts
-Architecture: amd64 ppc64el
-Depends: xcat-genesis-base-amd64[any-amd64],xcat-genesis-base-ppc64[any-ppc64el]
-Replaces: xcat-genesis-scripts-amd64[any-amd64]
+Package: xcat-genesis-scripts-x86-64
+Architecture: all 
+Depends: xcat-genesis-base-x86-64
+Replaces: xcat-genesis-scripts-amd64
 Description: xCAT genesis 
 	(Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions
 

xCAT-genesis-scripts/debian/control-ppc64el

@@ -0,0 +1,13 @@
+Source: xcat-genesis-scripts
+Section: admin
+Priority: extra
+Maintainer: xCAT <xcat-user@lists.sourceforge.net>
+Build-Depends: debhelper (>= 8.0.0)
+Standards-Version: 3.9.2
+
+Package: xcat-genesis-scripts-ppc64
+Architecture: all
+Depends: xcat-genesis-base-ppc64
+Description: xCAT genesis 
+	(Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible. This package reperesents the EPL content that is more tightly bound to specific xcat-core versions
+