commit ganglia for openSUSE:Factory
Hello community, here is the log from the commit of package ganglia for openSUSE:Factory checked in at 2018-03-30 12:08:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ganglia (Old) and /work/SRC/openSUSE:Factory/.ganglia.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ganglia" Fri Mar 30 12:08:47 2018 rev:5 rq:592349 version:3.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ganglia/ganglia.changes 2018-03-14 19:40:44.905556423 +0100 +++ /work/SRC/openSUSE:Factory/.ganglia.new/ganglia.changes 2018-03-30 12:08:50.834643754 +0200 @@ -1,0 +2,10 @@ +Thu Mar 29 12:17:33 UTC 2018 - cgoll@suse.com + +- detect_aarch.patch: + detect architecture correctly for aarch64 in module sys, + backported from upstream (bsc#1087257) +- add_unknown_arch.patch: + arch for gmond module sys defaults to unknown if arch can not be + deteced with precompiler macros, backported from upstream + +------------------------------------------------------------------- New: ---- add_unknown_arch.patch detect_aarch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ganglia.spec ++++++ --- /var/tmp/diff_new_pack.3ZCAYf/_old 2018-03-30 12:08:51.494619892 +0200 +++ /var/tmp/diff_new_pack.3ZCAYf/_new 2018-03-30 12:08:51.494619892 +0200 @@ -32,6 +32,8 @@ # PATCH-FIX-OPENSUSE ganglia-3.7.1-no-private-apr.patch Patch1: ganglia-3.7.2-no-private-apr.patch Patch2: gmetad-service-btrfs-check.patch +Patch3: detect_aarch.patch +Patch4: add_unknown_arch.patch BuildRequires: fdupes BuildRequires: libapr1-devel BuildRequires: libart_lgpl-devel @@ -155,6 +157,8 @@ %setup -q %patch1 -p1 %patch2 +%patch3 +%patch4 %build export LIBS="-ltirpc" ++++++ add_unknown_arch.patch ++++++ --- ./libmetrics/linux/metrics.c.orig 2018-03-29 17:05:23.884576752 +0200 +++ ./libmetrics/linux/metrics.c 2018-03-29 17:07:28.228537714 +0200 @@ -593,39 +593,30 @@ #ifdef __i386__ snprintf(val.str, MAX_G_STRING_SIZE, "x86"); -#endif -#ifdef __x86_64__ +#elif __x86_64__ snprintf(val.str, MAX_G_STRING_SIZE, "x86_64"); -#endif -#ifdef __ia64__ +#elif __ia64__ snprintf(val.str, MAX_G_STRING_SIZE, "ia64"); -#endif -#ifdef __sparc__ +#elif __sparc__ snprintf(val.str, MAX_G_STRING_SIZE, "sparc"); -#endif -#ifdef __alpha__ +#elif __alpha__ snprintf(val.str, MAX_G_STRING_SIZE, "alpha"); -#endif -#ifdef __powerpc__ +#elif __powerpc__ snprintf(val.str, MAX_G_STRING_SIZE, "powerpc"); -#endif -#ifdef __m68k__ +#elif __m68k__ snprintf(val.str, MAX_G_STRING_SIZE, "m68k"); -#endif -#ifdef __mips__ +#elif __mips__ snprintf(val.str, MAX_G_STRING_SIZE, "mips"); -#endif -#ifdef __arm__ +#elif __arm__ snprintf(val.str, MAX_G_STRING_SIZE, "arm"); -#endif -#ifdef __aarch64__ +#elif __aarch64__ snprintf(val.str, MAX_G_STRING_SIZE, "aarch64"); -#endif -#ifdef __hppa__ +#elif __hppa__ snprintf(val.str, MAX_G_STRING_SIZE, "hppa"); -#endif -#ifdef __s390__ +#elif __s390__ snprintf(val.str, MAX_G_STRING_SIZE, "s390"); +#else + snprintf(val.str, MAX_G_STRING_SIZE, "unknown"); #endif return val; ++++++ detect_aarch.patch ++++++ --- ./libmetrics/linux/metrics.c.orig 2018-03-29 14:51:41.974310218 +0200 +++ ./libmetrics/linux/metrics.c 2018-03-29 15:08:05.861449768 +0200 @@ -618,6 +618,9 @@ #ifdef __arm__ snprintf(val.str, MAX_G_STRING_SIZE, "arm"); #endif +#ifdef __aarch64__ + snprintf(val.str, MAX_G_STRING_SIZE, "aarch64"); +#endif #ifdef __hppa__ snprintf(val.str, MAX_G_STRING_SIZE, "hppa"); #endif
participants (1)
-
root@hilbert.suse.de