From libguestfs-bounces@redhat.com Wed Aug 31 13:20:03 2016 Return-Path:
Delivered-To: unknown Received: from gwmail.emea.novell.com (143.186.119.90:993) by laptop.vms with IMAP4-SSL; 31 Aug 2016 13:20:03 -0000 Received: from prv-mx.provo.novell.com (novprvlin0681.provo.novell.com [130.57.1.19]) by prv-mh.provo.novell.com with ESMTP (NOT encrypted); Wed, 31 Aug 2016 07:09:26 -0600 Received: from mx6-phx2.redhat.com (209.132.183.39) by
Hello community,
here is the log from the commit of package supermin for openSUSE:Factory checked in at 2016-09-12 13:25:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/supermin (Old)
and /work/SRC/openSUSE:Factory/.supermin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supermin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/supermin/supermin.changes 2016-06-07 23:46:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.supermin.new/supermin.changes 2016-09-12 13:25:51.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 8 15:01:41 UTC 2016 - cbosdonnat@suse.com
+
+- Remove use of SuSE-release and use os-release instead. (bsc#997936)
+ 0001-add_simple_handling_of_os-release.patch
+ 0002-use_os-release_to_detect_the_distro.patch
+ 0003-tests_use__etc_os-release_in_test-harder.patch
+
+-------------------------------------------------------------------
New:
----
0001-add_simple_handling_of_os-release.patch
0002-use_os-release_to_detect_the_distro.patch
0003-tests_use__etc_os-release_in_test-harder.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ supermin.spec ++++++
--- /var/tmp/diff_new_pack.r7Fxj7/_old 2016-09-12 13:25:52.000000000 +0200
+++ /var/tmp/diff_new_pack.r7Fxj7/_new 2016-09-12 13:25:52.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package supermin
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,9 @@
Requires: zypper
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: supermin-%{version}.tar.xz
+Patch0: 0001-add_simple_handling_of_os-release.patch
+Patch1: 0002-use_os-release_to_detect_the_distro.patch
+Patch2: 0003-tests_use__etc_os-release_in_test-harder.patch
%if "%{?_ignore_exclusive_arch}" == ""
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
%endif
@@ -45,11 +48,11 @@
BuildRequires: ocaml-findlib
BuildRequires: ocaml-rpm-macros >= 4.02.1
BuildRequires: pkg-config
+BuildRequires: xz-devel
+BuildRequires: zlib-devel
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(ext2fs)
BuildRequires: pkgconfig(rpm)
-BuildRequires: xz-devel
-BuildRequires: zlib-devel
%description
supermin is a tool for building supermin appliances. These are tiny
@@ -59,6 +62,9 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
export ZYPPER=zypper
++++++ 0001-add_simple_handling_of_os-release.patch ++++++
prv-mx.provo.novell.com (130.57.1.10) GWAVA SMTP; Wed, 31 Aug 2016 07:10:12
-0600
X-Spam_ID:
str=0001.0A010202.57C6D706.0196:SCFSTAT2484459,ss=1,re=-4.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0
X-GWAVADAT:
<keymat><rkey>gvWn3QsGV50RMxxr</rkey><gkey>9c16c207872a47573356cfe20b727ec6b327e3bac2a6eaa5ec59d5e9d6aa8342</gkey><objectid>17boib3.17boib3.v6</objectid></keymat>
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by
mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7VD5h2P022390; Wed, 31
Aug 2016 09:05:44 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
id u7VD5gWQ007141 for
From libguestfs-bounces@redhat.com Wed Aug 31 13:10:02 2016 From: Pino Toscano
To: libguestfs@redhat.com Date: Wed, 31 Aug 2016 15:05:36 +0200 Message-Id: <1472648736-5613-3-git-send-email-ptoscano@redhat.com> In-Reply-To: <1472648736-5613-1-git-send-email-ptoscano@redhat.com> References: <1472648736-5613-1-git-send-email-ptoscano@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libguestfs@redhat.com Subject: [Libguestfs] [PATCH 2/2] Use os-release to detect the distro X-BeenThere: libguestfs@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Discussion and development of libguestfs List-Unsubscribe: https://www.redhat.com/mailman/options/libguestfs, mailto:libguestfs-request@redhat.com?subject=unsubscribe List-Archive: https://www.redhat.com/archives/libguestfs List-Post: mailto:libguestfs@redhat.com List-Help: mailto:libguestfs-request@redhat.com?subject=help List-Subscribe: https://www.redhat.com/mailman/listinfo/libguestfs, mailto:libguestfs-request@redhat.com?subject=subscribe MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: libguestfs-bounces@redhat.com Errors-To: libguestfs-bounces@redhat.com X-getmail-retrieved-from-mailbox: INBOX X-Evolution-Source: 1323246076.1957.25@linux-smhm.site
Check the ID field in /etc/os-release on the current system, before
checking for the other old-style release-/version-like files in /etc.
Some distributions (openSUSE Thumbleweed) are starting to remove them,
breaking the supermin detection.
---
src/dpkg.ml | 3 ++-
src/pacman.ml | 5 +++--
src/rpm.ml | 15 +++++++++------
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/dpkg.ml b/src/dpkg.ml
index 70acfa2..1e785de 100644
--- a/src/dpkg.ml
+++ b/src/dpkg.ml
@@ -28,7 +28,8 @@ let dpkg_detect () =
Config.dpkg_query <> "no" &&
Config.dpkg_divert <> "no" &&
Config.apt_get <> "no" &&
- try (stat "/etc/debian_version").st_kind = S_REG with Unix_error _ -> false
+ (List.mem (Os_release.get_id ()) [ "debian"; "ubuntu" ] ||
+ try (stat "/etc/debian_version").st_kind = S_REG with Unix_error _ -> false)
let dpkg_primary_arch = ref ""
let settings = ref no_settings
diff --git a/src/pacman.ml b/src/pacman.ml
index 3340fa6..c35668a 100644
--- a/src/pacman.ml
+++ b/src/pacman.ml
@@ -24,8 +24,9 @@ open Package_handler
let pacman_detect () =
Config.pacman <> "no" && Config.fakeroot <> "no" &&
- (stat "/etc/arch-release").st_kind = S_REG &&
- Config.pacman_g2 = "no" (* not Frugalware with pacman-g2 *)
+ (Os_release.get_id () = "arch" ||
+ ((stat "/etc/arch-release").st_kind = S_REG &&
+ Config.pacman_g2 = "no")) (* not Frugalware with pacman-g2 *)
let settings = ref no_settings
diff --git a/src/rpm.ml b/src/rpm.ml
index a5dc67a..e409e37 100644
--- a/src/rpm.ml
+++ b/src/rpm.ml
@@ -31,21 +31,24 @@ let stringset_of_list pkgs =
let fedora_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
(Config.yumdownloader <> "no" || Config.dnf <> "no") &&
- try
- (stat "/etc/redhat-release").st_kind = S_REG ||
- (stat "/etc/fedora-release").st_kind = S_REG
- with Unix_error _ -> false
+ (List.mem (Os_release.get_id ()) [ "fedora"; "rhel"; "centos" ] ||
+ try
+ (stat "/etc/redhat-release").st_kind = S_REG ||
+ (stat "/etc/fedora-release").st_kind = S_REG
+ with Unix_error _ -> false)
let opensuse_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
Config.zypper <> "no" &&
- try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false
+ (List.mem (Os_release.get_id ()) [ "opensuse"; "sled"; "sles" ] ||
+ try (stat "/etc/SuSE-release").st_kind = S_REG with Unix_error _ -> false)
let mageia_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
Config.urpmi <> "no" &&
Config.fakeroot <> "no" &&
- try (stat "/etc/mageia-release").st_kind = S_REG with Unix_error _ -> false
+ (Os_release.get_id () = "mageia" ||
+ try (stat "/etc/mageia-release").st_kind = S_REG with Unix_error _ -> false)
let ibm_powerkvm_detect () =
Config.rpm <> "no" && Config.rpm2cpio <> "no" && rpm_is_available () &&
--
2.7.4
_______________________________________________
Libguestfs mailing list
Libguestfs@redhat.com
https://www.redhat.com/mailman/listinfo/libguestfs
++++++ 0003-tests_use__etc_os-release_in_test-harder.patch ++++++
From: Pino Toscano