diff --git a/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch b/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch index ef340a59..3bc34905 100644 --- a/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch +++ b/patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch @@ -1,7 +1,7 @@ -From cf9b689849a7f0c4f56d726b9d64b2fefa23cca8 Mon Sep 17 00:00:00 2001 +From a5543dbe75cf9f4f90dc4157aba941b2a44eb0a6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 13 Jun 2025 15:49:34 +0200 -Subject: [PATCH] Use unique namespace for bootstrapping +Subject: [PATCH 1/2] Use unique namespace for bootstrapping When used in bootstrap mode, update file paths, RPM macro names etc. so that they are distinct from non-bootstrap Dola packages. @@ -296,5 +296,5 @@ index 95e9160..f56fd7b 100644 -%__os_install_post %{lua:(require "dola-generator").os_install_post()} +%__os_install_post %{lua:(require "javapackages-bootstrap-dola-generator").os_install_post()} -- -2.50.1 +2.51.0 diff --git a/patches/dola/0002-Add-commons-lang3-to-dola-generator-classpath.patch b/patches/dola/0002-Add-commons-lang3-to-dola-generator-classpath.patch new file mode 100644 index 00000000..564b2dab --- /dev/null +++ b/patches/dola/0002-Add-commons-lang3-to-dola-generator-classpath.patch @@ -0,0 +1,25 @@ +From 899845993742fd70b46271e0d486a296bbbaa534 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 10 Oct 2025 17:54:17 +0200 +Subject: [PATCH 2/2] Add commons-lang3 to dola-generator classpath + +Forwarded: https://github.com/mizdebsk/dola/pull/42 +--- + dola-generator/src/main/conf/dola-generator.conf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf +index 0f114b4..c61be88 100644 +--- a/dola-generator/src/main/conf/dola-generator.conf ++++ b/dola-generator/src/main/conf/dola-generator.conf +@@ -3,6 +3,7 @@ import io.kojan.dola.rpm from Realm:bsx-api + load /usr/share/javapackages-bootstrap/asm.jar + load /usr/share/javapackages-bootstrap/commons-compress.jar + load /usr/share/javapackages-bootstrap/commons-io.jar ++load /usr/share/javapackages-bootstrap/commons-lang3.jar + load /usr/share/javapackages-bootstrap/xmvn-api.jar + load /usr/share/javapackages-bootstrap/kojan-xml.jar + load /usr/share/javapackages-bootstrap/xmvn-core.jar +-- +2.51.0 +