Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
@ -1 +0,0 @@
|
|||||||
a31985f5cc19bd0a2bed7a32567d06f5ec72c0af SOURCES/biosdevname-0.7.3.tar.gz
|
|
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/biosdevname-0.7.3.tar.gz
|
/biosdevname-*.tar.gz
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
From 4257dbad671fd1080231483c1891f46ed9ea7107 Mon Sep 17 00:00:00 2001
|
From 7460046a5430e92cd6a4ef0c938f80e95669b5bc Mon Sep 17 00:00:00 2001
|
||||||
From: Ka-Shu Wong <31426385+kashuwong@users.noreply.github.com>
|
From: Ka-Shu Wong <31426385+kashuwong@users.noreply.github.com>
|
||||||
Date: Fri, 1 Sep 2017 15:33:56 +1000
|
Date: Fri, 1 Sep 2017 15:33:56 +1000
|
||||||
Subject: [PATCH] Add support for ExaNIC network cards (#5)
|
Subject: [PATCH] Add support for ExaNIC network cards (#5)
|
||||||
@ -23,5 +23,5 @@ index e9d5177..3cc528b 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
--
|
--
|
||||||
2.14.3
|
2.44.0
|
||||||
|
|
33
0001-Disable-biosdevname-by-default.patch
Normal file
33
0001-Disable-biosdevname-by-default.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
From db1371e4d22465c27b5ed8d851cea6e72f0176f7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Wed, 21 Mar 2018 18:10:08 +0100
|
||||||
|
Subject: [PATCH 1/2] Disable biosdevname by default
|
||||||
|
|
||||||
|
---
|
||||||
|
biosdevname.rules.in | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/biosdevname.rules.in b/biosdevname.rules.in
|
||||||
|
index 0a32aa5..1dcca74 100644
|
||||||
|
--- a/biosdevname.rules.in
|
||||||
|
+++ b/biosdevname.rules.in
|
||||||
|
@@ -12,13 +12,13 @@ ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}"
|
||||||
|
ENV{UDEV_BIOSDEVNAME}=="0", GOTO="netdevicename_end"
|
||||||
|
ENV{UDEV_BIOSDEVNAME}=="1", GOTO="netdevicename_start"
|
||||||
|
|
||||||
|
-# uncomment the next line for biosdevname to be off by default
|
||||||
|
-# GOTO="netdevicename_end"
|
||||||
|
+# off by default
|
||||||
|
+GOTO="netdevicename_end"
|
||||||
|
|
||||||
|
LABEL="netdevicename_start"
|
||||||
|
|
||||||
|
# using NAME= instead of setting INTERFACE_NAME, so that persistent
|
||||||
|
# names aren't generated for these devices, they are "named" on each boot.
|
||||||
|
-SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace"
|
||||||
|
+SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --smbios 2.6 --nopirq --policy physical -i %k", NAME="%c" OPTIONS+="string_escape=replace"
|
||||||
|
|
||||||
|
LABEL="netdevicename_end"
|
||||||
|
--
|
||||||
|
2.14.3
|
||||||
|
|
@ -1,14 +1,15 @@
|
|||||||
From 6e29eb19cfec3b657eb6ed8121898e80c1c39e6b Mon Sep 17 00:00:00 2001
|
From 14a0cef248d2996cde90e64ae56d7bdb569b3995 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
|
From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
|
||||||
Date: Mon, 23 Sep 2013 14:05:59 +0200
|
Date: Mon, 23 Sep 2013 14:05:59 +0200
|
||||||
Subject: [PATCH] Place udev rules to /usr/lib
|
Subject: [PATCH] Place udev rules to /usr/lib
|
||||||
|
|
||||||
---
|
---
|
||||||
|
biosdevname.rules.in | 2 +-
|
||||||
configure.ac | 2 +-
|
configure.ac | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/biosdevname.rules.in b/biosdevname.rules.in
|
||||||
index 177f54a..474c064 100644
|
index e26ba98..8c12cb8 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -68,7 +68,7 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr
|
@@ -68,7 +68,7 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr
|
||||||
@ -21,5 +22,5 @@ index 177f54a..474c064 100644
|
|||||||
if [[ -e /etc/udev/rules.d/60-net.rules ]]; then
|
if [[ -e /etc/udev/rules.d/60-net.rules ]]; then
|
||||||
# RHEL 5 / Fedora
|
# RHEL 5 / Fedora
|
||||||
--
|
--
|
||||||
2.14.3
|
1.8.3.1
|
||||||
|
|
@ -25,5 +25,5 @@ index 1d805bb..a01a6ce 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.17.2
|
2.44.0
|
||||||
|
|
@ -183,5 +183,5 @@ index b695d3d..49e399d 100644
|
|||||||
+
|
+
|
||||||
#endif /* __ETHS_H_INCLUDED */
|
#endif /* __ETHS_H_INCLUDED */
|
||||||
--
|
--
|
||||||
2.17.2
|
2.44.0
|
||||||
|
|
26
0004-man-fix-all_ethN-indentation.patch
Normal file
26
0004-man-fix-all_ethN-indentation.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 42abae6e56f22245ac8d693ab88ad1e3ea75a220 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Kenigsberg <danken@redhat.com>
|
||||||
|
Date: Sun, 27 Jan 2019 09:26:53 +0200
|
||||||
|
Subject: [PATCH] man: fix all_ethN indentation
|
||||||
|
|
||||||
|
all_ethN is not another .TP block under the physical policy, it is a paragraph of its own right.
|
||||||
|
---
|
||||||
|
biosdevname.1 | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/biosdevname.1 b/biosdevname.1
|
||||||
|
index 22a53bd..643eae5 100644
|
||||||
|
--- a/biosdevname.1
|
||||||
|
+++ b/biosdevname.1
|
||||||
|
@@ -60,7 +60,7 @@ for embedded NICs
|
||||||
|
p<slot>p<port>[_<virtual instance>]
|
||||||
|
for cards in PCI slots
|
||||||
|
.br
|
||||||
|
-.TP
|
||||||
|
+.PP
|
||||||
|
The
|
||||||
|
.B all_ethN
|
||||||
|
policy makes a best guess at what the device order should be, with
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
168
0005-Add-buffer-read-helper-using-read-explicitly.patch
Normal file
168
0005-Add-buffer-read-helper-using-read-explicitly.patch
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
From f64c3f549eda36d11b5690117173b0847535ebbe Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Mon, 24 Aug 2020 14:40:17 +0200
|
||||||
|
Subject: [PATCH] Add buffer read helper using read explicitly
|
||||||
|
|
||||||
|
Since mmap can't work well with a sysfs file, we need to read the
|
||||||
|
contents explicitly via read, even if USE_MMAP is enabled.
|
||||||
|
Provide a new helper, __mem_cunk(), that does behave like mem_chunk()
|
||||||
|
but with the extra use_mmap argument to specify the method to read a
|
||||||
|
file.
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
CC: Thomas Renninger <trenn@suse.de>
|
||||||
|
CC: Michal Suchanek <msuchanek@suse.com>
|
||||||
|
---
|
||||||
|
src/dmidecode/util.c | 82 ++++++++++++++++++++++++++++----------------
|
||||||
|
src/dmidecode/util.h | 1 +
|
||||||
|
2 files changed, 53 insertions(+), 30 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dmidecode/util.c b/src/dmidecode/util.c
|
||||||
|
index ea06663..09934ea 100644
|
||||||
|
--- a/src/dmidecode/util.c
|
||||||
|
+++ b/src/dmidecode/util.c
|
||||||
|
@@ -47,7 +47,6 @@
|
||||||
|
#include "types.h"
|
||||||
|
#include "util.h"
|
||||||
|
|
||||||
|
-#ifndef USE_MMAP
|
||||||
|
static int myread(int fd, u8 *buf, size_t count, const char *prefix)
|
||||||
|
{
|
||||||
|
ssize_t r=1;
|
||||||
|
@@ -78,7 +77,6 @@ static int myread(int fd, u8 *buf, size_t count, const char *prefix)
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
int checksum(const u8 *buf, size_t len)
|
||||||
|
{
|
||||||
|
@@ -94,28 +92,13 @@ int checksum(const u8 *buf, size_t len)
|
||||||
|
* Copy a physical memory chunk into a memory buffer.
|
||||||
|
* This function allocates memory.
|
||||||
|
*/
|
||||||
|
-void *mem_chunk(size_t base, size_t len, const char *devmem)
|
||||||
|
-{
|
||||||
|
- void *p;
|
||||||
|
- int fd;
|
||||||
|
#ifdef USE_MMAP
|
||||||
|
+static void *mem_chunk_mmap(size_t base, size_t len, const char *devmem,
|
||||||
|
+ int fd, void *p)
|
||||||
|
+{
|
||||||
|
size_t mmoffset;
|
||||||
|
void *mmp;
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
- if((fd=open(devmem, O_RDONLY))==-1)
|
||||||
|
- {
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if((p=malloc(len))==NULL)
|
||||||
|
- {
|
||||||
|
- perror("malloc");
|
||||||
|
- close(fd);
|
||||||
|
- return NULL;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
-#ifdef USE_MMAP
|
||||||
|
+
|
||||||
|
#ifdef _SC_PAGESIZE
|
||||||
|
mmoffset=base%sysconf(_SC_PAGESIZE);
|
||||||
|
#else
|
||||||
|
@@ -129,8 +112,6 @@ void *mem_chunk(size_t base, size_t len, const char *devmem)
|
||||||
|
mmp=mmap(0, mmoffset+len, PROT_READ, MAP_SHARED, fd, base-mmoffset);
|
||||||
|
if(mmp==MAP_FAILED)
|
||||||
|
{
|
||||||
|
- free(p);
|
||||||
|
- close(fd);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -141,26 +122,67 @@ void *mem_chunk(size_t base, size_t len, const char *devmem)
|
||||||
|
fprintf(stderr, "%s: ", devmem);
|
||||||
|
perror("munmap");
|
||||||
|
}
|
||||||
|
-#else /* USE_MMAP */
|
||||||
|
+
|
||||||
|
+ return p;
|
||||||
|
+}
|
||||||
|
+#endif /* USE_MMAP */
|
||||||
|
+
|
||||||
|
+static void *mem_chunk_read(size_t base, size_t len, const char *devmem,
|
||||||
|
+ int fd, void *p)
|
||||||
|
+{
|
||||||
|
if(lseek(fd, base, SEEK_SET)==-1)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s: ", devmem);
|
||||||
|
perror("lseek");
|
||||||
|
- free(p);
|
||||||
|
- close(fd);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(myread(fd, p, len, devmem)==-1)
|
||||||
|
{
|
||||||
|
- free(p);
|
||||||
|
- close(fd);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
-#endif /* USE_MMAP */
|
||||||
|
+
|
||||||
|
+ return p;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void *__mem_chunk(size_t base, size_t len, const char *devmem, int use_mmap)
|
||||||
|
+{
|
||||||
|
+ void *ret;
|
||||||
|
+ void *p;
|
||||||
|
+ int fd;
|
||||||
|
+
|
||||||
|
+#ifndef USE_MMAP
|
||||||
|
+ use_mmap = 0;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ if((fd=open(devmem, O_RDONLY))==-1)
|
||||||
|
+ {
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ if((p=malloc(len))==NULL)
|
||||||
|
+ {
|
||||||
|
+ perror("malloc");
|
||||||
|
+ close(fd);
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#ifdef USE_MMAP
|
||||||
|
+ if (use_mmap)
|
||||||
|
+ ret = mem_chunk_mmap(base, len, devmem, fd, p);
|
||||||
|
+ else
|
||||||
|
+#endif
|
||||||
|
+ ret = mem_chunk_read(base, len, devmem, fd, p);
|
||||||
|
+
|
||||||
|
if(close(fd)==-1)
|
||||||
|
perror(devmem);
|
||||||
|
+ if (!ret)
|
||||||
|
+ free(p);
|
||||||
|
|
||||||
|
- return p;
|
||||||
|
+ return ret;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void *mem_chunk(size_t base, size_t len, const char *devmem)
|
||||||
|
+{
|
||||||
|
+ return __mem_chunk(base, len, devmem, 1);
|
||||||
|
}
|
||||||
|
diff --git a/src/dmidecode/util.h b/src/dmidecode/util.h
|
||||||
|
index b546f64..90c411e 100644
|
||||||
|
--- a/src/dmidecode/util.h
|
||||||
|
+++ b/src/dmidecode/util.h
|
||||||
|
@@ -6,3 +6,4 @@
|
||||||
|
|
||||||
|
int checksum(const u8 *buf, size_t len);
|
||||||
|
void *mem_chunk(size_t base, size_t len, const char *devmem);
|
||||||
|
+void *__mem_chunk(size_t base, size_t len, const char *devmem, int use_mmap);
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
145
0006-Read-DMI-entries-from-sys-firmware-dmi-tables-DMI.patch
Normal file
145
0006-Read-DMI-entries-from-sys-firmware-dmi-tables-DMI.patch
Normal file
@ -0,0 +1,145 @@
|
|||||||
|
From b3bb4ed21e8802cb38eb693952da058f52cf76b0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Mon, 24 Aug 2020 14:41:54 +0200
|
||||||
|
Subject: [PATCH] Read DMI entries from /sys/firmware/dmi/tables/DMI
|
||||||
|
|
||||||
|
A kernel with Secure Boot lockdown may prohibit reading the contents
|
||||||
|
of /dev/mem, hence biosdevname fails. The recent kernel provides the
|
||||||
|
DMI byte contents in /sys/firmware/dmi/tables/*, and we can use this
|
||||||
|
instead of poking /dev/mem.
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
CC: Thomas Renninger <trenn@suse.de>
|
||||||
|
CC: Michal Suchanek <msuchanek@suse.com>
|
||||||
|
---
|
||||||
|
src/dmidecode/dmidecode.c | 54 +++++++++++++++++++++++++++++----------
|
||||||
|
1 file changed, 41 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dmidecode/dmidecode.c b/src/dmidecode/dmidecode.c
|
||||||
|
index a01a6ce..f4c1269 100644
|
||||||
|
--- a/src/dmidecode/dmidecode.c
|
||||||
|
+++ b/src/dmidecode/dmidecode.c
|
||||||
|
@@ -229,7 +229,7 @@ static int isvalidsmbios(int mjr, int mnr)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, const struct libbiosdevname_state *state)
|
||||||
|
+static int dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, const struct libbiosdevname_state *state, int sysfs)
|
||||||
|
{
|
||||||
|
u8 *buf;
|
||||||
|
u8 *data;
|
||||||
|
@@ -237,14 +237,19 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, c
|
||||||
|
|
||||||
|
/* Verify SMBIOS version */
|
||||||
|
if (!isvalidsmbios(ver >> 8, ver & 0xFF)) {
|
||||||
|
- return;
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
- if((buf=mem_chunk(base, len, devmem))==NULL)
|
||||||
|
+
|
||||||
|
+ if (sysfs)
|
||||||
|
+ buf = __mem_chunk(0, len, devmem, 0);
|
||||||
|
+ else
|
||||||
|
+ buf = mem_chunk(base, len, devmem);
|
||||||
|
+ if(buf == NULL)
|
||||||
|
{
|
||||||
|
#ifndef USE_MMAP
|
||||||
|
printf("Table is unreachable, sorry. Try compiling dmidecode with -DUSE_MMAP.\n");
|
||||||
|
#endif
|
||||||
|
- return;
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
data=buf;
|
||||||
|
@@ -280,18 +285,18 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, c
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
free(buf);
|
||||||
|
+ return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
-static int smbios_decode(u8 *buf, const char *devmem, const struct libbiosdevname_state *state)
|
||||||
|
+static int smbios_decode(u8 *buf, const char *devmem, const struct libbiosdevname_state *state, int sysfs)
|
||||||
|
{
|
||||||
|
if(checksum(buf, buf[0x05])
|
||||||
|
&& memcmp(buf+0x10, "_DMI_", 5)==0
|
||||||
|
&& checksum(buf+0x10, 0x0F))
|
||||||
|
{
|
||||||
|
- dmi_table(DWORD(buf+0x18), WORD(buf+0x16), WORD(buf+0x1C),
|
||||||
|
- (buf[0x06]<<8)+buf[0x07], devmem, state);
|
||||||
|
- return 1;
|
||||||
|
+ return dmi_table(DWORD(buf+0x18), WORD(buf+0x16), WORD(buf+0x1C),
|
||||||
|
+ (buf[0x06]<<8)+buf[0x07], devmem, state,
|
||||||
|
+ sysfs);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
@@ -302,13 +307,32 @@ static int legacy_decode(u8 *buf, const char *devmem, const struct libbiosdevnam
|
||||||
|
if(checksum(buf, 0x0F))
|
||||||
|
{
|
||||||
|
dmi_table(DWORD(buf+0x08), WORD(buf+0x06), WORD(buf+0x0C),
|
||||||
|
- ((buf[0x0E]&0xF0)<<4)+(buf[0x0E]&0x0F), devmem, state);
|
||||||
|
+ ((buf[0x0E]&0xF0)<<4)+(buf[0x0E]&0x0F), devmem, state, 0);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#define SYSFS_TABLE_SMBIOS "/sys/firmware/dmi/tables/smbios_entry_point"
|
||||||
|
+#define SYSFS_TABLE_DMI "/sys/firmware/dmi/tables/DMI"
|
||||||
|
+
|
||||||
|
+static int smibios_decode_from_sysfs(const struct libbiosdevname_state *state)
|
||||||
|
+{
|
||||||
|
+ FILE *fp;
|
||||||
|
+ u8 buf[0x1f];
|
||||||
|
+ int len;
|
||||||
|
+
|
||||||
|
+ fp = fopen(SYSFS_TABLE_SMBIOS, "r");
|
||||||
|
+ if (!fp)
|
||||||
|
+ return 0;
|
||||||
|
+ len = fread(buf, 1, sizeof(buf), fp);
|
||||||
|
+ fclose(fp);
|
||||||
|
+ if (len == 0x1f && memcmp(buf, "_SM_", 4) == 0)
|
||||||
|
+ return smbios_decode(buf, SYSFS_TABLE_DMI, state, 1);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Probe for EFI interface
|
||||||
|
*/
|
||||||
|
@@ -417,7 +441,11 @@ int dmidecode_main(const struct libbiosdevname_state *state)
|
||||||
|
if (dmidecode_read_file(state))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
- /* First try EFI (ia64, Intel-based Mac) */
|
||||||
|
+ /* First try sysfs entries */
|
||||||
|
+ if (smibios_decode_from_sysfs(state))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ /* Next try EFI (ia64, Intel-based Mac) */
|
||||||
|
efi=address_from_efi(&fp);
|
||||||
|
switch(efi)
|
||||||
|
{
|
||||||
|
@@ -434,7 +462,7 @@ int dmidecode_main(const struct libbiosdevname_state *state)
|
||||||
|
goto exit_free;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if(smbios_decode(buf, devmem, state))
|
||||||
|
+ if(smbios_decode(buf, devmem, state, 0))
|
||||||
|
found++;
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
@@ -450,7 +478,7 @@ memory_scan:
|
||||||
|
{
|
||||||
|
if(memcmp(buf+fp, "_SM_", 4)==0 && fp<=0xFFE0)
|
||||||
|
{
|
||||||
|
- if(smbios_decode(buf+fp, devmem, state))
|
||||||
|
+ if(smbios_decode(buf+fp, devmem, state, 0))
|
||||||
|
{
|
||||||
|
found++;
|
||||||
|
fp+=16;
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
63
0007-Add-SMBIOS-3.x-support.patch
Normal file
63
0007-Add-SMBIOS-3.x-support.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
From 495ab76e0d5f0eba83f9c86baf779a244ea1b60d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Mon, 24 Aug 2020 14:42:44 +0200
|
||||||
|
Subject: [PATCH] Add SMBIOS 3.x support
|
||||||
|
|
||||||
|
Handle only the path from sysfs for now.
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
CC: Thomas Renninger <trenn@suse.de>
|
||||||
|
CC: Michal Suchanek <msuchanek@suse.com>
|
||||||
|
---
|
||||||
|
src/dmidecode/dmidecode.c | 14 ++++++++++++--
|
||||||
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dmidecode/dmidecode.c b/src/dmidecode/dmidecode.c
|
||||||
|
index f4c1269..f478cc5 100644
|
||||||
|
--- a/src/dmidecode/dmidecode.c
|
||||||
|
+++ b/src/dmidecode/dmidecode.c
|
||||||
|
@@ -236,7 +236,7 @@ static int dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, co
|
||||||
|
int i=0;
|
||||||
|
|
||||||
|
/* Verify SMBIOS version */
|
||||||
|
- if (!isvalidsmbios(ver >> 8, ver & 0xFF)) {
|
||||||
|
+ if (ver && !isvalidsmbios(ver >> 8, ver & 0xFF)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -253,7 +253,7 @@ static int dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem, co
|
||||||
|
}
|
||||||
|
|
||||||
|
data=buf;
|
||||||
|
- while(i<num && data+4<=buf+len) /* 4 is the length of an SMBIOS structure header */
|
||||||
|
+ while((!num || i<num) && data+4<=buf+len) /* 4 is the length of an SMBIOS structure header */
|
||||||
|
{
|
||||||
|
u8 *next;
|
||||||
|
struct dmi_header h;
|
||||||
|
@@ -314,6 +314,14 @@ static int legacy_decode(u8 *buf, const char *devmem, const struct libbiosdevnam
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+/* only from sysfs, handle no base offset */
|
||||||
|
+static int smbios3_decode(u8 *buf, const char *devmem, const struct libbiosdevname_state *state)
|
||||||
|
+{
|
||||||
|
+ if (checksum(buf, 0x18))
|
||||||
|
+ return dmi_table(0, DWORD(buf + 0x0c), 0, 0, devmem, state, 1);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#define SYSFS_TABLE_SMBIOS "/sys/firmware/dmi/tables/smbios_entry_point"
|
||||||
|
#define SYSFS_TABLE_DMI "/sys/firmware/dmi/tables/DMI"
|
||||||
|
|
||||||
|
@@ -330,6 +338,8 @@ static int smibios_decode_from_sysfs(const struct libbiosdevname_state *state)
|
||||||
|
fclose(fp);
|
||||||
|
if (len == 0x1f && memcmp(buf, "_SM_", 4) == 0)
|
||||||
|
return smbios_decode(buf, SYSFS_TABLE_DMI, state, 1);
|
||||||
|
+ if (len >= 0x18 && memcmp(buf, "_SM3_", 5) == 0)
|
||||||
|
+ return smbios3_decode(buf, SYSFS_TABLE_DMI, state);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
@ -1,25 +0,0 @@
|
|||||||
From e63b3589e0ded7078b2f02546fc0b0a2a10223be Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Mon, 17 Dec 2018 10:52:51 +0100
|
|
||||||
Subject: [PATCH] rules: disable pirq and force minimal smbios version
|
|
||||||
|
|
||||||
Related: #1623621
|
|
||||||
---
|
|
||||||
biosdevname.rules.in | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/biosdevname.rules.in b/biosdevname.rules.in
|
|
||||||
index 0a32aa5..105ef5a 100644
|
|
||||||
--- a/biosdevname.rules.in
|
|
||||||
+++ b/biosdevname.rules.in
|
|
||||||
@@ -19,6 +19,6 @@ LABEL="netdevicename_start"
|
|
||||||
|
|
||||||
# using NAME= instead of setting INTERFACE_NAME, so that persistent
|
|
||||||
# names aren't generated for these devices, they are "named" on each boot.
|
|
||||||
-SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace"
|
|
||||||
+SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --smbios 2.6 --nopirq --policy physical -i %k", NAME="%c" OPTIONS+="string_escape=replace"
|
|
||||||
|
|
||||||
LABEL="netdevicename_end"
|
|
||||||
--
|
|
||||||
2.17.2
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
From c4771922d64cb1540968ab4b5a9bfbe1148cb211 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michal Sekletar <msekleta@redhat.com>
|
|
||||||
Date: Tue, 18 Dec 2018 11:34:56 +0100
|
|
||||||
Subject: [PATCH] rules: disable biosdevname by default
|
|
||||||
|
|
||||||
---
|
|
||||||
biosdevname.rules.in | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/biosdevname.rules.in b/biosdevname.rules.in
|
|
||||||
index 31b003c..1dcca74 100644
|
|
||||||
--- a/biosdevname.rules.in
|
|
||||||
+++ b/biosdevname.rules.in
|
|
||||||
@@ -12,8 +12,8 @@ ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}"
|
|
||||||
ENV{UDEV_BIOSDEVNAME}=="0", GOTO="netdevicename_end"
|
|
||||||
ENV{UDEV_BIOSDEVNAME}=="1", GOTO="netdevicename_start"
|
|
||||||
|
|
||||||
-# uncomment the next line for biosdevname to be off by default
|
|
||||||
-# GOTO="netdevicename_end"
|
|
||||||
+# off by default
|
|
||||||
+GOTO="netdevicename_end"
|
|
||||||
|
|
||||||
LABEL="netdevicename_start"
|
|
||||||
|
|
||||||
--
|
|
||||||
2.17.2
|
|
||||||
|
|
@ -1,10 +1,12 @@
|
|||||||
Name: biosdevname
|
Name: biosdevname
|
||||||
Version: 0.7.3
|
Version: 0.7.3
|
||||||
Release: 2%{?dist}
|
Release: 19%{?dist}
|
||||||
Summary: Udev helper for naming devices per BIOS names
|
Summary: Udev helper for naming devices per BIOS names
|
||||||
|
|
||||||
Group: System Environment/Base
|
# * biosdevname is GPL-2.0-only
|
||||||
License: GPLv2
|
# * bundled dmidecode is GPL-2.0-or-later
|
||||||
|
License: GPL-2.0-only AND GPL-2.0-or-later
|
||||||
|
|
||||||
URL: http://linux.dell.com/files/%{name}
|
URL: http://linux.dell.com/files/%{name}
|
||||||
# SMBIOS only exists on these arches. It's also likely that other
|
# SMBIOS only exists on these arches. It's also likely that other
|
||||||
# arches don't expect the PCI bus to be sorted breadth-first, or of
|
# arches don't expect the PCI bus to be sorted breadth-first, or of
|
||||||
@ -14,16 +16,20 @@ Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{versio
|
|||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: pciutils-devel
|
BuildRequires: pciutils-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
Patch0001: 0001-Add-support-for-ExaNIC-network-cards-5.patch
|
Patch1: 0001-Disable-biosdevname-by-default.patch
|
||||||
Patch0002: 0002-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch
|
Patch2: 0002-Place-udev-rules-to-usr-lib.patch
|
||||||
Patch0003: 0003-Netronome-biosdevname-support-8.patch
|
Patch3: 0001-Add-support-for-ExaNIC-network-cards-5.patch
|
||||||
|
Patch4: 0002-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch
|
||||||
Patch0999: 0999-Place-udev-rules-to-usr-lib.patch
|
Patch5: 0003-Netronome-biosdevname-support-8.patch
|
||||||
Patch1000: 1000-rules-disable-pirq-and-force-minimal-smbios-version.patch
|
Patch6: 0004-man-fix-all_ethN-indentation.patch
|
||||||
Patch1001: 1001-rules-disable-biosdevname-by-default.patch
|
Patch7: 0005-Add-buffer-read-helper-using-read-explicitly.patch
|
||||||
|
Patch8: 0006-Read-DMI-entries-from-sys-firmware-dmi-tables-DMI.patch
|
||||||
|
Patch9: 0007-Add-SMBIOS-3.x-support.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
biosdevname in its simplest form takes a kernel device name as an
|
biosdevname in its simplest form takes a kernel device name as an
|
||||||
@ -37,7 +43,7 @@ name (e.g. eth0).
|
|||||||
%autopatch -p1
|
%autopatch -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -fiv
|
autoreconf -fvi
|
||||||
%configure --prefix=%{_prefix}
|
%configure --prefix=%{_prefix}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
@ -45,20 +51,75 @@ make %{?_smp_mflags}
|
|||||||
make install install-data DESTDIR=%{buildroot}
|
make install install-data DESTDIR=%{buildroot}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING README
|
%doc COPYING README
|
||||||
%{_sbindir}/%{name}
|
%{_sbindir}/%{name}
|
||||||
%{_prefix}/lib/udev/rules.d/*.rules
|
%{_prefix}/lib/udev/rules.d/*.rules
|
||||||
%{_mandir}/man1/%{name}.1*
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Dec 17 2018 Michal Sekletár <msekleta@redhat.com> - 0.7.3-2
|
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.7.3-19
|
||||||
- make biosdevname optional even on Dell servers (#1623621)
|
- Bump release for October 2024 mass rebuild:
|
||||||
- prevent infinite recursion in smbios_setslot() (#1499458)
|
Resolves: RHEL-64018
|
||||||
- Netronome biosdevname support (#1649036)
|
|
||||||
|
|
||||||
* Fri Mar 23 2018 Michal Sekletar <msekleta@redhat.com> - 0.7.3-1
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.7.3-18
|
||||||
- rebase to biosdevname 0.7.3
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
* Mon May 20 2024 Michal Sekletar <msekleta@redhat.com> - 0.7.3-17
|
||||||
|
- Pull down latest updates from upstream (RHEL-24108)
|
||||||
|
|
||||||
|
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-15
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 27 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.7.3-14
|
||||||
|
- correct the License: field
|
||||||
|
|
||||||
|
* Wed Jul 26 2023 Lukáš Zaoral <lzaoral@redhat.com> - 0.7.3-13
|
||||||
|
- migrate to SPDX license format
|
||||||
|
|
||||||
|
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Mar 22 2018 Michal Sekletar <msekleta@redhat.com> - 0.7.3-1
|
||||||
|
- rebase to biosdevname-0.7.3
|
||||||
|
|
||||||
|
* Wed Mar 21 2018 Michal Sekletar <msekleta@redhat.com> - 0.7.2-1
|
||||||
|
- rebase to biosdevname-0.7.2
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-5
|
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
@ -151,6 +212,10 @@ make install install-data DESTDIR=%{buildroot}
|
|||||||
- Don't display _vf suffix on NPAR devices with single function
|
- Don't display _vf suffix on NPAR devices with single function
|
||||||
- Fix PCIe/PIRQ slot mapping
|
- Fix PCIe/PIRQ slot mapping
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
>>>>>>> f16
|
||||||
* Thu Apr 21 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.8-1
|
* Thu Apr 21 2011 Praveen K Paladugu <praveen_paladugu@dell.com> - 0.3.8-1
|
||||||
- Add changes to parse VPD structure for device mapping on NPAR devices
|
- Add changes to parse VPD structure for device mapping on NPAR devices
|
||||||
- Fix pathname
|
- Fix pathname
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-*
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
10
plans.fmf
Normal file
10
plans.fmf
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
/tier1-internal:
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/biosdevname
|
||||||
|
filter: 'tier: 1'
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
|
adjust:
|
||||||
|
enabled: false
|
||||||
|
when: distro == centos-stream or distro == fedora
|
Loading…
Reference in New Issue
Block a user