- Shifted to build after glib is built and removed the dist entry that is used
for
addons.
- Checked the glib library and the libgio entries are uncommented so that
should be okay
- Checked build and this package then built with no problems but in the addon
package
build section libtpms failed to build as it was missing the dist entry. Also
the same
with swtpm so this is a patch set with the changes to those two packages as
well.
- Full build tested out and confirmed working on x86_64 with this patch set
applied.
Signed-off-by: Adolf Belka <adolf.be...@ipfire.org>
---
lfs/json-glib | 3 ---
make.sh | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/lfs/json-glib b/lfs/json-glib
index 00617cd93..f0ac3b942 100644
--- a/lfs/json-glib
+++ b/lfs/json-glib
@@ -50,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
b2 : $(subst %,%_BLAKE2,$(objects))
-dist:
- @$(PAK)
-
###############################################################################
# Downloading, checking, b2sum
###############################################################################
diff --git a/make.sh b/make.sh
index 789d01540..dc1feb37a 100755
--- a/make.sh
+++ b/make.sh
@@ -1514,7 +1514,6 @@ build_system() {
lfsmake2 libarchive
lfsmake2 cmake
lfsmake2 json-c
- lfsmake2 json-glib
lfsmake2 tcl
lfsmake2 python3-MarkupSafe
lfsmake2 python3-Jinja2
@@ -1526,6 +1525,7 @@ build_system() {
lfsmake2 lvm2
lfsmake2 multipath-tools
lfsmake2 glib
+ lfsmake2 json-glib
lfsmake2 libgudev
lfsmake2 libgpg-error
lfsmake2 libgcrypt
--
2.50.0
