Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-12-22 12:02:21 +0100
committerKernel Build Daemon <kbuild@suse.de>2018-12-22 12:02:21 +0100
commitaeb8f6448e087ead622089b84840c50ab2ea0750 (patch)
treec52c48fe28619d44f9f7d0824d435943b9bdb4a4
parent96b73f7f0176bab07820873f936dc2fd1c532523 (diff)
Automatically updated to 4.20-rc7-274-g23203e3f34c9
-rw-r--r--patches.rpmify/Add-ksym-provides-tool.patch163
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf1
3 files changed, 1 insertions, 165 deletions
diff --git a/patches.rpmify/Add-ksym-provides-tool.patch b/patches.rpmify/Add-ksym-provides-tool.patch
deleted file mode 100644
index f2bd932e2e..0000000000
--- a/patches.rpmify/Add-ksym-provides-tool.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 3e0bb8a2f6297c4b7cd6c2e30be47e65bdc6dcc9 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Wed, 7 Feb 2018 15:16:04 +0100
-Subject: [PATCH] Add ksym-provides tool.
-
-References: bsc#1077692
-Patch-mainline: no, not needed
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
----
- scripts/mod/Makefile | 6 ++-
- scripts/mod/ksym-provides.c | 124 ++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 129 insertions(+), 1 deletion(-)
- create mode 100644 scripts/mod/ksym-provides.c
-
---- a/scripts/mod/Makefile
-+++ b/scripts/mod/Makefile
-@@ -1,13 +1,17 @@
- # SPDX-License-Identifier: GPL-2.0
- OBJECT_FILES_NON_STANDARD := y
-
--hostprogs-y := modpost mk_elfconfig
-+hostprogs-y := modpost mk_elfconfig ksym-provides
- always := $(hostprogs-y) empty.o
-
- CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS)
-
- modpost-objs := modpost.o file2alias.o sumversion.o
-
-+ksym-provides-objs := ksym-provides.o
-+
-+HOSTLDLIBS_ksym-provides := -lelf
-+
- devicetable-offsets-file := devicetable-offsets.h
-
- $(obj)/$(devicetable-offsets-file): $(obj)/devicetable-offsets.s FORCE
---- /dev/null
-+++ b/scripts/mod/ksym-provides.c
-@@ -0,0 +1,124 @@
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <gelf.h>
-+#include <string.h>
-+
-+int main(int argc, char *argv[])
-+{
-+ int fd;
-+ Elf *elf;
-+ Elf_Scn *scn;
-+ GElf_Shdr shdr;
-+ size_t strndx;
-+ int ndx;
-+ Elf_Data *symdata, *data;
-+ GElf_Sym sym;
-+ char *name;
-+ const char * flavor = argv[1];
-+ const char * prefix = "__crc_";
-+ size_t prefixlen = strlen(prefix);
-+ const char * symformat = "ksym(%s:%s) = %lx\n";
-+
-+ if (argc != 3) {
-+ fprintf(stderr, "Usage: %s <flavor> <filename>\n", argv[0]);
-+ return 1;
-+ }
-+
-+ if (elf_version(EV_CURRENT) == EV_NONE) {
-+ fprintf(stderr, "libelf initialization failed: %s\n",
-+ elf_errmsg(-1));
-+ return 1;
-+ }
-+
-+ fd = open(argv[2], O_RDONLY);
-+ if (fd < 0) {
-+ perror("open failed");
-+ return 1;
-+ }
-+
-+ elf = elf_begin(fd, ELF_C_READ, NULL);
-+ if (!elf) {
-+ fprintf(stderr, "elf_begin failed: %s\n", elf_errmsg(-1));
-+ goto err_close;
-+ }
-+
-+ scn = NULL;
-+ while ((scn = elf_nextscn(elf, scn)) != NULL) {
-+ if (!gelf_getshdr(scn, &shdr)) {
-+ fprintf(stderr, "gelf_getshdr failed: %s\n",
-+ elf_errmsg(-1));
-+ goto err_end;
-+ }
-+
-+ if (shdr.sh_type == SHT_SYMTAB)
-+ break;
-+ }
-+ if (!scn) {
-+ fputs("symbol table not found\n", stderr);
-+ goto err_end;
-+ }
-+ strndx = shdr.sh_link;
-+
-+ symdata = elf_getdata(scn, NULL);
-+ if (!symdata) {
-+ fprintf(stderr, "elf_getdata failed: %s\n", elf_errmsg(-1));
-+ goto err_end;
-+ }
-+
-+ for (ndx = 0; gelf_getsym(symdata, ndx, &sym) != NULL; ++ndx) {
-+
-+ name = elf_strptr(elf, strndx, sym.st_name);
-+ if (!name) {
-+ fprintf(stderr, "elf_strptr failed: %s\n",
-+ elf_errmsg(-1));
-+ goto err_end;
-+ }
-+ if (strncmp(prefix, name, prefixlen))
-+ continue;
-+
-+ if (sym.st_shndx >= SHN_LORESERVE) {
-+ printf(symformat, flavor, name + prefixlen,
-+ sym.st_value);
-+ continue;
-+ }
-+
-+ scn = elf_getscn(elf, sym.st_shndx);
-+ if (!scn) {
-+ fprintf(stderr, "elf_getscn failed: %s\n",
-+ elf_errmsg(-1));
-+ goto err_end;
-+ }
-+ if (!gelf_getshdr(scn, &shdr)) {
-+ fprintf(stderr, "gelf_getshdr failed: %s\n",
-+ elf_errmsg(-1));
-+ goto err_end;
-+ }
-+
-+ if (shdr.sh_type != SHT_PROGBITS)
-+ continue;
-+
-+ data = elf_getdata_rawchunk(
-+ elf, shdr.sh_offset + sym.st_value - shdr.sh_addr,
-+ sizeof(GElf_Word), ELF_T_WORD);
-+ if (!data) {
-+ fprintf(stderr, "elf_getdata_rawchunk failed: %s\n",
-+ elf_errmsg(-1));
-+ goto err_end;
-+ }
-+ printf(symformat, flavor, name + prefixlen,
-+ (unsigned long) *(GElf_Word*)data->d_buf);
-+ }
-+
-+ elf_end(elf);
-+ close(fd);
-+ return 0;
-+
-+ err_end:
-+ elf_end(elf);
-+ err_close:
-+ close(fd);
-+ return 1;
-+}
diff --git a/rpm/config.sh b/rpm/config.sh
index 10d86b5190..011329d886 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc7-214-g9097a058d49e
+SRCVERSION=4.20-rc7-274-g23203e3f34c9
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# Set to 1 if the tree does not contain any non-vanilla patches at all
diff --git a/series.conf b/series.conf
index c7dc531933..f57f0540d9 100644
--- a/series.conf
+++ b/series.conf
@@ -34,7 +34,6 @@
# and patched flavors.
########################################################
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
- patches.rpmify/Add-ksym-provides-tool.patch
########################################################
#