1
0
Ana Guerrero 2023-09-21 20:13:07 +00:00 committed by Git OBS Bridge
commit 588989e673
3 changed files with 7 additions and 2 deletions

View File

@ -71,7 +71,7 @@ if grep -q "%OS_" ${files[@]}; then
# Extract the content # Extract the content
tempdir=$(mktemp -d) tempdir=$(mktemp -d)
trap "rm -r ${tempdir}" EXIT trap "rm -r ${tempdir}" EXIT
rpm2cpio "${relpkgs[0]}" | cpio -idD "${tempdir}" rpm2cpio "${relpkgs[0]}" | (cd "${tempdir}" && cpio -id)
# And source it # And source it
[ -f "${tempdir}/usr/lib/os-release" ] && . "${tempdir}/usr/lib/os-release" [ -f "${tempdir}/usr/lib/os-release" ] && . "${tempdir}/usr/lib/os-release"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 15 13:08:03 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
- cpio on SLE12 does not support -D option, emulate it.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 6 17:10:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org> Tue Dec 6 17:10:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package obs-service-kiwi_metainfo_helper # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed