Skip to content

Commit aec78ab

Browse files
mizdebskmizdebsk
committed
Update dola to version 1.3.1
1 parent f5a15b2 commit aec78ab

5 files changed

Lines changed: 30 additions & 101 deletions

File tree

‎mbi/dist/metadata.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,22 +135,22 @@ MOD disruptor
135135
MOD dola-bsx
136136
ART io.kojan dola-bsx
137137
DEP org.codehaus.plexus plexus-classworlds
138+
MOD dola-bsx-api
139+
ART io.kojan dola-bsx-api
138140
MOD dola-dbs
139141
ART io.kojan dola-dbs
140-
DEP io.kojan dola-rpm-api
142+
DEP io.kojan dola-bsx-api
141143
DEP org.fedoraproject.xmvn xmvn-api
142144
MOD dola-generator
143145
ART io.kojan dola-generator
144-
DEP io.kojan dola-rpm-api
146+
DEP io.kojan dola-bsx-api
145147
DEP org.ow2.asm asm
146148
DEP org.apache.commons commons-compress
147149
DEP org.fedoraproject.xmvn xmvn-api
148150
DEP org.apache.maven maven-model 4.0.0-rc-3
149151
DEP org.fedoraproject.xmvn xmvn-core
150152
MOD dola-gleaner
151153
ART io.kojan dola-gleaner
152-
MOD dola-rpm-api
153-
ART io.kojan dola-rpm-api
154154
MOD dola-transformer
155155
ART io.kojan dola-transformer
156156
MOD easymock

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,38 @@
1-
From 7c80241a0ecfbed1f5118ede21a0bb783c94b348 Mon Sep 17 00:00:00 2001
1+
From d2c88a3e6181b8b84365dec85c8fa35fa4830192 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 1/2] Use unique namespace for bootstrapping
4+
Subject: [PATCH] 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.
88

99
Forwarded: not-needed
1010
---
11+
dola-bsx-api/src/main/conf/dola-bsx-api.conf | 2 +-
1112
dola-bsx/src/main/conf/dola-bsx.conf | 2 +-
1213
dola-bsx/src/main/lua/dola-bsx.lua | 6 ++---
1314
dola-bsx/src/main/rpm/macros.dola-bsx | 4 +--
1415
dola-dbs/src/main/conf/dola-dbs.conf | 6 ++---
1516
.../io/kojan/dola/imperator/Imperator.java | 12 ++++-----
1617
dola-dbs/src/main/lua/dola-dbs.lua | 2 +-
1718
dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++---
18-
.../src/main/conf/dola-generator.conf | 25 ++++++++++---------
19+
.../src/main/conf/dola-generator.conf | 26 +++++++++----------
1920
.../generator/stub/CompoundGenerator.java | 8 +++---
2021
.../dola/generator/stub/CompoundHook.java | 4 +--
2122
.../src/main/lua/dola-generator.lua | 2 +-
2223
dola-generator/src/main/rpm/dolagen.attr | 8 +++---
2324
.../src/main/rpm/macros.dola-generator | 8 +++---
2425
.../src/main/rpm/macros.dola-generator-etc | 2 +-
25-
dola-rpm-api/src/main/conf/dola-rpm-api.conf | 2 +-
26-
15 files changed, 50 insertions(+), 49 deletions(-)
26+
15 files changed, 50 insertions(+), 50 deletions(-)
2727

28+
diff --git a/dola-bsx-api/src/main/conf/dola-bsx-api.conf b/dola-bsx-api/src/main/conf/dola-bsx-api.conf
29+
index c4c3159..418030b 100644
30+
--- a/dola-bsx-api/src/main/conf/dola-bsx-api.conf
31+
+++ b/dola-bsx-api/src/main/conf/dola-bsx-api.conf
32+
@@ -1,2 +1,2 @@
33+
[Realm:bsx-api]
34+
-load /usr/lib/java/dola/dola-bsx-api.jar
35+
+load /usr/lib/javapackages-bootstrap/dola-bsx-api.jar
2836
diff --git a/dola-bsx/src/main/conf/dola-bsx.conf b/dola-bsx/src/main/conf/dola-bsx.conf
2937
index 16ac060..f22bcaf 100644
3038
--- a/dola-bsx/src/main/conf/dola-bsx.conf
@@ -63,20 +71,20 @@ index 1cce21e..f0d043e 100644
6371
-%__dola_classpath %{_javadir}/dola/dola-bsx.jar:%{_javadir}/plexus-classworlds.jar
6472
+%__jpb_dola_classpath %{_prefix}/lib/javapackages-bootstrap/dola-bsx.jar:%{_prefix}/lib/javapackages-bootstrap/plexus-classworlds.jar
6573
diff --git a/dola-dbs/src/main/conf/dola-dbs.conf b/dola-dbs/src/main/conf/dola-dbs.conf
66-
index 6b389b3..1a91c18 100644
74+
index b06e78b..5d19f8b 100644
6775
--- a/dola-dbs/src/main/conf/dola-dbs.conf
6876
+++ b/dola-dbs/src/main/conf/dola-dbs.conf
6977
@@ -1,5 +1,5 @@
7078
[Realm:dbs]
71-
import io.kojan.dola.rpm from Realm:rpm-api
79+
import io.kojan.dola.rpm from Realm:bsx-api
7280
-load /usr/share/java/dola/dola-dbs.jar
7381
-load /usr/share/java/xmvn5/xmvn-api-5.0.0.jar
7482
-load /usr/share/java/kojan-xml/kojan-xml.jar
7583
+load /usr/lib/javapackages-bootstrap/dola-dbs.jar
7684
+load /usr/lib/javapackages-bootstrap/xmvn-api.jar
7785
+load /usr/lib/javapackages-bootstrap/kojan-xml.jar
7886
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
79-
index e1c2f75..0b3a784 100644
87+
index 662d1d7..99b053f 100644
8088
--- a/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java
8189
+++ b/dola-dbs/src/main/java/io/kojan/dola/imperator/Imperator.java
8290
@@ -178,13 +178,13 @@ public class Imperator {
@@ -147,12 +155,12 @@ index f0331de..d389903 100644
147155
+%buildsystem_maven_build(-) %{lua:(require "javapackages-bootstrap-dola-dbs").build()}
148156
+%buildsystem_maven_install(-) %{lua:(require "javapackages-bootstrap-dola-dbs").install()}
149157
diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf
150-
index 90cb396..e8ab124 100644
158+
index 1f3c286..43a236f 100644
151159
--- a/dola-generator/src/main/conf/dola-generator.conf
152160
+++ b/dola-generator/src/main/conf/dola-generator.conf
153-
@@ -1,14 +1,15 @@
161+
@@ -1,15 +1,15 @@
154162
[Realm:generator]
155-
import io.kojan.dola.rpm from Realm:rpm-api
163+
import io.kojan.dola.rpm from Realm:bsx-api
156164
-load /usr/share/java/dola/dola-generator.jar
157165
-load /usr/share/java/objectweb-asm/asm.jar
158166
-load /usr/share/java/commons-compress.jar
@@ -164,6 +172,7 @@ index 90cb396..e8ab124 100644
164172
-load /usr/share/java/maven4/maven-impl-4.0.0-rc-3.jar
165173
-load /usr/share/java/maven4/maven-api-xml-4.0.0-rc-3.jar
166174
-load /usr/share/java/maven4/maven-xml-4.0.0-rc-3.jar
175+
-load /usr/share/java/maven4/maven-support-4.0.0-rc-3.jar
167176
-load /usr/share/java/plexus-utils4/plexus-utils-4.0.2.jar
168177
+load /usr/lib/javapackages-bootstrap/dola-generator.jar
169178
+load /usr/lib/javapackages-bootstrap/asm.jar
@@ -282,14 +291,6 @@ index 95e9160..f56fd7b 100644
282291
# Override default __os_install_post hook.
283292
-%__os_install_post %{lua:(require "dola-generator").os_install_post()}
284293
+%__os_install_post %{lua:(require "javapackages-bootstrap-dola-generator").os_install_post()}
285-
diff --git a/dola-rpm-api/src/main/conf/dola-rpm-api.conf b/dola-rpm-api/src/main/conf/dola-rpm-api.conf
286-
index 2c0f672..848ec53 100644
287-
--- a/dola-rpm-api/src/main/conf/dola-rpm-api.conf
288-
+++ b/dola-rpm-api/src/main/conf/dola-rpm-api.conf
289-
@@ -1,2 +1,2 @@
290-
[Realm:rpm-api]
291-
-load /usr/lib/java/dola/dola-rpm-api.jar
292-
+load /usr/lib/javapackages-bootstrap/dola-rpm-api.jar
293294
--
294-
2.50.0
295+
2.50.1
295296

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎project/dola.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
url=https://github.com/mizdebsk/dola.git
22
ref=@.@.@
3-
version=1.2.0
3+
version=1.3.1

‎project/dola.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<file>NOTICE</file>
55
</licensing>
66
<module>
7-
<name>dola-rpm-api</name>
8-
<subDir>dola-rpm-api</subDir>
7+
<name>dola-bsx-api</name>
8+
<subDir>dola-bsx-api</subDir>
99
<build>
1010
<compiler>
1111
<addSourceRoot>src/main/java</addSourceRoot>
@@ -27,7 +27,7 @@
2727
<module>
2828
<name>dola-dbs</name>
2929
<subDir>dola-dbs</subDir>
30-
<dependency>dola-rpm-api</dependency>
30+
<dependency>dola-bsx-api</dependency>
3131
<dependency>xmvn</dependency>
3232
<dependency>kojan-xml</dependency>
3333
<build>
@@ -40,7 +40,7 @@
4040
<module>
4141
<name>dola-generator</name>
4242
<subDir>dola-generator</subDir>
43-
<dependency>dola-rpm-api</dependency>
43+
<dependency>dola-bsx-api</dependency>
4444
<dependency>asm</dependency>
4545
<dependency>commons-compress</dependency>
4646
<dependency>commons-io</dependency>

0 commit comments

Comments
 (0)