[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libeufin] branch master updated: debian: simplify package building
From: |
gnunet |
Subject: |
[libeufin] branch master updated: debian: simplify package building |
Date: |
Fri, 06 Oct 2023 02:30:52 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a commit to branch master
in repository libeufin.
The following commit(s) were added to refs/heads/master by this push:
new 1d4278a5 debian: simplify package building
1d4278a5 is described below
commit 1d4278a5193b1f0b3db0b27914b952c7f00ae83a
Author: Florian Dold <florian@dold.me>
AuthorDate: Fri Oct 6 02:30:58 2023 +0200
debian: simplify package building
---
contrib/libeufin-bank.conf | 2 +-
contrib/wallet-core | 2 +-
debian/README | 22 ++++++----------------
debian/rules | 5 -----
4 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/contrib/libeufin-bank.conf b/contrib/libeufin-bank.conf
index f0df8877..f1aa2b09 100644
--- a/contrib/libeufin-bank.conf
+++ b/contrib/libeufin-bank.conf
@@ -36,7 +36,7 @@ PORT = 8080
[libeufin-bankdb-postgres]
# Where are the SQL files to setup our tables?
-SQL_DIR = $DATADIR/sql/libeufin-bank/
+SQL_DIR = $DATADIR/sql/
# DB connection string
CONFIG = postgresql:///libeufinbank
diff --git a/contrib/wallet-core b/contrib/wallet-core
index 1708d49a..2347be69 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 1708d49a2d5da1f325173a030695223e5a24e75c
+Subproject commit 2347be694c713959528ad59f3f157d866d7ad424
diff --git a/debian/README b/debian/README
index c7c72d67..cd26f09c 100644
--- a/debian/README
+++ b/debian/README
@@ -1,19 +1,9 @@
-This is NOT a 'clean' Debian package.
+This is NOT a 'clean' Debian package, as it is not using the proper Javahelper
+tooling (https://wiki.debian.org/Java/Packaging#Gradle). It also requires an
+external run of the configure command.
-The DH build process with gradle passes "--offline" to Gradle and thus
-does not work with the libeufin build system.
+To build the package, you must run:
-Invoking the libeufin build system directly without the DH-magic
-results in some failures to create a lock file in /root/ by Gradle.
-
-Java builds are a mess.
-
-
-So to still generate a 'nice' Debian package, you
-must run:
-
-$ ./gradlew dist
+$ ./bootstrap
+$ ./configure --prefix=/usr
$ dpkg-buildpackage -rfakeroot -b -uc -us
-
-Basically, we take the 'binary' zip file generated by the first
-command as the "source" for dpkg. Yuckkee!
diff --git a/debian/rules b/debian/rules
index b0ad14f8..8624d208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,11 +23,6 @@ override_dh_auto_test:
true
override_dh_auto_configure:
true
-override_dh_auto_install:
- unzip bank/build/distributions/libeufin-bank-$(FULLVER).zip
- dh_install libeufin-bank-$(FULLVER)/bin/* $(LIBEUFIN_HOME)/bin
- dh_install libeufin-bank-$(FULLVER)/lib/* $(LIBEUFIN_HOME)/lib
- dh_link $(LIBEUFIN_HOME)/bin/libeufin-bank /usr/bin/libeufin-bank
# Override this step because it's very slow and likely
# unnecessary for us.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libeufin] branch master updated: debian: simplify package building,
gnunet <=