Commit bca22545 authored by jan.koester's avatar jan.koester
Browse files

test

parent d4c22d7e

debian/control

+13 −13
Original line number Diff line number Diff line
@@ -4,19 +4,19 @@ Priority: optional 
Maintainer: Jan Koester <jan.koester@tuxist.de>

Build-Depends: debhelper-compat (= 13), cmake (>= 3.18),

 ninja-build,

 libhttppp-dev <!nspawn>,

 libnetplus-dev <!nspawn>,

 libjson-c-dev <!nspawn>,

 libparitypp-dev <!nspawn>,

 libuuidplus-dev <!nspawn>,

 libauthorize-dev <!nspawn>,

 libconfplus-dev <!nspawn>,

 libcmdplus-dev <!nspawn>,

 libdbpp-dev <!nspawn>,

 libbrotli-dev <!nspawn>,

 libtinyxml2-dev <!nspawn>,

 libsmtpclient-dev <!nspawn>,

 libhtmlpp-dev <!nspawn>,

 libhttppp-dev <nonspawn>,

 libnetplus-dev <nonspawn>,

 libjson-c-dev <nonspawn>,

 libparitypp-dev <nonspawn>,

 libuuidplus-dev <nonspawn>,

 libauthorize-dev <nonspawn>,

 libconfplus-dev <nonspawn>,

 libcmdplus-dev <nonspawn>,

 libdbpp-dev <nonspawn>,

 libbrotli-dev <nonspawn>,

 libtinyxml2-dev <nonspawn>,

 libsmtpclient-dev <nonspawn>,

 libhtmlpp-dev <nonspawn>,

 pkg-config

Standards-Version: 4.6.2

Rules-Requires-Root: no

debian/rules

+9 −9
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
	dh $@ --buildsystem=cmake



TOOLCHAIN_FILE = /usr/local/musl/share/musl-llvm-toolchain.cmake

IS_NSPAWN = $(filter nspawn,$(DEB_BUILD_PROFILES))

IS_NONSPAWN = $(filter nonspawn,$(DEB_BUILD_PROFILES))



override_dh_auto_configure:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	dh_auto_configure -- \

		-DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \

		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -25,28 +25,28 @@ else 
endif



override_dh_shlibdeps:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	@echo "Skipping dh_shlibdeps (self-contained nspawn container)"

else

	dh_shlibdeps

endif



override_dh_dwz:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	@echo "Skipping dh_dwz (DWARF5 from clang not supported by dwz)"

else

	dh_dwz

endif



override_dh_auto_install:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	dh_auto_install --destdir=debian/blogi/opt/blogi

else

	dh_auto_install

endif



override_dh_install:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	@echo "Nspawn build — assembling chroot at /opt/blogi (musl)"

	# musl dynamic linker

	mkdir -p debian/blogi/opt/blogi/lib
@@ -116,19 +116,19 @@ endif 


override_dh_fixperms:

	dh_fixperms

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	chmod +x debian/blogi/opt/blogi/usr/local/musl/lib/libc.so

endif



override_dh_missing:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	@echo "Skipping dh_missing (nspawn build installs files manually)"

else

	dh_missing

endif



override_dh_usrlocal:

ifneq ($(IS_NSPAWN),)

ifeq ($(IS_NONSPAWN),)

	@echo "Skipping dh_usrlocal (nspawn blogi-dev ships musl toolchain in /usr/local)"

else

	dh_usrlocal

packaging/build-nspawn.sh

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ build_blogi() { 
        cd $BUILD_DIR/blogi



        # Package via dpkg-buildpackage (handles cmake configure+build+install)

        dpkg-buildpackage -us -uc -d -b --build-profiles=nspawn

        dpkg-buildpackage -us -uc -d -b



        # Collect .deb files

        mkdir -p $BUILD_DIR/output