Skip to content

Commit 19c8eaa

Browse files
mizdebskmizdebsk
committed
Fix dola singleton builds and POM-only packages
1 parent 48b4a82 commit 19c8eaa

File tree

2 files changed

+87
-14
lines changed

2 files changed

+87
-14
lines changed

‎patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From a8e0d38a92cd2e136dbbc35ba17e66612b4dcc87 Mon Sep 17 00:00:00 2001
1+
From 7c80241a0ecfbed1f5118ede21a0bb783c94b348 Mon Sep 17 00:00:00 2001
22
From: Mikolaj Izdebski <mizdebsk@redhat.com>
33
Date: Fri, 13 Jun 2025 15:49:34 +0200
4-
Subject: [PATCH] Use unique namespace for bootstrapping
4+
Subject: [PATCH 1/2] Use unique namespace for bootstrapping
55

66
When used in bootstrap mode, update file paths, RPM macro names
77
etc. so that they are distinct from non-bootstrap Dola packages.
@@ -10,20 +10,20 @@ Forwarded: not-needed
1010
---
1111
dola-bsx/src/main/conf/dola-bsx.conf | 2 +-
1212
dola-bsx/src/main/lua/dola-bsx.lua | 6 ++---
13-
dola-bsx/src/main/rpm/macros.dola-bsx | 4 ++--
13+
dola-bsx/src/main/rpm/macros.dola-bsx | 4 +--
1414
dola-dbs/src/main/conf/dola-dbs.conf | 6 ++---
15-
.../io/kojan/dola/imperator/Imperator.java | 12 +++++-----
15+
.../io/kojan/dola/imperator/Imperator.java | 12 ++++-----
1616
dola-dbs/src/main/lua/dola-dbs.lua | 2 +-
17-
dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++----
18-
.../src/main/conf/dola-generator.conf | 24 +++++++++----------
19-
.../generator/stub/CompoundGenerator.java | 8 +++----
20-
.../dola/generator/stub/CompoundHook.java | 4 ++--
17+
dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++---
18+
.../src/main/conf/dola-generator.conf | 25 ++++++++++---------
19+
.../generator/stub/CompoundGenerator.java | 8 +++---
20+
.../dola/generator/stub/CompoundHook.java | 4 +--
2121
.../src/main/lua/dola-generator.lua | 2 +-
22-
dola-generator/src/main/rpm/dolagen.attr | 8 +++----
23-
.../src/main/rpm/macros.dola-generator | 8 +++----
22+
dola-generator/src/main/rpm/dolagen.attr | 8 +++---
23+
.../src/main/rpm/macros.dola-generator | 8 +++---
2424
.../src/main/rpm/macros.dola-generator-etc | 2 +-
2525
dola-rpm-api/src/main/conf/dola-rpm-api.conf | 2 +-
26-
15 files changed, 49 insertions(+), 49 deletions(-)
26+
15 files changed, 50 insertions(+), 49 deletions(-)
2727

2828
diff --git a/dola-bsx/src/main/conf/dola-bsx.conf b/dola-bsx/src/main/conf/dola-bsx.conf
2929
index 16ac060..f22bcaf 100644
@@ -147,10 +147,10 @@ index f0331de..d389903 100644
147147
+%buildsystem_maven_build(-) %{lua:(require "javapackages-bootstrap-dola-dbs").build()}
148148
+%buildsystem_maven_install(-) %{lua:(require "javapackages-bootstrap-dola-dbs").install()}
149149
diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf
150-
index 90cb396..d93d3f7 100644
150+
index 90cb396..e8ab124 100644
151151
--- a/dola-generator/src/main/conf/dola-generator.conf
152152
+++ b/dola-generator/src/main/conf/dola-generator.conf
153-
@@ -1,14 +1,14 @@
153+
@@ -1,14 +1,15 @@
154154
[Realm:generator]
155155
import io.kojan.dola.rpm from Realm:rpm-api
156156
-load /usr/share/java/dola/dola-generator.jar
@@ -176,6 +176,7 @@ index 90cb396..d93d3f7 100644
176176
+load /usr/lib/javapackages-bootstrap/maven-impl-4.0.0-rc-3.jar
177177
+load /usr/lib/javapackages-bootstrap/maven-api-xml-4.0.0-rc-3.jar
178178
+load /usr/lib/javapackages-bootstrap/maven-xml-4.0.0-rc-3.jar
179+
+load /usr/lib/javapackages-bootstrap/maven-support-4.0.0-rc-3.jar
179180
+load /usr/lib/javapackages-bootstrap/plexus-utils-4.0.2.jar
180181
diff --git a/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java b/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java
181182
index 04641da..1f47f7c 100644
@@ -290,5 +291,5 @@ index 2c0f672..848ec53 100644
290291
-load /usr/lib/java/dola/dola-rpm-api.jar
291292
+load /usr/lib/javapackages-bootstrap/dola-rpm-api.jar
292293
--
293-
2.49.0
294+
2.50.0
294295

‎patches/dola/0002-Reorder-packaging-options-for-singleton-packaging.patch‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From c8d64259cb1a8dda555b8f64464b0937ad5a2b92 Mon Sep 17 00:00:00 2001
2+
From: Mikolaj Izdebski <mizdebsk@redhat.com>
3+
Date: Mon, 7 Jul 2025 15:46:39 +0200
4+
Subject: [PATCH 2/2] Reorder packaging options for singleton packaging
5+
6+
Packaging options related to singleton packaging must come after other
7+
packaging options.
8+
9+
Forwarded: https://github.com/mizdebsk/dola/pull/22
10+
---
11+
.../io/kojan/dola/imperator/Imperator.java | 38 +++++++++----------
12+
1 file changed, 19 insertions(+), 19 deletions(-)
13+
14+
diff --git a/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java b/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java
15+
index 0b3a784..99b053f 100644
16+
--- a/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java
17+
+++ b/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java
18+
@@ -105,25 +105,6 @@ public class Imperator {
19+
conf.getBuildSettings().setSkipTests(true);
20+
}
21+
22+
- if (ctx.isSingletonPackaging()) {
23+
- PackagingRule rule1 = new PackagingRule();
24+
- org.fedoraproject.xmvn.config.Artifact glob1 =
25+
- new org.fedoraproject.xmvn.config.Artifact();
26+
- glob1.setClassifier("*?");
27+
- rule1.setArtifactGlob(glob1);
28+
- rule1.setTargetPackage("__noinstall");
29+
- rule1.setOptional(true);
30+
- conf.addArtifactManagement(rule1);
31+
-
32+
- PackagingRule rule2 = new PackagingRule();
33+
- org.fedoraproject.xmvn.config.Artifact glob2 =
34+
- new org.fedoraproject.xmvn.config.Artifact();
35+
- glob2.setArtifactId("{*}");
36+
- rule2.setArtifactGlob(glob2);
37+
- rule2.setTargetPackage("@1");
38+
- conf.addArtifactManagement(rule2);
39+
- }
40+
-
41+
for (PackagingOption po : ctx.getPackagingOptions()) {
42+
PackagingRule rule = new PackagingRule();
43+
org.fedoraproject.xmvn.config.Artifact glob =
44+
@@ -149,6 +130,25 @@ public class Imperator {
45+
conf.addArtifactManagement(rule);
46+
}
47+
48+
+ if (ctx.isSingletonPackaging()) {
49+
+ PackagingRule rule1 = new PackagingRule();
50+
+ org.fedoraproject.xmvn.config.Artifact glob1 =
51+
+ new org.fedoraproject.xmvn.config.Artifact();
52+
+ glob1.setClassifier("*?");
53+
+ rule1.setArtifactGlob(glob1);
54+
+ rule1.setTargetPackage("__noinstall");
55+
+ rule1.setOptional(true);
56+
+ conf.addArtifactManagement(rule1);
57+
+
58+
+ PackagingRule rule2 = new PackagingRule();
59+
+ org.fedoraproject.xmvn.config.Artifact glob2 =
60+
+ new org.fedoraproject.xmvn.config.Artifact();
61+
+ glob2.setArtifactId("{*}");
62+
+ rule2.setArtifactGlob(glob2);
63+
+ rule2.setTargetPackage("@1");
64+
+ conf.addArtifactManagement(rule2);
65+
+ }
66+
+
67+
if (conf.getBuildSettings() != null || !conf.getArtifactManagement().isEmpty()) {
68+
lines.add("# Write out XMvn configuration before calling XMvn for the first time.");
69+
Path confPath = Path.of(".xmvn/config.d/dola.xml");
70+
--
71+
2.50.0
72+

0 commit comments

Comments
 (0)