Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2019-12-14 12:04:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Sat Dec 14 12:04:18 2019 rev:277 rq:756828 version:7.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2019-12-07 15:23:10.959730519 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new.4691/linuxrc.changes 2019-12-14 12:04:48.803389084 +0100 @@ -1,0 +2,22 @@ +Fri Dec 13 14:15:51 UTC 2019 - [email protected] + +- merge gh#openSUSE/linuxrc#207 +- Revert "Append RPM_OPT_FLAGS to CFLAGS." (bsc#1158996) +- 7.0.7 + +------------------------------------------------------------------- +Thu Dec 12 11:31:50 UTC 2019 - Steffen Winterfeldt <[email protected]> + +- enhance shell login and installer to indicate IBM Z model + (jsc#SLE-9424) + +-------------------------------------------------------------------- +Tue Dec 10 12:18:47 UTC 2019 - [email protected] + +- merge gh#openSUSE/linuxrc#206 +- For jsc#SLE-9474, Added logic to linuxrc.c and util.c to retrieve + the name of the processor linuxrc is running on, for mainframe + systems only. +- 7.0.6 + +-------------------------------------------------------------------- Old: ---- linuxrc-7.0.5.tar.xz New: ---- linuxrc-7.0.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.6jhsAv/_old 2019-12-14 12:04:51.451388625 +0100 +++ /var/tmp/diff_new_pack.6jhsAv/_new 2019-12-14 12:04:51.455388623 +0100 @@ -17,7 +17,7 @@ Name: linuxrc -Version: 7.0.5 +Version: 7.0.7 Release: 0 Summary: SUSE Installation Program License: GPL-3.0+ ++++++ linuxrc-7.0.5.tar.xz -> linuxrc-7.0.7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/Makefile new/linuxrc-7.0.7/Makefile --- old/linuxrc-7.0.5/Makefile 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/Makefile 2019-12-13 15:15:51.000000000 +0100 @@ -1,6 +1,10 @@ CC = gcc -CFLAGS = -c -g -O2 -Wall -Wno-pointer-sign $(RPM_OPT_FLAGS) +CFLAGS = -c -g -O2 -Wall -Wno-pointer-sign LDFLAGS = -rdynamic -lhd -lblkid -lcurl -lreadline -lmediacheck +ARCH = $(shell /usr/bin/uname -m) +ifeq ($(ARCH),s390x) +LDFLAGS += -lqc +endif GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/VERSION new/linuxrc-7.0.7/VERSION --- old/linuxrc-7.0.5/VERSION 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/VERSION 2019-12-13 15:15:51.000000000 +0100 @@ -1 +1 @@ -7.0.5 +7.0.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/changelog new/linuxrc-7.0.7/changelog --- old/linuxrc-7.0.5/changelog 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/changelog 2019-12-13 15:15:51.000000000 +0100 @@ -1,3 +1,13 @@ +2019-12-13: 7.0.7 + - merge gh#openSUSE/linuxrc#207 + - Revert "Append RPM_OPT_FLAGS to CFLAGS." + +2019-12-10: 7.0.6 + - merge gh#openSUSE/linuxrc#206 + - For jsc#SLE-9474, Added logic to linuxrc.c and util.c to retrieve + the name of the processor linuxrc is running on, for mainframe + systems only. + 2019-12-05: 7.0.5 - merge gh#openSUSE/linuxrc#204 - Append RPM_OPT_FLAGS to CFLAGS. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/global.h new/linuxrc-7.0.7/global.h --- old/linuxrc-7.0.5/global.h 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/global.h 2019-12-13 15:15:51.000000000 +0100 @@ -527,6 +527,7 @@ * 2: if necessary, with user dialog (default) * 3: if necessary, no user dialog */ + char *platform_name; /* Human-readable name of the hardware */ struct { unsigned failed:1; /**< digest check failed */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/linuxrc.c new/linuxrc-7.0.7/linuxrc.c --- old/linuxrc-7.0.5/linuxrc.c 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/linuxrc.c 2019-12-13 15:15:51.000000000 +0100 @@ -46,6 +46,9 @@ #include "checkmedia.h" #include "url.h" #include <sys/utsname.h> +#ifdef __s390x__ +#include <query_capacity.h> +#endif #if defined(__alpha__) || defined(__ia64__) #define SIGNAL_ARGS int signum, int x, struct sigcontext *scp @@ -718,6 +721,11 @@ util_setup_coredumps(); #if defined(__s390__) || defined(__s390x__) + void *qc_configuration_handle = NULL; + const char *qc_result_string = NULL; + int qc_return_code = 0; + int qc_get_return_code = 0; + if(util_check_exist("/sys/hypervisor/s390")) { char *type; @@ -742,6 +750,22 @@ if(!strncmp(utsinfo.machine, "s390x", sizeof "s390x" - 1 )) config.hwp.hypervisor="KVM"; else config.hwp.hypervisor="Reallyunknown"; } + + qc_configuration_handle = qc_open(&qc_return_code); + if (qc_return_code==0) + qc_get_return_code = qc_get_attribute_string(qc_configuration_handle, qc_type_name, + 0, &qc_result_string); + else log_show("The call to qc_open failed.\n"); + + if (qc_get_return_code<=0) { + log_show("Unable to retrieve machine type.\n"); + strprintf(&config.platform_name, "%s", "on unknown machine type"); + } + else strprintf(&config.platform_name, "on %s", qc_result_string); + + qc_close(qc_configuration_handle); + #else + config.platform_name=""; #endif /* add cmdline to info file */ @@ -896,8 +920,9 @@ if (config.linemode) putchar('\n'); printf( - "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2019 SUSE LLC <<<\n", - config.product + "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2019 SUSE LLC %s <<<\n", + config.product, + config.platform_name ); if (config.linemode) putchar('\n'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/mkpsfu/Makefile new/linuxrc-7.0.7/mkpsfu/Makefile --- old/linuxrc-7.0.5/mkpsfu/Makefile 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/mkpsfu/Makefile 2019-12-13 15:15:51.000000000 +0100 @@ -1,5 +1,5 @@ CC = gcc -CFLAGS = -Wall -O2 -fomit-frame-pointer $(RPM_OPT_FLAGS) +CFLAGS = -Wall -O2 -fomit-frame-pointer .PHONY: all fonts font1 font2 clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-7.0.5/util.c new/linuxrc-7.0.7/util.c --- old/linuxrc-7.0.5/util.c 2019-12-05 11:19:42.000000000 +0100 +++ new/linuxrc-7.0.7/util.c 2019-12-13 15:15:51.000000000 +0100 @@ -452,7 +452,9 @@ uname (&utsinfo_ri); if (config.linemode) { - printf (">>> linuxrc " LXRC_FULL_VERSION " (Kernel %s) <<<\n", utsinfo_ri.release); + printf (">>> linuxrc " LXRC_FULL_VERSION " (Kernel %s) %s <<<\n", + utsinfo_ri.release, + config.platform_name); return; } memset (&win_ri, 0, sizeof (window_t)); @@ -483,8 +485,9 @@ win_ri.style = STYLE_SUNKEN; win_open (&win_ri); - sprintf (text_ti, ">>> linuxrc " LXRC_FULL_VERSION " (Kernel %s) <<<", - utsinfo_ri.release); + sprintf (text_ti, ">>> linuxrc " LXRC_FULL_VERSION " (Kernel %s) %s <<<", + utsinfo_ri.release, + config.platform_name); util_center_text (text_ti, max_x_ig - 4); disp_set_color (colors_prg->has_colors ? COL_BWHITE : colors_prg->msg_fg, win_ri.bg_color);
