diff --git a/kiwi_metainfo_helper b/kiwi_metainfo_helper index 95aee5e..73a2a44 100644 --- a/kiwi_metainfo_helper +++ b/kiwi_metainfo_helper @@ -71,7 +71,7 @@ if grep -q "%OS_" ${files[@]}; then # Extract the content tempdir=$(mktemp -d) trap "rm -r ${tempdir}" EXIT - rpm2cpio "${relpkgs[0]}" | cpio -idD "${tempdir}" + rpm2cpio "${relpkgs[0]}" | (cd "${tempdir}" && cpio -id) # And source it [ -f "${tempdir}/usr/lib/os-release" ] && . "${tempdir}/usr/lib/os-release" diff --git a/obs-service-kiwi_metainfo_helper.changes b/obs-service-kiwi_metainfo_helper.changes index 24578f8..4da0780 100644 --- a/obs-service-kiwi_metainfo_helper.changes +++ b/obs-service-kiwi_metainfo_helper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 15 13:08:03 UTC 2023 - Michal Suchanek + +- cpio on SLE12 does not support -D option, emulate it. + ------------------------------------------------------------------- Tue Dec 6 17:10:20 UTC 2022 - Dominique Leuenberger diff --git a/obs-service-kiwi_metainfo_helper.spec b/obs-service-kiwi_metainfo_helper.spec index 6f97a7b..8a8e2f7 100644 --- a/obs-service-kiwi_metainfo_helper.spec +++ b/obs-service-kiwi_metainfo_helper.spec @@ -1,7 +1,7 @@ # # spec file for package obs-service-kiwi_metainfo_helper # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed