[PATCH 1/3] json-glib: New package

public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed

* [PATCH 1/3] json-glib: New package
@ 2025-07-08 15:04 Daniel Weismüller
  2025-07-08 15:04 ` [PATCH 2/3] libtpms: " Daniel Weismüller
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Daniel Weismüller @ 2025-07-08 15:04 UTC (permalink / raw)
  To: development; +Cc: Daniel Weismüller

This package is required for swtpm.

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
---
 config/rootfiles/common/json-glib | 118 ++++++++++++++++++++++++++++++
 lfs/json-glib                     |  84 +++++++++++++++++++++
 make.sh                           |   1 +
 3 files changed, 203 insertions(+)
 create mode 100644 config/rootfiles/common/json-glib
 create mode 100644 lfs/json-glib

diff --git a/config/rootfiles/common/json-glib b/config/rootfiles/common/json-glib
new file mode 100644
index 000000000..d403c7c28
--- /dev/null
+++ b/config/rootfiles/common/json-glib
@@ -0,0 +1,118 @@
+#usr/bin/json-glib-format
+#usr/bin/json-glib-validate
+#usr/include/json-glib-1.0
+#usr/include/json-glib-1.0/json-glib
+#usr/include/json-glib-1.0/json-glib/json-builder.h
+#usr/include/json-glib-1.0/json-glib/json-enum-types.h
+#usr/include/json-glib-1.0/json-glib/json-generator.h
+#usr/include/json-glib-1.0/json-glib/json-glib.h
+#usr/include/json-glib-1.0/json-glib/json-gobject.h
+#usr/include/json-glib-1.0/json-glib/json-gvariant.h
+#usr/include/json-glib-1.0/json-glib/json-parser.h
+#usr/include/json-glib-1.0/json-glib/json-path.h
+#usr/include/json-glib-1.0/json-glib/json-reader.h
+#usr/include/json-glib-1.0/json-glib/json-types.h
+#usr/include/json-glib-1.0/json-glib/json-utils.h
+#usr/include/json-glib-1.0/json-glib/json-version-macros.h
+#usr/include/json-glib-1.0/json-glib/json-version.h
+#usr/lib/libjson-glib-1.0.so
+usr/lib/libjson-glib-1.0.so.0
+usr/lib/libjson-glib-1.0.so.0.1000.6
+#usr/lib/pkgconfig/json-glib-1.0.pc
+#usr/libexec/installed-tests
+#usr/libexec/installed-tests/json-glib-1.0
+#usr/libexec/installed-tests/json-glib-1.0/array
+#usr/libexec/installed-tests/json-glib-1.0/boxed
+#usr/libexec/installed-tests/json-glib-1.0/builder
+#usr/libexec/installed-tests/json-glib-1.0/generator
+#usr/libexec/installed-tests/json-glib-1.0/gvariant
+#usr/libexec/installed-tests/json-glib-1.0/invalid
+#usr/libexec/installed-tests/json-glib-1.0/invalid.json
+#usr/libexec/installed-tests/json-glib-1.0/node
+#usr/libexec/installed-tests/json-glib-1.0/object
+#usr/libexec/installed-tests/json-glib-1.0/parser
+#usr/libexec/installed-tests/json-glib-1.0/path
+#usr/libexec/installed-tests/json-glib-1.0/reader
+#usr/libexec/installed-tests/json-glib-1.0/serialize-complex
+#usr/libexec/installed-tests/json-glib-1.0/serialize-full
+#usr/libexec/installed-tests/json-glib-1.0/serialize-simple
+#usr/libexec/installed-tests/json-glib-1.0/skip-bom.json
+#usr/libexec/installed-tests/json-glib-1.0/stream-load.json
+#usr/share/installed-tests
+#usr/share/installed-tests/json-glib-1.0
+#usr/share/installed-tests/json-glib-1.0/array.test
+#usr/share/installed-tests/json-glib-1.0/boxed.test
+#usr/share/installed-tests/json-glib-1.0/builder.test
+#usr/share/installed-tests/json-glib-1.0/generator.test
+#usr/share/installed-tests/json-glib-1.0/gvariant.test
+#usr/share/installed-tests/json-glib-1.0/invalid.test
+#usr/share/installed-tests/json-glib-1.0/node.test
+#usr/share/installed-tests/json-glib-1.0/object.test
+#usr/share/installed-tests/json-glib-1.0/parser.test
+#usr/share/installed-tests/json-glib-1.0/path.test
+#usr/share/installed-tests/json-glib-1.0/reader.test
+#usr/share/installed-tests/json-glib-1.0/serialize-complex.test
+#usr/share/installed-tests/json-glib-1.0/serialize-full.test
+#usr/share/installed-tests/json-glib-1.0/serialize-simple.test
+#usr/share/locale/ab/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/as/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/be/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/bs/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/da/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/de/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/el/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/eo/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/es/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/et/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/eu/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/fa/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/fr/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/he/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/hr/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/id/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/it/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ja/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ka/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/kab/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ko/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ky/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ms/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/or/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/pt/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ro/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ru/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/sk/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/sl/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/sr/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/sv/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/te/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/tg/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/th/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/tr/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/ug/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/uk/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/vi/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo
diff --git a/lfs/json-glib b/lfs/json-glib
new file mode 100644
index 000000000..00617cd93
--- /dev/null
+++ b/lfs/json-glib
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.10.6
+
+THISAPP    = json-glib-$(VER)
+DL_FILE    = $(THISAPP).tar.xz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362d4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+dist:
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && meson setup \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--libdir=/usr/lib \
+		builddir/
+	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+	cd $(DIR_APP) && ninja -C builddir/ install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 57a0ff2cf..3412c8f5a 100755
--- a/make.sh
+++ b/make.sh
@@ -1514,6 +1514,7 @@ build_system() {
 	lfsmake2 libarchive
 	lfsmake2 cmake
 	lfsmake2 json-c
+	lfsmake2 json-glib
 	lfsmake2 tcl
 	lfsmake2 python3-MarkupSafe
 	lfsmake2 python3-Jinja2
-- 
2.49.0



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/3] libtpms: New package
  2025-07-08 15:04 [PATCH 1/3] json-glib: New package Daniel Weismüller
@ 2025-07-08 15:04 ` Daniel Weismüller
  2025-07-08 15:04 ` [PATCH 3/3] swtpm: " Daniel Weismüller
  2025-07-08 18:32 ` [PATCH 1/3] json-glib: " Adolf Belka
  2 siblings, 0 replies; 5+ messages in thread
From: Daniel Weismüller @ 2025-07-08 15:04 UTC (permalink / raw)
  To: development; +Cc: Daniel Weismüller

This package is required for libvirt to emulate TPM devices.

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
---
 config/rootfiles/packages/libtpms | 41 ++++++++++++++
 lfs/libtpms                       | 91 +++++++++++++++++++++++++++++++
 make.sh                           |  1 +
 3 files changed, 133 insertions(+)
 create mode 100644 config/rootfiles/packages/libtpms
 create mode 100644 lfs/libtpms

diff --git a/config/rootfiles/packages/libtpms b/config/rootfiles/packages/libtpms
new file mode 100644
index 000000000..6fce3ebd8
--- /dev/null
+++ b/config/rootfiles/packages/libtpms
@@ -0,0 +1,41 @@
+#usr/include/libtpms
+#usr/include/libtpms/tpm_error.h
+#usr/include/libtpms/tpm_library.h
+#usr/include/libtpms/tpm_memory.h
+#usr/include/libtpms/tpm_nvfilename.h
+#usr/include/libtpms/tpm_tis.h
+#usr/include/libtpms/tpm_types.h
+#usr/lib/libtpms.a
+#usr/lib/libtpms.la
+#usr/lib/libtpms.so
+usr/lib/libtpms.so.0
+usr/lib/libtpms.so.0.10.1
+#usr/lib/pkgconfig/libtpms.pc
+#usr/share/man/man3/TPMLIB_CancelCommand.3
+#usr/share/man/man3/TPMLIB_ChooseTPMVersion.3
+#usr/share/man/man3/TPMLIB_DecodeBlob.3
+#usr/share/man/man3/TPMLIB_GetInfo.3
+#usr/share/man/man3/TPMLIB_GetState.3
+#usr/share/man/man3/TPMLIB_GetTPMProperty.3
+#usr/share/man/man3/TPMLIB_GetVersion.3
+#usr/share/man/man3/TPMLIB_MainInit.3
+#usr/share/man/man3/TPMLIB_Process.3
+#usr/share/man/man3/TPMLIB_RegisterCallbacks.3
+#usr/share/man/man3/TPMLIB_SetBufferSize.3
+#usr/share/man/man3/TPMLIB_SetDebugFD.3
+#usr/share/man/man3/TPMLIB_SetDebugLevel.3
+#usr/share/man/man3/TPMLIB_SetDebugPrefix.3
+#usr/share/man/man3/TPMLIB_SetProfile.3
+#usr/share/man/man3/TPMLIB_SetState.3
+#usr/share/man/man3/TPMLIB_Terminate.3
+#usr/share/man/man3/TPMLIB_ValidateState.3
+#usr/share/man/man3/TPMLIB_VolatileAll_Store.3
+#usr/share/man/man3/TPMLIB_WasManufactured.3
+#usr/share/man/man3/TPM_Free.3
+#usr/share/man/man3/TPM_IO_Hash_Data.3
+#usr/share/man/man3/TPM_IO_Hash_End.3
+#usr/share/man/man3/TPM_IO_Hash_Start.3
+#usr/share/man/man3/TPM_IO_TpmEstablished_Get.3
+#usr/share/man/man3/TPM_IO_TpmEstablished_Reset.3
+#usr/share/man/man3/TPM_Malloc.3
+#usr/share/man/man3/TPM_Realloc.3
diff --git a/lfs/libtpms b/lfs/libtpms
new file mode 100644
index 000000000..1f87a236c
--- /dev/null
+++ b/lfs/libtpms
@@ -0,0 +1,91 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+SUMMARY	   = This library provides software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0).
+
+VER        = 0.10.1
+
+THISAPP    = libtpms-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libtpms
+PAK_VER    = 1
+
+DEPS       =
+
+SERVICES   =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 39feead951a84b715e8e4db8cd6eab7f19728c00423df16150c99004230061691cde90fcf7aafc6a5748647ac58cb696b89a709368da4b8f0c684b22321ff1ea
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	-mkdir -pv $(DIR_APP)
+	cd $(DIR_APP) && autoreconf -vfi
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-tpm2 \
+		--with-openssl \
+		--disable-hardening
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3412c8f5a..384c09407 100755
--- a/make.sh
+++ b/make.sh
@@ -2032,6 +2032,7 @@ build_system() {
 	lfsmake2 frr
 	lfsmake2 dmidecode
 	lfsmake2 mcelog
+	lfsmake2 libtpms
 	lfsmake2 libpciaccess
 	lfsmake2 ovmf
 	lfsmake2 libvirt
-- 
2.49.0



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 3/3] swtpm: New package
  2025-07-08 15:04 [PATCH 1/3] json-glib: New package Daniel Weismüller
  2025-07-08 15:04 ` [PATCH 2/3] libtpms: " Daniel Weismüller
@ 2025-07-08 15:04 ` Daniel Weismüller
  2025-07-08 18:32 ` [PATCH 1/3] json-glib: " Adolf Belka
  2 siblings, 0 replies; 5+ messages in thread
From: Daniel Weismüller @ 2025-07-08 15:04 UTC (permalink / raw)
  To: development; +Cc: Daniel Weismüller

This implements an emulator for TPM 2.0 devices for libvirt to be able
to run virtual machines with Windows 11+.

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
---
 config/rootfiles/packages/swtpm | 239 ++++++++++++++++++++++++++++++++
 lfs/libvirt                     |   4 +-
 lfs/swtpm                       |  89 ++++++++++++
 make.sh                         |   3 +-
 4 files changed, 332 insertions(+), 3 deletions(-)
 create mode 100644 config/rootfiles/packages/swtpm
 create mode 100644 lfs/swtpm

diff --git a/config/rootfiles/packages/swtpm b/config/rootfiles/packages/swtpm
new file mode 100644
index 000000000..19dca860d
--- /dev/null
+++ b/config/rootfiles/packages/swtpm
@@ -0,0 +1,239 @@
+etc/swtpm-localca.conf
+etc/swtpm-localca.options
+etc/swtpm_setup.conf
+usr/bin/swtpm
+usr/bin/swtpm_bios
+usr/bin/swtpm_cert
+usr/bin/swtpm_ioctl
+usr/bin/swtpm_localca
+usr/bin/swtpm_setup
+#usr/include/swtpm
+#usr/include/swtpm/tpm_ioctl.h
+#usr/lib/swtpm
+#usr/lib/swtpm/libswtpm_libtpms.a
+#usr/lib/swtpm/libswtpm_libtpms.la
+usr/lib/swtpm/libswtpm_libtpms.so
+usr/lib/swtpm/libswtpm_libtpms.so.0
+usr/lib/swtpm/libswtpm_libtpms.so.0.0.0
+#usr/libexec/installed-tests/swtpm
+#usr/libexec/installed-tests/swtpm/_test_encrypted_state
+#usr/libexec/installed-tests/swtpm/_test_getcap
+#usr/libexec/installed-tests/swtpm/_test_hashing
+#usr/libexec/installed-tests/swtpm/_test_hashing2
+#usr/libexec/installed-tests/swtpm/_test_init
+#usr/libexec/installed-tests/swtpm/_test_locality
+#usr/libexec/installed-tests/swtpm/_test_migration_key
+#usr/libexec/installed-tests/swtpm/_test_migration_key_2
+#usr/libexec/installed-tests/swtpm/_test_print_capabilities
+#usr/libexec/installed-tests/swtpm/_test_print_states
+#usr/libexec/installed-tests/swtpm/_test_resume_volatile
+#usr/libexec/installed-tests/swtpm/_test_save_load_encrypted_state
+#usr/libexec/installed-tests/swtpm/_test_save_load_state
+#usr/libexec/installed-tests/swtpm/_test_setbuffersize
+#usr/libexec/installed-tests/swtpm/_test_swtpm_bios
+#usr/libexec/installed-tests/swtpm/_test_tpm2_avoid_da_lockout
+#usr/libexec/installed-tests/swtpm/_test_tpm2_derived_keys
+#usr/libexec/installed-tests/swtpm/_test_tpm2_encrypted_state
+#usr/libexec/installed-tests/swtpm/_test_tpm2_file_permissions
+#usr/libexec/installed-tests/swtpm/_test_tpm2_getcap
+#usr/libexec/installed-tests/swtpm/_test_tpm2_hashing
+#usr/libexec/installed-tests/swtpm/_test_tpm2_hashing2
+#usr/libexec/installed-tests/swtpm/_test_tpm2_hashing3
+#usr/libexec/installed-tests/swtpm/_test_tpm2_init
+#usr/libexec/installed-tests/swtpm/_test_tpm2_locality
+#usr/libexec/installed-tests/swtpm/_test_tpm2_migration_key
+#usr/libexec/installed-tests/swtpm/_test_tpm2_print_capabilities
+#usr/libexec/installed-tests/swtpm/_test_tpm2_print_states
+#usr/libexec/installed-tests/swtpm/_test_tpm2_probe
+#usr/libexec/installed-tests/swtpm/_test_tpm2_resume_volatile
+#usr/libexec/installed-tests/swtpm/_test_tpm2_save_load_encrypted_state
+#usr/libexec/installed-tests/swtpm/_test_tpm2_save_load_state
+#usr/libexec/installed-tests/swtpm/_test_tpm2_save_load_state_da_timeout
+#usr/libexec/installed-tests/swtpm/_test_tpm2_save_load_state_locking
+#usr/libexec/installed-tests/swtpm/_test_tpm2_savestate
+#usr/libexec/installed-tests/swtpm/_test_tpm2_setbuffersize
+#usr/libexec/installed-tests/swtpm/_test_tpm2_swtpm_bios
+#usr/libexec/installed-tests/swtpm/_test_tpm2_volatilestate
+#usr/libexec/installed-tests/swtpm/_test_tpm2_wrongorder
+#usr/libexec/installed-tests/swtpm/_test_tpm_probe
+#usr/libexec/installed-tests/swtpm/_test_volatilestate
+#usr/libexec/installed-tests/swtpm/_test_wrongorder
+#usr/libexec/installed-tests/swtpm/common
+#usr/libexec/installed-tests/swtpm/create_certs.sh
+#usr/libexec/installed-tests/swtpm/data
+#usr/libexec/installed-tests/swtpm/data/ecprivek.pem
+#usr/libexec/installed-tests/swtpm/data/ecpubek.pem
+#usr/libexec/installed-tests/swtpm/data/issuercert.pem
+#usr/libexec/installed-tests/swtpm/data/keyfile.txt
+#usr/libexec/installed-tests/swtpm/data/keyfile256bit.txt
+#usr/libexec/installed-tests/swtpm/data/migkey1
+#usr/libexec/installed-tests/swtpm/data/migkey1/tpm2-volatilestate.bin
+#usr/libexec/installed-tests/swtpm/data/migkey1/volatilestate.bin
+#usr/libexec/installed-tests/swtpm/data/pubek.pem
+#usr/libexec/installed-tests/swtpm/data/pwdfile.txt
+#usr/libexec/installed-tests/swtpm/data/signkey-encrypted.pem
+#usr/libexec/installed-tests/swtpm/data/signkey.pem
+#usr/libexec/installed-tests/swtpm/data/tpm2state1
+#usr/libexec/installed-tests/swtpm/data/tpm2state1/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state1/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state2
+#usr/libexec/installed-tests/swtpm/data/tpm2state2/pwdfile.txt
+#usr/libexec/installed-tests/swtpm/data/tpm2state2/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state2/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state2b
+#usr/libexec/installed-tests/swtpm/data/tpm2state2b/pwdfile.txt
+#usr/libexec/installed-tests/swtpm/data/tpm2state2b/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state2b/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state3
+#usr/libexec/installed-tests/swtpm/data/tpm2state3/hkey.priv
+#usr/libexec/installed-tests/swtpm/data/tpm2state3/hkey.pub
+#usr/libexec/installed-tests/swtpm/data/tpm2state3/signature.bin
+#usr/libexec/installed-tests/swtpm/data/tpm2state3/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state3b
+#usr/libexec/installed-tests/swtpm/data/tpm2state3b/h02000000.bin
+#usr/libexec/installed-tests/swtpm/data/tpm2state3b/h81000000.bin
+#usr/libexec/installed-tests/swtpm/data/tpm2state3b/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state3b/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state3c
+#usr/libexec/installed-tests/swtpm/data/tpm2state3c/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state3c/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state3d
+#usr/libexec/installed-tests/swtpm/data/tpm2state3d/signature2.bin
+#usr/libexec/installed-tests/swtpm/data/tpm2state3d/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state3d/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state4
+#usr/libexec/installed-tests/swtpm/data/tpm2state4/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state4/tpm2-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpm2state5
+#usr/libexec/installed-tests/swtpm/data/tpm2state5/signature.bin
+#usr/libexec/installed-tests/swtpm/data/tpm2state5/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpm2state6
+#usr/libexec/installed-tests/swtpm/data/tpm2state6/tpm2-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpmstate1
+#usr/libexec/installed-tests/swtpm/data/tpmstate1/README
+#usr/libexec/installed-tests/swtpm/data/tpmstate1/tpm-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpmstate1/tpm-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpmstate2
+#usr/libexec/installed-tests/swtpm/data/tpmstate2/README
+#usr/libexec/installed-tests/swtpm/data/tpmstate2/pwdfile.txt
+#usr/libexec/installed-tests/swtpm/data/tpmstate2/tpm-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpmstate2/tpm-00.volatilestate
+#usr/libexec/installed-tests/swtpm/data/tpmstate2b
+#usr/libexec/installed-tests/swtpm/data/tpmstate2b/pwdfile.txt
+#usr/libexec/installed-tests/swtpm/data/tpmstate2b/tpm-00.permall
+#usr/libexec/installed-tests/swtpm/data/tpmstate2b/tpm-00.volatilestate
+#usr/libexec/installed-tests/swtpm/fileinstall
+#usr/libexec/installed-tests/swtpm/installed-runner.sh
+#usr/libexec/installed-tests/swtpm/load_vtpm_proxy
+#usr/libexec/installed-tests/swtpm/patches
+#usr/libexec/installed-tests/swtpm/patches/0001-Deactivate-test-cases-accessing-rootcerts.txt.patch
+#usr/libexec/installed-tests/swtpm/patches/0002-Implement-powerup-for-swtpm.patch
+#usr/libexec/installed-tests/swtpm/patches/0003-Set-CRYPTOLIBRARY-to-openssl.patch
+#usr/libexec/installed-tests/swtpm/patches/0004-Store-and-restore-volatile-state-at-every-step.patch
+#usr/libexec/installed-tests/swtpm/patches/0005-Disable-tests-related-to-events.patch
+#usr/libexec/installed-tests/swtpm/patches/0010-Adjust-test-cases-for-OpenSSL-3.patch
+#usr/libexec/installed-tests/swtpm/patches/0012-Disable-Nuvoton-commands.patch
+#usr/libexec/installed-tests/swtpm/patches/libtpm.patch
+#usr/libexec/installed-tests/swtpm/sed-inplace
+#usr/libexec/installed-tests/swtpm/softhsm_setup
+#usr/libexec/installed-tests/swtpm/swtpm_setup.conf
+#usr/libexec/installed-tests/swtpm/test_clientfds.py
+#usr/libexec/installed-tests/swtpm/test_commandline
+#usr/libexec/installed-tests/swtpm/test_common
+#usr/libexec/installed-tests/swtpm/test_config
+#usr/libexec/installed-tests/swtpm/test_ctrlchannel
+#usr/libexec/installed-tests/swtpm/test_ctrlchannel2
+#usr/libexec/installed-tests/swtpm/test_ctrlchannel3
+#usr/libexec/installed-tests/swtpm/test_ctrlchannel4
+#usr/libexec/installed-tests/swtpm/test_cuse
+#usr/libexec/installed-tests/swtpm/test_encrypted_state
+#usr/libexec/installed-tests/swtpm/test_getcap
+#usr/libexec/installed-tests/swtpm/test_hashing
+#usr/libexec/installed-tests/swtpm/test_hashing2
+#usr/libexec/installed-tests/swtpm/test_init
+#usr/libexec/installed-tests/swtpm/test_locality
+#usr/libexec/installed-tests/swtpm/test_migration_key
+#usr/libexec/installed-tests/swtpm/test_parameters
+#usr/libexec/installed-tests/swtpm/test_print_capabilities
+#usr/libexec/installed-tests/swtpm/test_print_states
+#usr/libexec/installed-tests/swtpm/test_resume_volatile
+#usr/libexec/installed-tests/swtpm/test_samples_create_tpmca
+#usr/libexec/installed-tests/swtpm/test_save_load_encrypted_state
+#usr/libexec/installed-tests/swtpm/test_save_load_state
+#usr/libexec/installed-tests/swtpm/test_setbuffersize
+#usr/libexec/installed-tests/swtpm/test_setdatafd.py
+#usr/libexec/installed-tests/swtpm/test_swtpm_bios
+#usr/libexec/installed-tests/swtpm/test_swtpm_cert
+#usr/libexec/installed-tests/swtpm/test_swtpm_setup_create_cert
+#usr/libexec/installed-tests/swtpm/test_swtpm_setup_file_backend
+#usr/libexec/installed-tests/swtpm/test_swtpm_setup_misc
+#usr/libexec/installed-tests/swtpm/test_swtpm_setup_overwrite
+#usr/libexec/installed-tests/swtpm/test_tpm12
+#usr/libexec/installed-tests/swtpm/test_tpm2_avoid_da_lockout
+#usr/libexec/installed-tests/swtpm/test_tpm2_chroot_chardev
+#usr/libexec/installed-tests/swtpm/test_tpm2_chroot_cuse
+#usr/libexec/installed-tests/swtpm/test_tpm2_chroot_socket
+#usr/libexec/installed-tests/swtpm/test_tpm2_ctrlchannel2
+#usr/libexec/installed-tests/swtpm/test_tpm2_ctrlchannel3
+#usr/libexec/installed-tests/swtpm/test_tpm2_derived_keys
+#usr/libexec/installed-tests/swtpm/test_tpm2_encrypted_state
+#usr/libexec/installed-tests/swtpm/test_tpm2_file_permissions
+#usr/libexec/installed-tests/swtpm/test_tpm2_getcap
+#usr/libexec/installed-tests/swtpm/test_tpm2_hashing
+#usr/libexec/installed-tests/swtpm/test_tpm2_hashing2
+#usr/libexec/installed-tests/swtpm/test_tpm2_hashing3
+#usr/libexec/installed-tests/swtpm/test_tpm2_ibmtss2
+#usr/libexec/installed-tests/swtpm/test_tpm2_init
+#usr/libexec/installed-tests/swtpm/test_tpm2_libtpms_versions_profiles
+#usr/libexec/installed-tests/swtpm/test_tpm2_locality
+#usr/libexec/installed-tests/swtpm/test_tpm2_migration_key
+#usr/libexec/installed-tests/swtpm/test_tpm2_parameters
+#usr/libexec/installed-tests/swtpm/test_tpm2_partial_reads
+#usr/libexec/installed-tests/swtpm/test_tpm2_print_capabilities
+#usr/libexec/installed-tests/swtpm/test_tpm2_print_states
+#usr/libexec/installed-tests/swtpm/test_tpm2_probe
+#usr/libexec/installed-tests/swtpm/test_tpm2_resume_volatile
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_encrypted_state
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_2
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_2_block
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_2_linear
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_3
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_da_timeout
+#usr/libexec/installed-tests/swtpm/test_tpm2_save_load_state_locking
+#usr/libexec/installed-tests/swtpm/test_tpm2_savestate
+#usr/libexec/installed-tests/swtpm/test_tpm2_setbuffersize
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_bios
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_cert
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_cert_ecc
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_localca
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_localca_pkcs11.test
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_create_cert
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_overwrite
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_profile
+#usr/libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_profile_name
+#usr/libexec/installed-tests/swtpm/test_tpm2_volatilestate
+#usr/libexec/installed-tests/swtpm/test_tpm2_vtpm_proxy
+#usr/libexec/installed-tests/swtpm/test_tpm2_wrongorder
+#usr/libexec/installed-tests/swtpm/test_tpm_probe
+#usr/libexec/installed-tests/swtpm/test_volatilestate
+#usr/libexec/installed-tests/swtpm/test_vtpm_proxy
+#usr/libexec/installed-tests/swtpm/test_wrongorder
+#usr/libexec/installed-tests/swtpm/tests
+#usr/share/man/man3/swtpm_ioctls.3
+#usr/share/man/man5/swtpm-localca.conf.5
+#usr/share/man/man5/swtpm-localca.options.5
+#usr/share/man/man5/swtpm_setup.conf.5
+#usr/share/man/man8/swtpm-create-tpmca.8
+#usr/share/man/man8/swtpm-localca.8
+#usr/share/man/man8/swtpm.8
+#usr/share/man/man8/swtpm_bios.8
+#usr/share/man/man8/swtpm_cert.8
+#usr/share/man/man8/swtpm_ioctl.8
+#usr/share/man/man8/swtpm_localca.8
+#usr/share/man/man8/swtpm_setup.8
+#usr/share/swtpm
+usr/share/swtpm/swtpm-create-tpmca
+usr/share/swtpm/swtpm-create-user-config-files
+usr/share/swtpm/swtpm-localca
+var/lib/swtpm-localca
diff --git a/lfs/libvirt b/lfs/libvirt
index f2915ec94..dc8e0aa99 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,9 +35,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 40
+PAK_VER    = 41
 
-DEPS       = ebtables libpciaccess ovmf qemu
+DEPS       = ebtables libpciaccess ovmf swtpm qemu
 
 SERVICES   = libvirtd virtlogd
 
diff --git a/lfs/swtpm b/lfs/swtpm
new file mode 100644
index 000000000..ccd09517e
--- /dev/null
+++ b/lfs/swtpm
@@ -0,0 +1,89 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+SUMMARY    = Libtpms-based TPM emulator with socket, character device, and Linux CUSE interface.
+
+VER        = 0.10.1
+
+THISAPP    = swtpm-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = swtpm
+PAK_VER    = 1
+
+DEPS       = libtpms
+
+SERVICES   =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = fa282338a975b4e3067e444ae5781744b3c153f482377a11b5c71072ed519709d561f6759e478a008813946da2f03c0650259d9f1ca17afd07892cd37f46529e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+b2 : $(subst %,%_BLAKE2,$(objects))
+
+###############################################################################
+# Downloading, checking, b2sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	-mkdir -pv $(DIR_APP)
+	cd $(DIR_APP) && autoreconf -vfi
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--disable-hardening
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 384c09407..1404c9afc 100755
--- a/make.sh
+++ b/make.sh
@@ -2032,7 +2032,9 @@ build_system() {
 	lfsmake2 frr
 	lfsmake2 dmidecode
 	lfsmake2 mcelog
+	lfsmake2 socat
 	lfsmake2 libtpms
+	lfsmake2 swtpm
 	lfsmake2 libpciaccess
 	lfsmake2 ovmf
 	lfsmake2 libvirt
@@ -2064,7 +2066,6 @@ build_system() {
 	lfsmake2 libloc
 	lfsmake2 ncdu
 	lfsmake2 lshw
-	lfsmake2 socat
 	lfsmake2 libcdada
 	lfsmake2 pmacct
 	lfsmake2 squid-asnbl
-- 
2.49.0



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/3] json-glib: New package
  2025-07-08 15:04 [PATCH 1/3] json-glib: New package Daniel Weismüller
  2025-07-08 15:04 ` [PATCH 2/3] libtpms: " Daniel Weismüller
  2025-07-08 15:04 ` [PATCH 3/3] swtpm: " Daniel Weismüller
@ 2025-07-08 18:32 ` Adolf Belka
  2025-07-08 19:08   ` Michael Tremer
  2 siblings, 1 reply; 5+ messages in thread
From: Adolf Belka @ 2025-07-08 18:32 UTC (permalink / raw)
  To: Daniel Weismüller; +Cc: IPFire: Development-List

Hi Daniel,

json-glib is failing to build because it has a run-time dependency for gio and that is provided by glib which comes after json-glib in make.sh

You will need to shift glib so it comes before json-glib.

You will also need to figure out what needs to be uncommented from the glib rootfile so that it will be available at run-time.

Regards,

Adolf.


On 08/07/2025 17:04, Daniel Weismüller wrote:
> This package is required for swtpm.
> 
> Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
> ---
>   config/rootfiles/common/json-glib | 118 ++++++++++++++++++++++++++++++
>   lfs/json-glib                     |  84 +++++++++++++++++++++
>   make.sh                           |   1 +
>   3 files changed, 203 insertions(+)
>   create mode 100644 config/rootfiles/common/json-glib
>   create mode 100644 lfs/json-glib
> 
> diff --git a/config/rootfiles/common/json-glib b/config/rootfiles/common/json-glib
> new file mode 100644
> index 000000000..d403c7c28
> --- /dev/null
> +++ b/config/rootfiles/common/json-glib
> @@ -0,0 +1,118 @@
> +#usr/bin/json-glib-format
> +#usr/bin/json-glib-validate
> +#usr/include/json-glib-1.0
> +#usr/include/json-glib-1.0/json-glib
> +#usr/include/json-glib-1.0/json-glib/json-builder.h
> +#usr/include/json-glib-1.0/json-glib/json-enum-types.h
> +#usr/include/json-glib-1.0/json-glib/json-generator.h
> +#usr/include/json-glib-1.0/json-glib/json-glib.h
> +#usr/include/json-glib-1.0/json-glib/json-gobject.h
> +#usr/include/json-glib-1.0/json-glib/json-gvariant.h
> +#usr/include/json-glib-1.0/json-glib/json-parser.h
> +#usr/include/json-glib-1.0/json-glib/json-path.h
> +#usr/include/json-glib-1.0/json-glib/json-reader.h
> +#usr/include/json-glib-1.0/json-glib/json-types.h
> +#usr/include/json-glib-1.0/json-glib/json-utils.h
> +#usr/include/json-glib-1.0/json-glib/json-version-macros.h
> +#usr/include/json-glib-1.0/json-glib/json-version.h
> +#usr/lib/libjson-glib-1.0.so
> +usr/lib/libjson-glib-1.0.so.0
> +usr/lib/libjson-glib-1.0.so.0.1000.6
> +#usr/lib/pkgconfig/json-glib-1.0.pc
> +#usr/libexec/installed-tests
> +#usr/libexec/installed-tests/json-glib-1.0
> +#usr/libexec/installed-tests/json-glib-1.0/array
> +#usr/libexec/installed-tests/json-glib-1.0/boxed
> +#usr/libexec/installed-tests/json-glib-1.0/builder
> +#usr/libexec/installed-tests/json-glib-1.0/generator
> +#usr/libexec/installed-tests/json-glib-1.0/gvariant
> +#usr/libexec/installed-tests/json-glib-1.0/invalid
> +#usr/libexec/installed-tests/json-glib-1.0/invalid.json
> +#usr/libexec/installed-tests/json-glib-1.0/node
> +#usr/libexec/installed-tests/json-glib-1.0/object
> +#usr/libexec/installed-tests/json-glib-1.0/parser
> +#usr/libexec/installed-tests/json-glib-1.0/path
> +#usr/libexec/installed-tests/json-glib-1.0/reader
> +#usr/libexec/installed-tests/json-glib-1.0/serialize-complex
> +#usr/libexec/installed-tests/json-glib-1.0/serialize-full
> +#usr/libexec/installed-tests/json-glib-1.0/serialize-simple
> +#usr/libexec/installed-tests/json-glib-1.0/skip-bom.json
> +#usr/libexec/installed-tests/json-glib-1.0/stream-load.json
> +#usr/share/installed-tests
> +#usr/share/installed-tests/json-glib-1.0
> +#usr/share/installed-tests/json-glib-1.0/array.test
> +#usr/share/installed-tests/json-glib-1.0/boxed.test
> +#usr/share/installed-tests/json-glib-1.0/builder.test
> +#usr/share/installed-tests/json-glib-1.0/generator.test
> +#usr/share/installed-tests/json-glib-1.0/gvariant.test
> +#usr/share/installed-tests/json-glib-1.0/invalid.test
> +#usr/share/installed-tests/json-glib-1.0/node.test
> +#usr/share/installed-tests/json-glib-1.0/object.test
> +#usr/share/installed-tests/json-glib-1.0/parser.test
> +#usr/share/installed-tests/json-glib-1.0/path.test
> +#usr/share/installed-tests/json-glib-1.0/reader.test
> +#usr/share/installed-tests/json-glib-1.0/serialize-complex.test
> +#usr/share/installed-tests/json-glib-1.0/serialize-full.test
> +#usr/share/installed-tests/json-glib-1.0/serialize-simple.test
> +#usr/share/locale/ab/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/as/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/be/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/bs/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/da/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/de/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/el/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/eo/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/es/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/et/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/eu/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/fa/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/fr/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/he/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/hr/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/id/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/it/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ja/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ka/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/kab/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ko/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ky/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ms/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/or/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/pt/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ro/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ru/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/sk/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/sl/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/sr/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/sv/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/te/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/tg/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/th/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/tr/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/ug/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/uk/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/vi/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo
> +#usr/share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo
> diff --git a/lfs/json-glib b/lfs/json-glib
> new file mode 100644
> index 000000000..00617cd93
> --- /dev/null
> +++ b/lfs/json-glib
> @@ -0,0 +1,84 @@
> +###############################################################################
> +#                                                                             #
> +# IPFire.org - A linux based firewall                                         #
> +# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
> +#                                                                             #
> +# This program is free software: you can redistribute it and/or modify        #
> +# it under the terms of the GNU General Public License as published by        #
> +# the Free Software Foundation, either version 3 of the License, or           #
> +# (at your option) any later version.                                         #
> +#                                                                             #
> +# This program is distributed in the hope that it will be useful,             #
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
> +# GNU General Public License for more details.                                #
> +#                                                                             #
> +# You should have received a copy of the GNU General Public License           #
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
> +#                                                                             #
> +###############################################################################
> +
> +###############################################################################
> +# Definitions
> +###############################################################################
> +
> +include Config
> +
> +VER        = 1.10.6
> +
> +THISAPP    = json-glib-$(VER)
> +DL_FILE    = $(THISAPP).tar.xz
> +DL_FROM    = $(URL_IPFIRE)
> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +TARGET     = $(DIR_INFO)/$(THISAPP)
> +
> +###############################################################################
> +# Top-level Rules
> +###############################################################################
> +
> +objects = $(DL_FILE)
> +
> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> +
> +$(DL_FILE)_BLAKE2 = 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362d4
> +
> +install : $(TARGET)
> +
> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> +
> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> +
> +b2 : $(subst %,%_BLAKE2,$(objects))
> +
> +dist:
> +	@$(PAK)
> +
> +###############################################################################
> +# Downloading, checking, b2sum
> +###############################################################################
> +
> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> +	@$(CHECK)
> +
> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> +	@$(LOAD)
> +
> +$(subst %,%_BLAKE2,$(objects)) :
> +	@$(B2SUM)
> +
> +###############################################################################
> +# Installation Details
> +###############################################################################
> +
> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> +	@$(PREBUILD)
> +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> +	cd $(DIR_APP) && meson setup \
> +		--prefix=/usr \
> +		--sysconfdir=/etc \
> +		--libdir=/usr/lib \
> +		builddir/
> +	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
> +	cd $(DIR_APP) && ninja -C builddir/ install
> +	@rm -rf $(DIR_APP)
> +	@$(POSTBUILD)
> diff --git a/make.sh b/make.sh
> index 57a0ff2cf..3412c8f5a 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1514,6 +1514,7 @@ build_system() {
>   	lfsmake2 libarchive
>   	lfsmake2 cmake
>   	lfsmake2 json-c
> +	lfsmake2 json-glib
>   	lfsmake2 tcl
>   	lfsmake2 python3-MarkupSafe
>   	lfsmake2 python3-Jinja2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/3] json-glib: New package
  2025-07-08 18:32 ` [PATCH 1/3] json-glib: " Adolf Belka
@ 2025-07-08 19:08   ` Michael Tremer
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2025-07-08 19:08 UTC (permalink / raw)
  To: Adolf Belka; +Cc: Daniel Weismüller, IPFire: Development-List

Oops, sorry, that was me. Please send a patch and I will merge it tomorrow morning!

> On 8 Jul 2025, at 19:33, Adolf Belka <adolf.belka@ipfire.org> wrote:
> 
> Hi Daniel,
> 
> json-glib is failing to build because it has a run-time dependency for gio and that is provided by glib which comes after json-glib in make.sh
> 
> You will need to shift glib so it comes before json-glib.
> 
> You will also need to figure out what needs to be uncommented from the glib rootfile so that it will be available at run-time.
> 
> Regards,
> 
> Adolf.
> 
> 
>> On 08/07/2025 17:04, Daniel Weismüller wrote:
>> This package is required for swtpm.
>> Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
>> ---
>>  config/rootfiles/common/json-glib | 118 ++++++++++++++++++++++++++++++
>>  lfs/json-glib                     |  84 +++++++++++++++++++++
>>  make.sh                           |   1 +
>>  3 files changed, 203 insertions(+)
>>  create mode 100644 config/rootfiles/common/json-glib
>>  create mode 100644 lfs/json-glib
>> diff --git a/config/rootfiles/common/json-glib b/config/rootfiles/common/json-glib
>> new file mode 100644
>> index 000000000..d403c7c28
>> --- /dev/null
>> +++ b/config/rootfiles/common/json-glib
>> @@ -0,0 +1,118 @@
>> +#usr/bin/json-glib-format
>> +#usr/bin/json-glib-validate
>> +#usr/include/json-glib-1.0
>> +#usr/include/json-glib-1.0/json-glib
>> +#usr/include/json-glib-1.0/json-glib/json-builder.h
>> +#usr/include/json-glib-1.0/json-glib/json-enum-types.h
>> +#usr/include/json-glib-1.0/json-glib/json-generator.h
>> +#usr/include/json-glib-1.0/json-glib/json-glib.h
>> +#usr/include/json-glib-1.0/json-glib/json-gobject.h
>> +#usr/include/json-glib-1.0/json-glib/json-gvariant.h
>> +#usr/include/json-glib-1.0/json-glib/json-parser.h
>> +#usr/include/json-glib-1.0/json-glib/json-path.h
>> +#usr/include/json-glib-1.0/json-glib/json-reader.h
>> +#usr/include/json-glib-1.0/json-glib/json-types.h
>> +#usr/include/json-glib-1.0/json-glib/json-utils.h
>> +#usr/include/json-glib-1.0/json-glib/json-version-macros.h
>> +#usr/include/json-glib-1.0/json-glib/json-version.h
>> +#usr/lib/libjson-glib-1.0.so
>> +usr/lib/libjson-glib-1.0.so.0
>> +usr/lib/libjson-glib-1.0.so.0.1000.6
>> +#usr/lib/pkgconfig/json-glib-1.0.pc
>> +#usr/libexec/installed-tests
>> +#usr/libexec/installed-tests/json-glib-1.0
>> +#usr/libexec/installed-tests/json-glib-1.0/array
>> +#usr/libexec/installed-tests/json-glib-1.0/boxed
>> +#usr/libexec/installed-tests/json-glib-1.0/builder
>> +#usr/libexec/installed-tests/json-glib-1.0/generator
>> +#usr/libexec/installed-tests/json-glib-1.0/gvariant
>> +#usr/libexec/installed-tests/json-glib-1.0/invalid
>> +#usr/libexec/installed-tests/json-glib-1.0/invalid.json
>> +#usr/libexec/installed-tests/json-glib-1.0/node
>> +#usr/libexec/installed-tests/json-glib-1.0/object
>> +#usr/libexec/installed-tests/json-glib-1.0/parser
>> +#usr/libexec/installed-tests/json-glib-1.0/path
>> +#usr/libexec/installed-tests/json-glib-1.0/reader
>> +#usr/libexec/installed-tests/json-glib-1.0/serialize-complex
>> +#usr/libexec/installed-tests/json-glib-1.0/serialize-full
>> +#usr/libexec/installed-tests/json-glib-1.0/serialize-simple
>> +#usr/libexec/installed-tests/json-glib-1.0/skip-bom.json
>> +#usr/libexec/installed-tests/json-glib-1.0/stream-load.json
>> +#usr/share/installed-tests
>> +#usr/share/installed-tests/json-glib-1.0
>> +#usr/share/installed-tests/json-glib-1.0/array.test
>> +#usr/share/installed-tests/json-glib-1.0/boxed.test
>> +#usr/share/installed-tests/json-glib-1.0/builder.test
>> +#usr/share/installed-tests/json-glib-1.0/generator.test
>> +#usr/share/installed-tests/json-glib-1.0/gvariant.test
>> +#usr/share/installed-tests/json-glib-1.0/invalid.test
>> +#usr/share/installed-tests/json-glib-1.0/node.test
>> +#usr/share/installed-tests/json-glib-1.0/object.test
>> +#usr/share/installed-tests/json-glib-1.0/parser.test
>> +#usr/share/installed-tests/json-glib-1.0/path.test
>> +#usr/share/installed-tests/json-glib-1.0/reader.test
>> +#usr/share/installed-tests/json-glib-1.0/serialize-complex.test
>> +#usr/share/installed-tests/json-glib-1.0/serialize-full.test
>> +#usr/share/installed-tests/json-glib-1.0/serialize-simple.test
>> +#usr/share/locale/ab/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/as/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/be/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/bg/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/bn_IN/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/bs/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ca/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ca@valencia/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/cs/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/da/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/de/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/el/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/en_GB/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/eo/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/es/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/et/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/eu/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/fa/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/fr/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/fur/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/gl/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/he/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/hi/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/hr/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/hu/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/id/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/it/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ja/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ka/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/kab/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ko/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ky/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/lt/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/lv/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ml/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ms/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/nb/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ne/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/nl/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/oc/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/or/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/pa/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/pt/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/pt_BR/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ro/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ru/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/sk/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/sl/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/sr/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/sr@latin/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/sv/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/te/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/tg/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/th/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/tr/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/ug/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/uk/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/vi/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/zh_CN/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/zh_HK/LC_MESSAGES/json-glib-1.0.mo
>> +#usr/share/locale/zh_TW/LC_MESSAGES/json-glib-1.0.mo
>> diff --git a/lfs/json-glib b/lfs/json-glib
>> new file mode 100644
>> index 000000000..00617cd93
>> --- /dev/null
>> +++ b/lfs/json-glib
>> @@ -0,0 +1,84 @@
>> +###############################################################################
>> +#                                                                             #
>> +# IPFire.org - A linux based firewall                                         #
>> +# Copyright (C) 2007-2025  IPFire Team  <info@ipfire.org>                     #
>> +#                                                                             #
>> +# This program is free software: you can redistribute it and/or modify        #
>> +# it under the terms of the GNU General Public License as published by        #
>> +# the Free Software Foundation, either version 3 of the License, or           #
>> +# (at your option) any later version.                                         #
>> +#                                                                             #
>> +# This program is distributed in the hope that it will be useful,             #
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
>> +# GNU General Public License for more details.                                #
>> +#                                                                             #
>> +# You should have received a copy of the GNU General Public License           #
>> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
>> +#                                                                             #
>> +###############################################################################
>> +
>> +###############################################################################
>> +# Definitions
>> +###############################################################################
>> +
>> +include Config
>> +
>> +VER        = 1.10.6
>> +
>> +THISAPP    = json-glib-$(VER)
>> +DL_FILE    = $(THISAPP).tar.xz
>> +DL_FROM    = $(URL_IPFIRE)
>> +DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> +TARGET     = $(DIR_INFO)/$(THISAPP)
>> +
>> +###############################################################################
>> +# Top-level Rules
>> +###############################################################################
>> +
>> +objects = $(DL_FILE)
>> +
>> +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> +
>> +$(DL_FILE)_BLAKE2 = 125ba305d5d33ecb1a1fbe46322c5035c7f97bd49e8eeef26e3c9c5d829693978fdc10bbe3d926cd4d07f8fd80c9df282d5ff7fe80ab4a6ab8e17c93e9d362d4
>> +
>> +install : $(TARGET)
>> +
>> +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
>> +
>> +download :$(patsubst %,$(DIR_DL)/%,$(objects))
>> +
>> +b2 : $(subst %,%_BLAKE2,$(objects))
>> +
>> +dist:
>> +    @$(PAK)
>> +
>> +###############################################################################
>> +# Downloading, checking, b2sum
>> +###############################################################################
>> +
>> +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
>> +    @$(CHECK)
>> +
>> +$(patsubst %,$(DIR_DL)/%,$(objects)) :
>> +    @$(LOAD)
>> +
>> +$(subst %,%_BLAKE2,$(objects)) :
>> +    @$(B2SUM)
>> +
>> +###############################################################################
>> +# Installation Details
>> +###############################################################################
>> +
>> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> +    @$(PREBUILD)
>> +    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
>> +    cd $(DIR_APP) && meson setup \
>> +        --prefix=/usr \
>> +        --sysconfdir=/etc \
>> +        --libdir=/usr/lib \
>> +        builddir/
>> +    cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
>> +    cd $(DIR_APP) && ninja -C builddir/ install
>> +    @rm -rf $(DIR_APP)
>> +    @$(POSTBUILD)
>> diff --git a/make.sh b/make.sh
>> index 57a0ff2cf..3412c8f5a 100755
>> --- a/make.sh
>> +++ b/make.sh
>> @@ -1514,6 +1514,7 @@ build_system() {
>>      lfsmake2 libarchive
>>      lfsmake2 cmake
>>      lfsmake2 json-c
>> +    lfsmake2 json-glib
>>      lfsmake2 tcl
>>      lfsmake2 python3-MarkupSafe
>>      lfsmake2 python3-Jinja2
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-07-08 19:08 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-08 15:04 [PATCH 1/3] json-glib: New package Daniel Weismüller
2025-07-08 15:04 ` [PATCH 2/3] libtpms: " Daniel Weismüller
2025-07-08 15:04 ` [PATCH 3/3] swtpm: " Daniel Weismüller
2025-07-08 18:32 ` [PATCH 1/3] json-glib: " Adolf Belka
2025-07-08 19:08   ` Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox