New Upstream Release - linuxlogo
Ready changes
Summary
Merged new upstream version: 6.01 (was: 6.0).
Resulting package
Built on 2023-01-19T07:39 (took 3m0s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases linuxlogo-dbgsymapt install -t fresh-releases linuxlogo
Lintian Result
Diff
diff --git a/ANNOUNCE b/ANNOUNCE
new file mode 100644
index 0000000..5d2b931
--- /dev/null
+++ b/ANNOUNCE
@@ -0,0 +1,34 @@
+ASCII-art Penguins and system info for 23 years: linux_logo hits version 6.0
+
+The linux_logo tool has been generating ANSI/ASCII art Linux logos and
+printing system information for 23 years, and has finally hit release 6.0.
+
+The tool came about out of the great Linux "should graphics drivers be in the
+kernel" GGI/KGI flamewar of 1997. In the end Linus Torvalds made a decision
+that set back Linux graphics for years, but a side thread developed with
+a key discussion "should the boot logo be in kernelspace or userspace".
+linux_logo came out as a solution for people with low-end graphics
+who fell on the "it should be in userspace" side of things. And while
+you are printing ASCII art, why not print some system info too?
+
+Most of the system info comes from the /proc/cpuinfo file. In theory the
+/proc filesystem is supposed to be part of the stable ABI, but it turns
+out that's just a suggestion. To handle that, I have accumulated a
+collection of over 1000 cpuinfo files from all architectures from a wide
+variety of machines dating back to the 386 era. I use these for testing
+that the system info looks OK.
+
+Another issue is printing total memory in the system, which seems like it
+should be straightforward but is not. Previously the best way was reading
+/proc/iomem but recent security changes have zeroed out all the values in
+that file, leading to misreported amounts of memory due to a poor fallback to
+checking the size of /proc/kcore (which gives crazy results on 64-bit
+systems). The proper fallback is /proc/meminfo but that gives lower than
+expected results on systems that reserve system memory for things like
+integrated graphics.
+
+Some other features in the 6.0 release: RISCV and ARM64 support.
+Proper handling of big.LITTLE support in ARM (where one system can have
+CPUs that vary by both model or manufacturer). Also adds support for
+the Model 15 teletype from the 1930s in case you are using one of
+those as a terminal.
diff --git a/Makefile b/Makefile
index 236c3d3..32fd887 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ translations:
cd po && $(MAKE)
logos-all: logo_config
- find ./logos -type f -a ! -name banner.logo -a ! -name classic.logo >> logo_config
+ find ./logos -type f -a ! -name banner.logo -a ! -name classic.logo | sort >> logo_config
$(MAKE) all
logo_config:
@@ -59,6 +59,7 @@ clean: Makefile.default
distclean: clean
cd $(LIBSYSINFO) && $(MAKE) distclean
rm -f Makefile.default logo_config
+# rm -f po/linux_logo.pot
linux_logo: linux_logo.o load_logo.o ./$(LIBSYSINFO)/libsysinfo.a
$(CROSS)$(CC) $(LDFLAGS) -o linux_logo linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) ./$(LIBSYSINFO)/libsysinfo.a
diff --git a/README b/README
index debd0f9..a2ac161 100644
--- a/README
+++ b/README
@@ -15,8 +15,8 @@
Four 2.7GHz Intel i5 Processors, 3.8GB RAM, 12800 Bogomips Total
orvavista
/*--------------------------------------------------------------------------*\
- LINUX_LOGO 6.0 -- Shows a Logo With some System Info - 9 May 2020
- by Vince Weaver ( vince _at_ deater.net, http://www.deater.net/weave )
+ LINUX_LOGO 6.01 -- Shows a Logo With some System Info - 22 July 2022
+ by Vince Weaver ( <vince@deater.net> , http://www.deater.net/weave )
SUPPORTS Linux (most architectures) and some non-Linux OSes
\*--------------------------------------------------------------------------*/
@@ -76,10 +76,10 @@ POTENTIAL USES FOR linux_logo
----------------------------------------------------------------------->
untar and uncompress the file
- tar -xzvf linux_logo-6.0.tar.gz
+ tar -xzvf linux_logo-6.01.tar.gz
enter the directory
- cd linux_logo-6.0
+ cd linux_logo-6.01
run "configure"
./configure
@@ -408,7 +408,7 @@ WHERE TO GET LINUX_LOGO:
Check out other programs by me at http://www.deater.net/weave/vmwprod
-------------------------------------------------------------------------->
-THANKS
+THANKS FOR 25 YEARS OF LINUX_LOGO
-------------------------------------------------------------------------->
Many thanks to the people sending in patches and /proc/cpuinfo entries.
@@ -418,5 +418,5 @@ THANKS
Prosser.
-----------------
-Vince
-vince _at_ deater.net
+Vince `deater` Weaver
+vince@deater.net
diff --git a/debian/changelog b/debian/changelog
index b999b6a..74a0392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linuxlogo (6.01-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 19 Jan 2023 07:36:47 -0000
+
linuxlogo (6.0-0.1) unstable; urgency=medium
* NMU: Non-Maintainer Upload
diff --git a/debian/patches/0002-makefile-tweaks.patch b/debian/patches/0002-makefile-tweaks.patch
index 5c6bb9a..b0f7652 100644
--- a/debian/patches/0002-makefile-tweaks.patch
+++ b/debian/patches/0002-makefile-tweaks.patch
@@ -9,10 +9,10 @@ scripts want it to.
configure | 11 +----------
2 files changed, 11 insertions(+), 20 deletions(-)
-diff --git a/Makefile b/Makefile
-index 236c3d3..73c7ef1 100644
---- a/Makefile
-+++ b/Makefile
+Index: linuxlogo.git/Makefile
+===================================================================
+--- linuxlogo.git.orig/Makefile
++++ linuxlogo.git/Makefile
@@ -6,7 +6,8 @@
PROGNAME = linux_logo
@@ -32,8 +32,8 @@ index 236c3d3..73c7ef1 100644
ifneq($(CONFIGURE_RAN),1)
$(error Please run configure first)
endif
-@@ -61,40 +62,39 @@ distclean: clean
- rm -f Makefile.default logo_config
+@@ -62,40 +63,39 @@ distclean: clean
+ # rm -f po/linux_logo.pot
linux_logo: linux_logo.o load_logo.o ./$(LIBSYSINFO)/libsysinfo.a
- $(CROSS)$(CC) $(LDFLAGS) -o linux_logo linux_logo.o load_logo.o $(LIBSYSINFO_LIBRARY) ./$(LIBSYSINFO)/libsysinfo.a
@@ -80,10 +80,10 @@ index 236c3d3..73c7ef1 100644
cd po && $(MAKE) install
install-doc:
-diff --git a/configure b/configure
-index 2d30fd2..ed8b752 100755
---- a/configure
-+++ b/configure
+Index: linuxlogo.git/configure
+===================================================================
+--- linuxlogo.git.orig/configure
++++ linuxlogo.git/configure
@@ -58,15 +58,9 @@ fi
LIBSYSINFO=libsysinfo-0.3.0
diff --git a/debian/patches/0004-po-DESTDIR.patch b/debian/patches/0004-po-DESTDIR.patch
index fd3ca5f..0ce20cc 100644
--- a/debian/patches/0004-po-DESTDIR.patch
+++ b/debian/patches/0004-po-DESTDIR.patch
@@ -6,10 +6,10 @@ Subject: po DESTDIR
po/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/po/Makefile b/po/Makefile
-index ce732f9..0959c0f 100644
---- a/po/Makefile
-+++ b/po/Makefile
+Index: linuxlogo.git/po/Makefile
+===================================================================
+--- linuxlogo.git.orig/po/Makefile
++++ linuxlogo.git/po/Makefile
@@ -23,9 +23,9 @@ clean:
install: $(CATALOGS)
for n in $(CATALOGS); do \
diff --git a/debian/patches/0005-fscanf-warn.patch b/debian/patches/0005-fscanf-warn.patch
index 7da03ca..62a3ed9 100644
--- a/debian/patches/0005-fscanf-warn.patch
+++ b/debian/patches/0005-fscanf-warn.patch
@@ -6,10 +6,10 @@ Subject: fscanf warn
libsysinfo-0.3.0/Linux/sysinfo_linux.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/libsysinfo-0.3.0/Linux/sysinfo_linux.c b/libsysinfo-0.3.0/Linux/sysinfo_linux.c
-index b78d67b..3066963 100644
---- a/libsysinfo-0.3.0/Linux/sysinfo_linux.c
-+++ b/libsysinfo-0.3.0/Linux/sysinfo_linux.c
+Index: linuxlogo.git/libsysinfo-0.3.0/Linux/sysinfo_linux.c
+===================================================================
+--- linuxlogo.git.orig/libsysinfo-0.3.0/Linux/sysinfo_linux.c
++++ linuxlogo.git/libsysinfo-0.3.0/Linux/sysinfo_linux.c
@@ -240,7 +240,8 @@ double get_cpu_mhz(void) {
fff=fopen("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq","r");
diff --git a/debian/patches/linuxlog_add_ppc64le_arch.patch b/debian/patches/linuxlog_add_ppc64le_arch.patch
index f0feff3..f1711cf 100644
--- a/debian/patches/linuxlog_add_ppc64le_arch.patch
+++ b/debian/patches/linuxlog_add_ppc64le_arch.patch
@@ -9,10 +9,10 @@ Forwarded: https://github.com/deater/linux_logo/pull/3
libsysinfo-0.3.0/Linux/Makefile | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/libsysinfo-0.3.0/Linux/Makefile b/libsysinfo-0.3.0/Linux/Makefile
-index 3ab7156..39c0cb9 100644
---- a/libsysinfo-0.3.0/Linux/Makefile
-+++ b/libsysinfo-0.3.0/Linux/Makefile
+Index: linuxlogo.git/libsysinfo-0.3.0/Linux/Makefile
+===================================================================
+--- linuxlogo.git.orig/libsysinfo-0.3.0/Linux/Makefile
++++ linuxlogo.git/libsysinfo-0.3.0/Linux/Makefile
@@ -82,6 +82,9 @@ ppc: cpuinfo_ppc.c
ppc64: cpuinfo_ppc.c
$(CROSS)$(CC) $(CFLAGS) -o cpuinfo.o -c cpuinfo_ppc.c
diff --git a/debian/patches/properly_pass_compile_flags.patch b/debian/patches/properly_pass_compile_flags.patch
index c479b3b..a573ce0 100644
--- a/debian/patches/properly_pass_compile_flags.patch
+++ b/debian/patches/properly_pass_compile_flags.patch
@@ -7,10 +7,10 @@ Fixes build log scanner warnings.
libsysinfo-0.3.0/configure | 2 --
1 file changed, 2 deletions(-)
-diff --git a/libsysinfo-0.3.0/configure b/libsysinfo-0.3.0/configure
-index 84368ec..2eb4d8e 100755
---- a/libsysinfo-0.3.0/configure
-+++ b/libsysinfo-0.3.0/configure
+Index: linuxlogo.git/libsysinfo-0.3.0/configure
+===================================================================
+--- linuxlogo.git.orig/libsysinfo-0.3.0/configure
++++ linuxlogo.git/libsysinfo-0.3.0/configure
@@ -60,7 +60,6 @@ echo " Detected Operating System: "$OS
#echo " Install program: "$INSTALL
echo " C Compiler : "$CC
diff --git a/libsysinfo-0.3.0/Linux/cpuinfo_x86.c b/libsysinfo-0.3.0/Linux/cpuinfo_x86.c
index 4b72fab..92bf7d8 100644
--- a/libsysinfo-0.3.0/Linux/cpuinfo_x86.c
+++ b/libsysinfo-0.3.0/Linux/cpuinfo_x86.c
@@ -309,14 +309,19 @@ static void fixup_model_amd(struct cpu_info_type *cpu_info,
switch(cpu_info->model) {
/* Zen */
case 1: /* Naples, Whitehaven, Summit Ridge, Snowy Owl */
- case 17: /* Raven Ridge */
- case 24: /* Branded Kestrel, Dali */
+ case 17: /* Raven Ridge, Great Horned Owl */
+ case 24: /* Banded Kestrel */
+ case 32: /* Dali */
/* Zen+ */
- case 8: /* Pinnacle Ridge */
- //case 24:/* Picasso */
+ case 8: /* Colfax, Pinnacle Ridge */
+ /*case 24:*//* Picasso, why the same as Banded Kestrel? */
/* Zen2 */
case 49: /* Rome, Castle Peak */
+ case 71: /* Xbox Series X */
+ case 96: /* Renoir, Grey Hawk */
+ case 104: /* Lucienne */
case 113: /* Matisse */
+ case 144: /* Van Gogh */
default: break;
}
@@ -326,7 +331,36 @@ static void fixup_model_amd(struct cpu_info_type *cpu_info,
grab_amd_to_space(model_string,base_type,BUFSIZ);
}
+ else if (cpu_info->family==24) {
+ /* Joint partnership with China? */
+ /* Dhyana/Hygon is model 0? */
+ /* Grab from AMD to space */
+
+ grab_amd_to_space(model_string,base_type,BUFSIZ);
+ }
+ else if (cpu_info->family==25) {
+ /* Family 19h -- Zen3/Zen4 */
+
+ /* Note model numbers are extended/base concatenated */
+
+ switch(cpu_info->model) {
+ case 1: /* 0x01 EPYC 7003 Milan */
+ case 8: /* 0x08 Threadripper 5900 */
+ case 33: /* 0x21 Ryzen 5000 Vermeer */
+ case 64: /* 0x40 Rembrant */
+ /* 0x44? */
+ case 80: /* 0x50 Cezanne */
+ /* 0x6x? Zen 4 Raphael? */
+ /* 0x7x? Ryzen 7000? */
+ default: break;
+ }
+
+ /* Grab from AMD to space */
+
+ grab_amd_to_space(model_string,base_type,BUFSIZ);
+
+ }
else {
/* Unknown, try guessing */
grab_amd_to_space(model_string,base_type,BUFSIZ);
@@ -500,7 +534,9 @@ static void fixup_model_centaur(struct cpu_info_type *cpu_info,
/* calling them "Centaur VIA" chips */
if (strstr(model_string,"VIA")!=NULL) {
strncpy(cpu_info->chip_vendor,"VIA",4);
- strncpy(cpu_info->chip_type,model_string+4,SYSINFO_CHIP_TYPE_SIZE);
+ strncpy(cpu_info->chip_type,model_string+4,
+ SYSINFO_CHIP_TYPE_SIZE);
+ cpu_info->chip_type[SYSINFO_CHIP_TYPE_SIZE-1]=0;
}
/* Esther */
@@ -555,6 +591,21 @@ static void fixup_model_cyrix(struct cpu_info_type *cpu_info,
}
+/*******************/
+/* Hygon Chips */
+/*******************/
+static void fixup_model_hygon(struct cpu_info_type *cpu_info,
+ char *model_string) {
+
+ strncpy(cpu_info->chip_vendor,"Hygon",6);
+
+ if ( strstr(model_string,"C86")!=NULL) {
+ strncpy(cpu_info->chip_type,"C86",8);
+ }
+}
+
+
+
/*******************/
/* Intel Chips */
/*******************/
@@ -684,169 +735,241 @@ static void fixup_model_intel(struct cpu_info_type *cpu_info,
strncpy(base_type,"Pentium M",10);
break;
/* Core Duo */
- case 14: /* Yonah */
+ case 14: /* 0x0E Yonah */
strncpy(base_type,"Core Duo",9);
break;
/* Core2 */
- case 15: /* Merom */
- case 22: /* Merom L */
- case 23: /* Penryn, Wolfdale, Yorkfield */
- case 29: /* Dunnington */
+ case 15: /* 0x0F Merom */
+ case 22: /* 0x16 Merom L */
+ case 23: /* 0x17 Penryn, Wolfdale, Yorkfield */
+ case 29: /* 0x1D Dunnington */
strncpy(base_type,"Core2",6);
break;
/* Atom */
- case 28: /* Bonnell: Diamondville, Pineview */
- case 38: /* Bonnell Mid: Silverthorne, Lincroft */
- case 54: /* Saltwell: Cedarview */
- case 39: /* Saltwell Mid: Penwell */
- case 53: /* Saltwell Tabled: Cloverview */
+ case 28: /* 0x1C Bonnell: Diamondville, Pineview */
+ case 38: /* 0x26 Bonnell Mid: Silverthorne, Lincroft */
+ case 54: /* 0x36 Saltwell: Cedarview */
+ case 39: /* 0x27 Saltwell Mid: Penwell */
+ case 53: /* 0x35 Saltwell Tabled: Cloverview */
strncpy(base_type,"Atom",5);
break;
- case 55: /* Silvermont: Bay Trail, Valleyview */
- case 77: /* Silvermont D: Avaton, Rangely */
- case 74: /* Silvermont Mid: Merriefield, Tangier */
+ case 55: /* 0x37 Silvermont: Bay Trail, Valleyview */
+ case 77: /* 0x4D Silvermont D: Avaton, Rangely */
+ case 74: /* 0x4A Silvermont Mid: Merriefield, Tangier */
case 93: /* SoFIA */
strncpy(base_type,"Atom Silvermont",16);
break;
- case 76: /* Airmont: Cherry Trail, Braswell */
- case 90: /* Airmont Mid: Moorefield, Anniedale */
- case 117:/* Airmont NP: Lightning Mountain */
+ case 76: /* 0x4C Airmont: Cherry Trail, Braswell */
+ case 90: /* 0x5A Airmont Mid: Moorefield, Anniedale */
+ case 117:/* 0x75 Airmont NP: Lightning Mountain */
strncpy(base_type,"Atom Airmont",13);
break;
- case 92: /* Goldmont: Apollo Lake */
- case 95: /* Goldmont: Denverton */
+ case 92: /* 0x5C Goldmont: Apollo Lake */
+ case 95: /* 0x5F Goldmont: Denverton */
strncpy(base_type,"Atom Goldmont",17);
break;
- case 122: /* Goldmont Plus: Gemini Lake */
+ case 122: /* 0x7A Goldmont Plus: Gemini Lake */
strncpy(base_type,"Atom Goldmont+",18);
break;
- case 134: /* Tremont: Elkhart Lake */
+ case 134: /* 0x86 Tremont D: Jacobsville */
+ case 150: /* 0x96 Tremont : Elkhart Lake */
+ case 156: /* 0x9C Tremont L: Jasper Lake */
strncpy(base_type,"Atom Tremont",13);
break;
/* Knights Landing */
- case 87:
+ case 87: /* 0x57 */
strncpy(base_type,"Knights Landing",16);
break;
/* Knights Mill */
- case 133:
+ case 133:/* 0x85 */
strncpy(base_type,"Knights Mill",13);
break;
/* Nehalem */
- case 30: /* Nehalem */
- case 31: /* G: Auburndale / Havendale (cancelled?) */
+ case 30: /* 0x1E Nehalem */
+ case 31: /* 0x1F G: Auburndale / Havendale (cancelled?) */
strncpy(base_type,"Nehalem",8);
break;
- case 26: /* EP: Bloomfield */
+ case 26: /* 0x1A EP: Bloomfield */
strncpy(base_type,"Nehalem EP",11);
break;
- case 46: /* EX */
+ case 46: /* 0x2E EX */
strncpy(base_type,"Nehalem EX",11);
break;
/* Westmere */
- case 37: /* Arrandale */
+ case 37: /* 0x25 Arrandale */
strncpy(base_type,"Westmere",9);
break;
- case 44: /* Gulftown, EP */
+ case 44: /* 0x2C Gulftown, EP */
strncpy(base_type,"Westmere EP",12);
break;
- case 47: /* EX */
+ case 47: /* 0x2F EX */
strncpy(base_type,"Westmere EX",12);
break;
/* Sandybridge */
- case 42:
+ case 42: /* 0x2A Sandybridge */
strncpy(base_type,"Sandybridge",12);
break;
- case 45: /* E, EN, EP */
+ case 45: /* 0x2D E, EN, EP */
strncpy(base_type,"Sandybridge EP",15);
break;
/* Ivybridge */
- case 58: /* M, H, Gladden */
+ case 58: /* 0x3A M, H, Gladden */
strncpy(base_type,"Ivybridge",10);
break;
- case 62: /* E, EN, EP, EX */
+ case 62: /* 0x3E E, EN, EP, EX */
strncpy(base_type,"Ivybridge EP",13);
break;
/* Haswell */
- case 60: /* Haswell S */
- case 70: /* Haswell G GT3E */
+ case 60: /* 0x3C Haswell S */
strncpy(base_type,"Haswell",8);
break;
- case 69: /* Haswell L ULT*/
+ case 63: /* 0x3F Haswell X */
+ strncpy(base_type,"Haswell EP",11);
+ break;
+ case 69: /* 0x45 Haswell L ULT*/
strncpy(base_type,"Haswell ULT",12);
break;
- case 63: /* Haswell X */
- strncpy(base_type,"Haswell EP",11);
+ case 70: /* 0x46 Haswell G GT3E */
+ strncpy(base_type,"Haswell",8);
break;
+
/* Broadwell */
- case 61: /* U,Y,S */
+ case 61: /* 0x3D U,Y,S */
strncpy(base_type,"Broadwell",10);
break;
- case 71: /* G: H,C,W */
+ case 71: /* 0x47 G: H,C,W */
strncpy(base_type,"Broadwell-H",12);
break;
- case 86: /* D: DE, Hewitt Lake */
- strncpy(base_type,"Broadwell-DE",13);
- break;
- case 79: /* X: E, EP, EX */
+ case 79: /* 0x4F X: E, EP, EX */
strncpy(base_type,"Broadwell EP",13);
break;
+ case 86: /* 0x56 D: DE, Hewitt Lake */
+ strncpy(base_type,"Broadwell-DE",13);
+ break;
+
/* Skylake */
- case 78: /* Skylake L (mobile?) (Y,U) */
- case 94: /* Skylake ( DT,H,S) */
+ case 78: /* 0x4E Skylake L (mobile?) (Y,U) */
+ case 94: /* 0x5E Skylake ( DT,H,S) */
strncpy(base_type,"Skylake",8);
break;
/* Also Coffee Lake??? */
/* Also Whiskeylake/Amberlake?? */
/* Kabylake */
- case 142: /* Kabylake L: Y,U */
- case 158: /* Kabylake: DT, H, S, X */
- strncpy(base_type,"Kabylake",9);
+ case 142: /* 0x8E Kabylake L: Y,U */
+ if (cpu_info->stepping == 9) {
+ /* Amberlake = Stepping 9 */
+ strncpy(base_type,"Amberlake L",12);
+ }
+ else if (cpu_info->stepping==10) {
+ /* Coffeelake = Stepping 10 */
+ strncpy(base_type,"Coffeelake L",13);
+ }
+ else if ((cpu_info->stepping==11) ||
+ (cpu_info->stepping==12)) {
+ /* Whiskeylake = Stepping 11,12 */
+ strncpy(base_type,"Whiskeylake L",14);
+ }
+ else {
+ /* Kabylake L? Is that possible? */
+ strncpy(base_type,"Kabylake L",11);
+ }
+ break;
+
+ case 158: /* 0x9E Kabylake: DT, H, S, X */
+ if (cpu_info->stepping > 9) {
+ /* Coffeelake = Stepping 10-13 */
+ strncpy(base_type,"Coffeelake",11);
+ }
+ else {
+ strncpy(base_type,"Kabylake",9);
+ }
break;
/* Skylake/Cascadelake/Cooperlake Server */
- case 85:
+ case 85: /* 0x55 */
if (cpu_info->stepping < 5) {
+ /* stepping 4 */
strncpy(base_type,"Skylake X",10);
}
- else {
+ else if (cpu_info->stepping < 8) {
+ /* stepping 7 */
strncpy(base_type,"Cascadelake X",14);
}
+ else {
+ /* stepping 11 */
+ strncpy(base_type,"Cooperlake X",13);
+ }
break;
/* Cannonlake */
- case 102: /* Cannonlake U/L */
+ case 102: /* 0x66 Cannonlake U/L (Palm Cove) */
strncpy(base_type,"Cannonlake",11);
break;
- /* Icelake */
- case 106: /* Icelake X : Server */
- case 108: /* Icelake D : Server */
- case 125: /* Icelake : Y */
- case 126: /* Icelake L : U */
+ /* Icelake / Sunny Cove */
+ case 106: /* 0x6A Icelake X : Server */
+ case 108: /* 0x6C Icelake D : Server */
+ case 125: /* 0x7D Icelake : Y */
+ case 126: /* 0x7E Icelake L : U */
case 157: /* Icelake NNPI */
strncpy(base_type,"Icelake",8);
break;
+ /* Lakefield */
+ case 138: /* 0x8A Sunny Cove / Tremont */
+ strncpy(base_type,"Lakefield",10);
+ break;
+
+
/* Tigerlake */
- case 140: /* Tigerlake L : U */
- case 141: /* Tigerlake */
+ case 140: /* 0x8C Tigerlake L : U */
+ strncpy(base_type,"Tigerlake L",12);
+ break;
+ case 141: /* 0x8D Tigerlake */
strncpy(base_type,"Tigerlake",10);
break;
+ /* Sappphirerapids (Golden Cove) */
+ case 143: /* 0x8F Sapphirerapids X */
+ strncpy(base_type,"Sapphirerapids X",17);
+ break;
+
+
+ /* Alderlake (Golden Cove / Gracemont) */
+ case 151: /* 0x97 Alderlake S */
+ case 154: /* 0x9A Alderlake L */
+ case 190: /* 0xBE Alderlake L */
+ strncpy(base_type,"Alderlake",10);
+ break;
+
/* Cometlake */
- case 165: /* Cometlake */
- case 166: /* Cometlake L */
+ case 165: /* 0xA5 Cometlake */
strncpy(base_type,"Cometlake",10);
break;
+ case 166: /* 0xA6 Cometlake L */
+ strncpy(base_type,"Cometlake L",12);
+ break;
+
+ /* Rocketlake / Cypress Cove */
+ case 167: /* 0xA7 Rocketlake S L */
+ strncpy(base_type,"Rocketlake",11);
+ break;
+
+ /* Raptorlake */
+ case 183: /* 0xB7 Raptorlake */
+ case 186: /* 0xBA Raptorlake P */
+ strncpy(base_type,"Raptorlake",11);
+ break;
+
default: strncpy(base_type,"Unknown",8); break;
}
@@ -1172,6 +1295,12 @@ int get_cpu_info(struct cpu_info_type *cpu_info) {
fixup_model_cyrix(cpu_info,model_string);
}
+ /*******************/
+ /* Intel Chips */
+ /*******************/
+ if (!strncmp(vendor_string,"HygonGenuine",12)) {
+ fixup_model_hygon(cpu_info,model_string);
+ }
/*******************/
/* Intel Chips */
diff --git a/linux_logo-6.0.lsm b/linux_logo-6.01.lsm
similarity index 88%
rename from linux_logo-6.0.lsm
rename to linux_logo-6.01.lsm
index a4850ae..dabeb9a 100644
--- a/linux_logo-6.0.lsm
+++ b/linux_logo-6.01.lsm
@@ -1,7 +1,7 @@
Begin3
Title: linux_logo
-Version: 6.0
-Entered-date: 9MAY2020
+Version: 6.01
+Entered-date: 22JUL2022
Description: An ANSI Color Penguin Logo that can be run at bootup,
at login, and many other interesting times.
Supports: Linux (most architectures) and Solaris, Irix, AIX, etc.
@@ -10,7 +10,7 @@ Keywords: logo penguin boot system info ansi
Author: vince@deater.net (Vince Weaver)
Maintained-by: vince@deater.net (Vince Weaver)
Primary-site: metalab.unc.edu /pub/Linux/logos/penguins
- 120kB linux_logo-6.0.tar.gz
+ 120kB linux_logo-6.01.tar.gz
Alternate-site: http://www.deater.net/~weave/vmwprod/linux_logo/
Original-site:
Platforms: Linux, Irix, AIX, Solaris, FreeBSD, other Unixes
diff --git a/linux_logo.c b/linux_logo.c
index e95dc92..b166180 100644
--- a/linux_logo.c
+++ b/linux_logo.c
@@ -1,5 +1,5 @@
/*-------------------------------------------------------------------------*\
- LINUX LOGO 6.0 - Creates Nifty Logo With System Info - 9 May 2020
+ LINUX LOGO 6.01 - Creates Nifty Logo With System Info - 12 July 2022
by Vince Weaver (vince@deater.net, http://www.deater.net/weave )
@@ -10,7 +10,7 @@
\*-------------------------------------------------------------------------*/
-#define VERSION "6.0"
+#define VERSION "6.01"
#include <stdio.h>
#include <stdlib.h> /* calloc() */
@@ -844,6 +844,7 @@ static void parse_command_line(struct linux_logo_info_type *settings,
settings->custom_format=1;
strncpy(settings->format,argument,BUFSIZ);
+ settings->format[BUFSIZ-1]=0;
/* Decode the \n's. */
/* Should I decode other \ codes? */
diff --git a/po/linux_logo.pot b/po/linux_logo.pot
index 6fd7a3d..dd4e213 100644
--- a/po/linux_logo.pot
+++ b/po/linux_logo.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-09 17:53-0400\n"
+"POT-Creation-Date: 2022-07-12 10:50-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/c8/c98e1cdd98e73ed62b4d9bc2f1f4781964208a.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/26/6d979cc32398b47d65ba88067cef5f40b48b57.debug
No differences were encountered between the control files of package linuxlogo
Control files of package linuxlogo-dbgsym: lines which differ (wdiff format)
Build-Ids: 266d979cc32398b47d65ba88067cef5f40b48b57 c8c98e1cdd98e73ed62b4d9bc2f1f4781964208a