File 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-d... of Package pcp

Overview Repositories Revisions Requests Users Attributes Meta

File 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch of Package pcp

From b591bf4f9f73f11d012e40f4860a8635b4096977 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Tue, 15 Jan 2019 01:15:45 +0100
Subject: [PATCH] pmns: don't package .NeedRebuild for SUSE distros

.NeedRebuild creation is handled by rpm scripts.
This change also fixes the target_distro configure check for modern
[open]SUSE distros, which only include /etc/os-release.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---
 configure            | 1 +
 configure.ac         | 1 +
 src/pmns/GNUmakefile | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

Index: pcp-4.3.0/configure
===================================================================
--- pcp-4.3.0.orig/configure
+++ pcp-4.3.0/configure
@@ -3324,6 +3324,7 @@ then
 $as_echo "#define IS_LINUX 1" >>confdefs.h
 
     test -f /etc/SuSE-release && target_distro=suse
+    grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse
     test -f /etc/fedora-release && target_distro=fedora
     test -f /etc/redhat-release && target_distro=redhat
     test -f /etc/debian_version && target_distro=debian
Index: pcp-4.3.0/configure.ac
===================================================================
--- pcp-4.3.0.orig/configure.ac
+++ pcp-4.3.0/configure.ac
@@ -281,6 +281,7 @@ if test $target_os = linux
 then
     AC_DEFINE(IS_LINUX, [1], [Platform is Linux])
     test -f /etc/SuSE-release && target_distro=suse
+    grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse
     test -f /etc/fedora-release && target_distro=fedora
     test -f /etc/redhat-release && target_distro=redhat
     test -f /etc/debian_version && target_distro=debian
Index: pcp-4.3.0/src/pmns/GNUmakefile
===================================================================
--- pcp-4.3.0.orig/src/pmns/GNUmakefile
+++ pcp-4.3.0/src/pmns/GNUmakefile
@@ -60,7 +60,7 @@ install:	default
 	$(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild
 	$(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid
 	$(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR)
-ifeq (, $(filter redhat debian, $(PACKAGE_DISTRIBUTION)))
+ifneq "$(TARGET_OS)" "linux"
 	$(INSTALL) -m 644 .NeedRebuild $(PMNS_VAR_DIR)/.NeedRebuild
 endif

Places

File 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch of Package pcp

Places