From debc40a0708d77e5f295a0981a3520f65a4ce7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <vanek.jakub4@seznam.cz>
Date: Sun, 17 May 2020 18:38:33 +0200
Subject: [PATCH 1/3] [pkg] fix: use entrypoint for forcing QEMU use

---
 packaging/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/Dockerfile b/packaging/Dockerfile
index 0c2f736..83d1c1c 100644
--- a/packaging/Dockerfile
+++ b/packaging/Dockerfile
@@ -26,4 +26,5 @@ VOLUME /build
 
 USER compiler
 WORKDIR /opt/jdkpkg
-CMD ["/usr/bin/qemu-arm-static", "/bin/bash", "/opt/jdkpkg/package.sh"]
+ENTRYPOINT ["/usr/bin/qemu-arm-static", "/bin/bash", "-c"]
+CMD ["/opt/jdkpkg/package.sh"]

From fd28d120ea7e2755fd64a8282fadf37c51236824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <vanek.jakub4@seznam.cz>
Date: Sun, 17 May 2020 18:40:44 +0200
Subject: [PATCH 2/3] [pkg] feat: build debian packages on Jenkins

- previously, only JRI11 was publicly available as a .deb package
- this extends it to all binary builds on AdoptOpenJDK Jenkins
- this is a revert of 8f0650ad3fe11bac37f0892da51e764587ab3b39
---
 Jenkinsfile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e04f6e4..133c2ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,10 +19,11 @@ node(selector) {
     // our docker images
     def osImage
     def bldImage
+    def pkgImage
 
     // prepare run parameters
     String mountParams = "-v ${env.WORKSPACE}/build:/build"
-    String envParams = "-e JDKVER=${params.JDKVER_VALUE} -e JDKVM=${params.JDKVM_VALUE} -e JDKPLATFORM=${params.JDKPLATFORM_VALUE} -e AUTOBUILD=1"
+    String envParams = "-e JDKVER=${params.JDKVER_VALUE} -e JDKVM=${params.JDKVM_VALUE} -e JDKPLATFORM=${params.JDKPLATFORM_VALUE} -e AUTOBUILD=1 -e JAVA_PACKAGE_REVISION=-1"
 
     try {
         // clean and prepare
@@ -41,6 +42,7 @@ node(selector) {
             infoArg += " --build-arg BUILD_TYPE=\"${params.BUILD_TYPE}\""
             osImage  = docker.build("ev3dev-lang-java:jdk-${params.BUILD_TYPE}-${params.DEBIAN}",  "${infoArg}  -f ${env.WORKSPACE}/system/Dockerfile.${params.BUILD_TYPE}  ${env.WORKSPACE}/system")
             bldImage = docker.build("ev3dev-lang-java:jdk-${params.BUILD_TYPE}-build",             "${infoArg}                                                              ${env.WORKSPACE}/scripts")
+            pkgImage = docker.build("ev3dev-lang-java:jdk-package",                                "${infoArg}                                                              ${env.WORKSPACE}/packaging")
         }
         stage("JDK download") {
             bldImage.inside("${mountParams} ${envParams}") {
@@ -65,17 +67,28 @@ node(selector) {
             archiveArtifacts artifacts: "build/jmods-${params.JDKPLATFORM_VALUE}.tar.gz", fingerprint: true
         }
 
+        stage("JDK debpkg") {
+            pkgImage.inside("${mountParams} ${envParams}") {
+                sh "/opt/jdkpkg/package.sh"
+            }
+            archiveArtifacts artifacts: "build/pkg/*", fingerprint: false
+        }
+
     } finally {
         stage ('Cleanup') {
             // clean up workspace
+            pkgImage.inside("${mountParams}") {
+                try { sh "sudo rm -rf /build/*" } catch(err) {}
+            }
             bldImage.inside("${mountParams}") {
                 try { sh "sudo rm -rf /build/*" } catch(err) {}
             }
             try { sh "rm -rf ${env.WORKSPACE}/build" } catch(err) {}
 
             // clean up docker images
+            try { sh "docker rmi ${pkgImage.id} 2>/dev/null" } catch (err) {}
             try { sh "docker rmi ${bldImage.id} 2>/dev/null" } catch (err) {}
-            try { sh "docker rmi ${osImage.id} 2>/dev/null"  } catch (err) {}
+            try { sh "docker rmi ${osImage.id}  2>/dev/null"  } catch (err) {}
             cleanWs()
         }
     }

From 23fe8076006d6ae0e82c919992f337e2a4252a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <vanek.jakub4@seznam.cz>
Date: Sun, 17 May 2020 18:55:34 +0200
Subject: [PATCH 3/3] [pkg] feat: remove orig pkg from build directory

---
 packaging/package.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/package.sh b/packaging/package.sh
index 4ae2ff1..117a227 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -65,3 +65,4 @@ cd "$PKGDIR"
 debuild -b -us -uc --no-sign --buildinfo-option="-O"
 cd /build
 rm -rf "$PKGDIR"
+rm -rf "$PKGDIR.orig.tar.xz"