]> TLD Linux GIT Repositories - packages/rpm-build-tools.git/commitdiff
- always disable systemd bcond at build time
authorMarcin Krol <hawk@tld-linux.org>
Sat, 20 Mar 2021 11:47:16 +0000 (12:47 +0100)
committerMarcin Krol <hawk@tld-linux.org>
Sat, 20 Mar 2021 11:47:16 +0000 (12:47 +0100)
builder.sh

index 14f317ac24cc09de0b90933ba2b54191f2911238..787e2168a51ce54da32094a9de3bfec8131760ea 100755 (executable)
@@ -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=$?