/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: 2023-02-07 18:59:50 UTC
  • mto: This revision was merged to the branch mainline in revision 408.
  • Revision ID: teddy@recompile.se-20230207185950-ow7bwdc1puy8s3yq
Prefer "pkg-config" over the old "gpgme-config" command.

* Makefile (GPGME_CFLAGS, GPGME_LIBS): First try to use $(PKG_CONFIG),
  and if it fails, fall back to the old "gpgme-config".

Reported-by: Andreas Metzler <ametzler@bebt.de>
Suggested-by: Andreas Metzler <ametzler@bebt.de>

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