From b0835c04deae3eecde5bf372cfc47af6ac73de5b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 6 Sep 2019 18:56:50 +0100 Subject: [PATCH 01/11] HMBXR5601-827 - Remove force command options --- publish/package.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/package.groovy b/publish/package.groovy index 00f5923..32cc9eb 100644 --- a/publish/package.groovy +++ b/publish/package.groovy @@ -99,7 +99,7 @@ pipeline { script { echo "Package folder is ${PACKAGE_FOLDER}" sh """#!/bin/bash -v - aptly repo -config="${APTLY_CONFIG_FILE}" -force-replace add "${REPO_NAME}" "${PACKAGE_FOLDER}" + aptly repo -config="${APTLY_CONFIG_FILE}" add "${REPO_NAME}" "${PACKAGE_FOLDER}" if [ \$? -ne 0 ]; then exit 1; fi aptly repo -config="${APTLY_CONFIG_FILE}" show -with-packages "${REPO_NAME}" if [ \$? -ne 0 ]; then exit 1; fi @@ -128,7 +128,7 @@ pipeline { steps { script { sh """#!/bin/bash -v - aptly publish -config="${APTLY_CONFIG_FILE}" -distribution="${DISTRIBUTION}" -component="${COMPONENT}" -gpg-key="${GPG_KEY_ID}" -force-overwrite snapshot "${FULL_SNAPSHOT_NAME}" + aptly publish -config="${APTLY_CONFIG_FILE}" -distribution="${DISTRIBUTION}" -component="${COMPONENT}" -gpg-key="${GPG_KEY_ID}" snapshot "${FULL_SNAPSHOT_NAME}" if [ \$? -ne 0 ]; then exit 1; fi aptly publish -config="${APTLY_CONFIG_FILE}" list if [ \$? -ne 0 ]; then exit 1; fi From 15332b794c185a7b16d939ddeb9c4e2e39158ee4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 10:19:21 +0100 Subject: [PATCH 02/11] HMBXR5601-827 - Add lintian output to debian package --- packaging/debian.groovy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 9799ba9..6b3426f 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -79,6 +79,8 @@ def buildPackage(String packageout, DebRootDefinition packagedefs) { dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" dpkg-deb --contents "${packageout}/${packagedefs.PACKAGE_NAME}" + + lintian "${packageout}/${packagedefs.PACKAGE_NAME}" || true """ } From b9eefabe9c7a01354f1d78a4d50b953664bafaf1 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 10:34:22 +0100 Subject: [PATCH 03/11] HMBXR5601-827 - Change file permissions to satisfy lintian --- packaging/debian.groovy | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 6b3426f..eb53f44 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -56,11 +56,13 @@ def DebRootDefinition debDefinition(String rootpath, String packageprefix) { return new DebRootDefinition(rootpath, packageprefix) } -def buildPackage(String packageout, DebRootDefinition packagedefs) { +def buildPackage(String packageout, DebRootDefinition packagedefs, String password) { sh """#!/bin/bash # Exit if any command fails set -e + echo "${password}" | sudo -S echo + mkdir -v -p "${packagedefs.USR_BIN}" mkdir -v -p "${packagedefs.USR_LIB_ARCH}" mkdir -v -p "${packagedefs.LIB_FIRMWARE}" @@ -69,10 +71,9 @@ def buildPackage(String packageout, DebRootDefinition packagedefs) { 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}" - chmod -v 775 "${packagedefs.DEBPATH}/DEBIAN/preinst" - chmod -v 775 "${packagedefs.DEBPATH}/DEBIAN/postinst" - chmod -v 775 "${packagedefs.DEBPATH}/DEBIAN/prerm" - chmod -v 775 "${packagedefs.DEBPATH}/DEBIAN/postrm" + + sudo chmod -v -R 755 "${packagedefs.DEBPATH}" + sudo chown -v -R root: "${packagedefs.DEBPATH}" mkdir -v -p "${packageout}" dpkg-deb -v --build "${packagedefs.DEBPATH}" "${packageout}/${packagedefs.PACKAGE_NAME}" From 3b5b7606d5a07ec2392a0a95f0a75c214c831f02 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 10:49:44 +0100 Subject: [PATCH 04/11] HMBXR5601-827 - Change file permissions to satisfy lintian --- packaging/debian.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index eb53f44..3dda8eb 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -81,7 +81,7 @@ def buildPackage(String packageout, DebRootDefinition packagedefs, String passwo dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" dpkg-deb --contents "${packageout}/${packagedefs.PACKAGE_NAME}" - lintian "${packageout}/${packagedefs.PACKAGE_NAME}" || true + lintian --suppress-tags dir-or-file-in-opt "${packageout}/${packagedefs.PACKAGE_NAME}" || true """ } From c036622a82eeed56381a749027d153377e81f1c4 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 12:40:47 +0100 Subject: [PATCH 05/11] HMBXR5601-827 - Change permissions after package build so that it can be cleaned on the next build --- packaging/debian.groovy | 52 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 3dda8eb..cef692f 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -57,32 +57,46 @@ def DebRootDefinition debDefinition(String rootpath, String packageprefix) { } def buildPackage(String packageout, DebRootDefinition packagedefs, String password) { - sh """#!/bin/bash - # Exit if any command fails - set -e + try { + sh """#!/bin/bash + # Exit if any command fails + set -e - echo "${password}" | sudo -S echo + echo "${password}" | sudo -S echo - mkdir -v -p "${packagedefs.USR_BIN}" - mkdir -v -p "${packagedefs.USR_LIB_ARCH}" - mkdir -v -p "${packagedefs.LIB_FIRMWARE}" + mkdir -v -p "${packagedefs.USR_BIN}" + mkdir -v -p "${packagedefs.USR_LIB_ARCH}" + mkdir -v -p "${packagedefs.LIB_FIRMWARE}" - mkdir -v -p "${packagedefs.HTTP_DEV_DIV}" - mkdir -v -p "${packagedefs.LIB_SYSTEMD}/system" + 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 "${SOURCE_PATH}/hmb-xr-5601-source/presto_xr/${packagedefs.PACKAGE_SOURCE_FOLDER_NAME}"/* "${packagedefs.DEBPATH}" - sudo chmod -v -R 755 "${packagedefs.DEBPATH}" - sudo chown -v -R root: "${packagedefs.DEBPATH}" + sudo chmod -v -R 755 "${packagedefs.DEBPATH}" + sudo chown -v -R root: "${packagedefs.DEBPATH}" - mkdir -v -p "${packageout}" - dpkg-deb -v --build "${packagedefs.DEBPATH}" "${packageout}/${packagedefs.PACKAGE_NAME}" + mkdir -v -p "${packageout}" + dpkg-deb -v --build "${packagedefs.DEBPATH}" "${packageout}/${packagedefs.PACKAGE_NAME}" - dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" - dpkg-deb --contents "${packageout}/${packagedefs.PACKAGE_NAME}" - - lintian --suppress-tags dir-or-file-in-opt "${packageout}/${packagedefs.PACKAGE_NAME}" || true - """ + dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" + dpkg-deb --contents "${packageout}/${packagedefs.PACKAGE_NAME}" + + lintian --suppress-tags dir-or-file-in-opt "${packageout}/${packagedefs.PACKAGE_NAME}" || true + + sudo chown -v -R ${USER}: "${packagedefs.DEBPATH}" + """ + } + catch (Exception e) { + echo "Exception occurred" + sh """#!/bin/bash -v + echo "${password}" | sudo -S echo + + sudo chown -v -R ${USER}: "${packagedefs.DEBPATH}" + + exit 1 + """ + } } return this; \ No newline at end of file From 01f570e3481640d8c7da9a12915ecffcec42e778 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 12:43:42 +0100 Subject: [PATCH 06/11] HMBXR5601-827 - Change permissions after package build so that it can be cleaned on the next build --- packaging/debian.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index cef692f..4981c78 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -84,7 +84,7 @@ def buildPackage(String packageout, DebRootDefinition packagedefs, String passwo lintian --suppress-tags dir-or-file-in-opt "${packageout}/${packagedefs.PACKAGE_NAME}" || true - sudo chown -v -R ${USER}: "${packagedefs.DEBPATH}" + sudo chown -R ${USER}: "${packagedefs.DEBPATH}" """ } catch (Exception e) { @@ -92,7 +92,7 @@ def buildPackage(String packageout, DebRootDefinition packagedefs, String passwo sh """#!/bin/bash -v echo "${password}" | sudo -S echo - sudo chown -v -R ${USER}: "${packagedefs.DEBPATH}" + sudo chown -R ${USER}: "${packagedefs.DEBPATH}" exit 1 """ From 0b81e15e34eb6ca52bcaed9e8bf488e5fae38523 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 12:47:12 +0100 Subject: [PATCH 07/11] HMBXR5601-827 - Change permissions after package build so that it can be cleaned on the next build --- packaging/debian.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 4981c78..1bd8a6e 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -77,11 +77,15 @@ def buildPackage(String packageout, DebRootDefinition packagedefs, String passwo sudo chown -v -R root: "${packagedefs.DEBPATH}" mkdir -v -p "${packageout}" + echo "Building package:" dpkg-deb -v --build "${packagedefs.DEBPATH}" "${packageout}/${packagedefs.PACKAGE_NAME}" + echo "Showing package:" dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" + echo "Showing package contents:" dpkg-deb --contents "${packageout}/${packagedefs.PACKAGE_NAME}" + echo "Showing package lintian output:" lintian --suppress-tags dir-or-file-in-opt "${packageout}/${packagedefs.PACKAGE_NAME}" || true sudo chown -R ${USER}: "${packagedefs.DEBPATH}" From 2c62802a84fcb7008a676c5e638fa272912372f2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 14:48:15 +0100 Subject: [PATCH 08/11] HMBXR5601-827 - Provide packages with unique filenames so that aptly stops complaining about identical files --- packaging/debian.groovy | 8 ++++++-- publish/package.groovy | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 1bd8a6e..7762951 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -24,11 +24,12 @@ class DebRootDefinition { String HTTP_DEV_DIV String LIB_SYSTEMD - DebRootDefinition(String rootpath, String packageprefix) { + DebRootDefinition(String rootpath, 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_FOLDER_NAME = "${ROOTPATH}/${PACKAGE_PREFIX}" DEBPATH = "${ROOTPATH}/${PACKAGE_FOLDER_NAME}" @@ -56,7 +57,7 @@ def DebRootDefinition debDefinition(String rootpath, String packageprefix) { return new DebRootDefinition(rootpath, packageprefix) } -def buildPackage(String packageout, DebRootDefinition packagedefs, String password) { +def buildPackage(String packageout, String uniquepackageout, DebRootDefinition packagedefs, String password) { try { sh """#!/bin/bash # Exit if any command fails @@ -80,6 +81,9 @@ def buildPackage(String packageout, DebRootDefinition packagedefs, String passwo echo "Building package:" dpkg-deb -v --build "${packagedefs.DEBPATH}" "${packageout}/${packagedefs.PACKAGE_NAME}" + mkdir -v -p "${uniquepackageout}" + cp "${packageout}/${packagedefs.PACKAGE_NAME}" "${uniquepackageout}/${packagedefs.UNIQUE_PACKAGE_NAME}" + echo "Showing package:" dpkg-deb --show "${packageout}/${packagedefs.PACKAGE_NAME}" echo "Showing package contents:" diff --git a/publish/package.groovy b/publish/package.groovy index 32cc9eb..ea79cfd 100644 --- a/publish/package.groovy +++ b/publish/package.groovy @@ -50,6 +50,7 @@ pipeline { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") packagemeta = importer.artifactimport(meta, PACKAGE_CREATE_JOB, PACKAGE_CREATE_JOB_SELECTOR, PACKAGEDEST) PACKAGE_FOLDER = "${PACKAGEDEST}/package" + UNIQUE_PACKAGE_FOLDER = "${PACKAGEDEST}/uniquepackage" } } } @@ -97,9 +98,9 @@ pipeline { stage('Add/update package in repo') { steps { script { - echo "Package folder is ${PACKAGE_FOLDER}" + echo "Unique package folder is ${UNIQUE_PACKAGE_FOLDER}" sh """#!/bin/bash -v - aptly repo -config="${APTLY_CONFIG_FILE}" add "${REPO_NAME}" "${PACKAGE_FOLDER}" + aptly repo -config="${APTLY_CONFIG_FILE}" add "${REPO_NAME}" "${UNIQUE_PACKAGE_FOLDER}" if [ \$? -ne 0 ]; then exit 1; fi aptly repo -config="${APTLY_CONFIG_FILE}" show -with-packages "${REPO_NAME}" if [ \$? -ne 0 ]; then exit 1; fi From d4012e0dbbce8b82e276126ec5d46f49bc9fdb6d Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 14:51:34 +0100 Subject: [PATCH 09/11] HMBXR5601-827 - Provide packages with unique filenames so that aptly stops complaining about identical files --- packaging/debian.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 7762951..0323cea 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -53,8 +53,8 @@ class DebRootDefinition { } } -def DebRootDefinition debDefinition(String rootpath, String packageprefix) { - return new DebRootDefinition(rootpath, packageprefix) +def DebRootDefinition debDefinition(String rootpath, String packageprefix, String buildstamp) { + return new DebRootDefinition(rootpath, packageprefix, buildstamp) } def buildPackage(String packageout, String uniquepackageout, DebRootDefinition packagedefs, String password) { From b1f0476725d07b18ee45cbb7fc30916cc679a402 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Mon, 9 Sep 2019 14:53:07 +0100 Subject: [PATCH 10/11] HMBXR5601-827 - Provide packages with unique filenames so that aptly stops complaining about identical files --- packaging/debian.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/debian.groovy b/packaging/debian.groovy index 0323cea..0d6e7e4 100644 --- a/packaging/debian.groovy +++ b/packaging/debian.groovy @@ -3,6 +3,7 @@ class DebRootDefinition { String PACKAGE_PREFIX String PACKAGE_FOLDER_NAME String PACKAGE_NAME + String UNIQUE_PACKAGE_NAME String PACKAGE_SOURCE_FOLDER_NAME String DEBPATH From 7a3bb4426e53b82854c1ace35e9b79d9d2f7f58e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 10 Sep 2019 21:44:08 +0100 Subject: [PATCH 11/11] HMBXR5601-827 - Tar up export to preserve links --- compile/eclipsebuild/eclipseds5build.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile/eclipsebuild/eclipseds5build.groovy b/compile/eclipsebuild/eclipseds5build.groovy index 9ab8df3..63c8d45 100644 --- a/compile/eclipsebuild/eclipseds5build.groovy +++ b/compile/eclipsebuild/eclipseds5build.groovy @@ -81,7 +81,7 @@ def doExport(exportfolder, exportpathlist, partdest = "", build_variant = "") { echo "Copy \"${srcFileExpanded}\" to \"${destFolderExpanded}\"" if (isUnix()) { result = sh( script: """ - cp -r -v "${srcFileExpanded}" "${destFolderExpanded}" + cp -v --no-dereference --preserve=links -r "${srcFileExpanded}" "${destFolderExpanded}" if [ \$? -ne 0 ]; then exit 1; fi """, returnStatus: true