From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Jessica Yu <jeyu@kernel.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: [PATCH 01/29] modpost: drop RCS/CVS $Revision handling in MODULE_VERSION()
Date: Sun, 17 May 2020 18:48:31 +0900 [thread overview]
Message-ID: <20200517094859.2376211-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20200517094859.2376211-1-masahiroy@kernel.org>
As far as I understood, this code gets rid of '$Revision$' or '$Revision:'
of CVS, RCS or whatever in MODULE_VERSION() tags.
Remove the primeval code.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/mod/modpost.c | 3 --
scripts/mod/modpost.h | 4 ---
scripts/mod/sumversion.c | 66 ----------------------------------------
3 files changed, 73 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 4d4b979d76be..77e5425759e2 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2074,9 +2074,6 @@ static void read_symbols(const char *modname)
check_sec_ref(mod, modname, &info);
version = get_modinfo(&info, "version");
- if (version)
- maybe_frob_rcs_version(modname, version, info.modinfo,
- version - (char *)info.hdr);
if (version || (all_versions && !is_vmlinux(modname)))
get_src_version(modname, mod->srcversion,
sizeof(mod->srcversion)-1);
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 39f6c29fb568..bbaf5cc37bfb 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -187,10 +187,6 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
void add_moddevtable(struct buffer *buf, struct module *mod);
/* sumversion.c */
-void maybe_frob_rcs_version(const char *modfilename,
- char *version,
- void *modinfo,
- unsigned long modinfo_offset);
void get_src_version(const char *modname, char sum[], unsigned sumlen);
/* from modpost.c */
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 63062024ce0e..f27f22420cbc 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -429,69 +429,3 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
release:
release_file(file, len);
}
-
-static void write_version(const char *filename, const char *sum,
- unsigned long offset)
-{
- int fd;
-
- fd = open(filename, O_RDWR);
- if (fd < 0) {
- warn("changing sum in %s failed: %s\n",
- filename, strerror(errno));
- return;
- }
-
- if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {
- warn("changing sum in %s:%lu failed: %s\n",
- filename, offset, strerror(errno));
- goto out;
- }
-
- if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
- warn("writing sum in %s failed: %s\n",
- filename, strerror(errno));
- goto out;
- }
-out:
- close(fd);
-}
-
-static int strip_rcs_crap(char *version)
-{
- unsigned int len, full_len;
-
- if (strncmp(version, "$Revision", strlen("$Revision")) != 0)
- return 0;
-
- /* Space for version string follows. */
- full_len = strlen(version) + strlen(version + strlen(version) + 1) + 2;
-
- /* Move string to start with version number: prefix will be
- * $Revision$ or $Revision: */
- len = strlen("$Revision");
- if (version[len] == ':' || version[len] == '$')
- len++;
- while (isspace(version[len]))
- len++;
- memmove(version, version+len, full_len-len);
- full_len -= len;
-
- /* Preserve up to next whitespace. */
- len = 0;
- while (version[len] && !isspace(version[len]))
- len++;
- memmove(version + len, version + strlen(version),
- full_len - strlen(version));
- return 1;
-}
-
-/* Clean up RCS-style version numbers. */
-void maybe_frob_rcs_version(const char *modfilename,
- char *version,
- void *modinfo,
- unsigned long version_offset)
-{
- if (strip_rcs_crap(version))
- write_version(modfilename, version, version_offset);
-}
--
2.25.1
next prev parent reply other threads:[~2020-05-17 9:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 9:48 [PATCH 00/29] modpost: various fixes, cleanups, optimizations Masahiro Yamada
2020-05-17 9:48 ` Masahiro Yamada [this message]
2020-05-17 9:48 ` [PATCH 02/29] modpost: do not call get_modinfo() for vmlinux Masahiro Yamada
2020-05-17 9:48 ` [PATCH 03/29] modpost: add read_text_file() and get_line() helpers Masahiro Yamada
2020-05-19 10:21 ` Peter Zijlstra
2020-05-20 12:17 ` Masahiro Yamada
2020-05-20 12:29 ` Peter Zijlstra
2020-05-23 4:18 ` Masahiro Yamada
2020-05-17 9:48 ` [PATCH 04/29] modpost: fix potential mmap'ed file overrun in get_src_version() Masahiro Yamada
2020-05-17 9:48 ` [PATCH 05/29] modpost: re-add warning about missing *.mod file Masahiro Yamada
2020-05-17 9:48 ` [PATCH 06/29] modpost: avoid false-positive file open error Masahiro Yamada
2020-05-17 9:48 ` [PATCH 07/29] modpost: use read_text_file() and get_line() for reading text files Masahiro Yamada
2020-05-17 9:48 ` [PATCH 08/29] modpost: remove get_next_text() and make {grab,release_}file static Masahiro Yamada
2020-05-17 9:48 ` [PATCH 09/29] kbuild: disallow multi-word in M= or KBUILD_EXTMOD Masahiro Yamada
2020-05-17 12:33 ` David Laight
2020-05-21 3:57 ` Masahiro Yamada
2020-05-17 9:48 ` [PATCH 10/29] modpost: move -T option close to the modpost command Masahiro Yamada
2020-05-17 9:48 ` [PATCH 11/29] modpost: pass -N option only for modules modpost Masahiro Yamada
2020-05-17 9:48 ` [PATCH 12/29] modpost: move external module options Masahiro Yamada
2020-05-17 9:48 ` [PATCH 13/29] modpost: load KBUILD_EXTRA_SYMBOLS files in order Masahiro Yamada
2020-05-17 9:48 ` [PATCH 14/29] modpost: track if the symbol origin is a dump file or ELF object Masahiro Yamada
2020-05-17 9:48 ` [PATCH 15/29] modpost: allow to pass -i option multiple times remove -e option Masahiro Yamada
2020-05-17 9:48 ` [PATCH 16/29] modpost: rename ext_sym_list to dump_list Masahiro Yamada
2020-05-17 9:48 ` [PATCH 17/29] modpost: re-add -e to set external_module flag Masahiro Yamada
2020-05-17 9:48 ` [PATCH 18/29] modpost: show warning if vmlinux is not found when processing modules Masahiro Yamada
2020-05-17 9:48 ` [PATCH 19/29] modpost: show warning if it fails to read symbol dump file Masahiro Yamada
2020-05-17 9:48 ` [PATCH 20/29] modpost: generate vmlinux.symvers and reuse it for the second modpost Masahiro Yamada
2020-05-17 9:48 ` [PATCH 21/29] modpost: remove -s option Masahiro Yamada
2020-05-17 9:48 ` [PATCH 22/29] modpost: remove mod->is_dot_o struct member Masahiro Yamada
2020-05-17 9:48 ` [PATCH 23/29] modpost: remove is_vmlinux() call in check_for_{gpl_usage,unused}() Masahiro Yamada
2020-05-17 9:48 ` [PATCH 24/29] modpost: add mod->is_vmlinux struct member Masahiro Yamada
2020-05-17 9:48 ` [PATCH 25/29] modpost: remove mod->skip " Masahiro Yamada
2020-05-17 9:48 ` [PATCH 26/29] modpost: set have_vmlinux in new_module() Masahiro Yamada
2020-05-17 9:48 ` [PATCH 27/29] modpost: strip .o from modname before calling new_module() Masahiro Yamada
2020-05-17 9:48 ` [PATCH 28/29] modpost: remove is_vmlinux() helper Masahiro Yamada
2020-05-17 9:48 ` [PATCH 29/29] modpost: change elf_info->size to size_t Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200517094859.2376211-2-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=jeyu@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).