HMBXR5601-827 - Avoid XR specific path in Common_scripts

This commit is contained in:
Dan Hawkins 2019-09-11 19:45:48 +01:00
commit 0b35442b42

View file

@ -5,6 +5,7 @@ class DebRootDefinition {
String PACKAGE_NAME
String UNIQUE_PACKAGE_NAME
String PACKAGE_SOURCE_ROOT
String PACKAGE_SOURCE_FOLDER_NAME
String DEBPATH
@ -25,13 +26,14 @@ class DebRootDefinition {
String HTTP_DEV_DIV
String LIB_SYSTEMD
DebRootDefinition(String rootpath, String packageprefix, String buildstamp) {
DebRootDefinition(String rootpath, String packagesourceroot, String packageprefix, String buildstamp) {
ROOTPATH = rootpath
PACKAGE_PREFIX = packageprefix
PACKAGE_FOLDER_NAME = packageprefix
PACKAGE_NAME = packageprefix + "_armhf.deb"
UNIQUE_PACKAGE_NAME = packageprefix + "_" + buildstamp + "_armhf.deb"
PACKAGE_SOURCE_ROOT = packagesourceroot
PACKAGE_SOURCE_FOLDER_NAME = "${ROOTPATH}/${PACKAGE_PREFIX}"
DEBPATH = "${ROOTPATH}/${PACKAGE_FOLDER_NAME}"
@ -54,8 +56,8 @@ class DebRootDefinition {
}
}
def DebRootDefinition debDefinition(String rootpath, String packageprefix, String buildstamp) {
return new DebRootDefinition(rootpath, packageprefix, buildstamp)
def DebRootDefinition debDefinition(String rootpath, String packagesourceroot, String packageprefix, String buildstamp) {
return new DebRootDefinition(rootpath, packagesourceroot, packageprefix, buildstamp)
}
def buildPackage(String packageout, String uniquepackageout, DebRootDefinition packagedefs, String password) {
@ -73,7 +75,7 @@ def buildPackage(String packageout, String uniquepackageout, DebRootDefinition p
mkdir -v -p "${packagedefs.HTTP_DEV_DIV}"
mkdir -v -p "${packagedefs.LIB_SYSTEMD}/system"
cp -v -r "${SOURCE_PATH}/hmb-xr-5601-source/presto_xr/${packagedefs.PACKAGE_SOURCE_FOLDER_NAME}"/* "${packagedefs.DEBPATH}"
cp -v -r "${packagedefs.PACKAGE_SOURCE_ROOT}/${packagedefs.PACKAGE_SOURCE_FOLDER_NAME}"/* "${packagedefs.DEBPATH}"
sudo chmod -v -R 755 "${packagedefs.DEBPATH}"
sudo chown -v -R root: "${packagedefs.DEBPATH}"