From 481879772435a1632563d0d2a65c90fe5b7d9d0b Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 20 Mar 2021 12:47:16 +0100 Subject: [PATCH] - always disable systemd bcond at build time --- builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/builder.sh b/builder.sh index 14f317a..787e216 100755 --- a/builder.sh +++ b/builder.sh @@ -1754,6 +1754,10 @@ build_package() { if grep -q -E 'systemd(unitdir|userunitdir|tmpfilesdir)' $specdir/$SPECFILE; then sed -i -e '/^%exclude_systemd_files/d; /^%files/s/$/\n%exclude_systemd_files/g;' $specdir/$SPECFILE fi + # Disable systemd bcond if present and enabled, there is no systemd in TLD + if grep -q -E '^%bcond_without\s+systemd\s+' $specdir/$SPECFILE; then + sed -i -r -e '/^%bcond_without\s+systemd\s+/s/bcond_without/bcond_with/g;' $specdir/$SPECFILE + fi # FIXME: eval here is exactly why? PATH=$CLEAN_PATH eval teeboth "'$logfile'" ${TIME_COMMAND} ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $specdir/$SPECFILE retval=$? -- 2.44.0