/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to initramfs-unpack

  • Committer: Teddy Hogeborn
  • Date: 2024-09-08 07:04:52 UTC
  • mto: This revision was merged to the branch mainline in revision 410.
  • Revision ID: teddy@recompile.se-20240908070452-oyxj1zojswt0aft5
Fix #1069689 by using pkg-config in debian/rules

The directory for systemd unit files (output of "pkg-config systemd
--variable=systemdsystemunitdir") has changed.  But there was a
hardcoded instance of this directory in debian/mandos.dirs.  Fix this
by removing the directory from debian/mandos.dirs, and instead
creating the correct directory explicitly in debian/rules.

* debian/mandos.dirs (lib/systemd/system): Removed.
* debian/rules (PKG_CONFIG): New; copied from Makefile.
  (override_dh_installdirs-indep): New; run dh_installdirs twice:
  first normally, and again for the systemd unit file directory.

Closes: #1069689
Reported-By: Helmut Grohne <helmut@subdivi.de>
Thanks: Helmut Grohne <helmut@subdivi.de> for report and analysis

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
        elif { $catimg 2>/dev/null | lzop --test >/dev/null 2>&1;
66
66
               [ ${PIPESTATUS[-1]} -eq 0 ]; }; then
67
67
            decomp="lzop --stdout --decompress"
68
 
        elif { $catimg 2>/dev/null | zstd --test >/dev/null 2>&1;
69
 
               [ ${PIPESTATUS[-1]} -eq 0 ]; }; then
70
 
            decomp="zstdcat --stdout --decompress"
71
68
        else
72
69
            skip=$((${skip}+1))
73
70
            echo "Could not determine compression of ${imgfile}; trying to skip ${skip} bytes" >&2