korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-30 05:17:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace SNAPSHOT with auto-generated version string

Browse Source 
Replace the iproute2 snapshot with a version string which is
autogenerated as part of the build process using git describe.

This will also allow seeing if the version of the command
is built from the same sources is as upstream.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2020-08-01 10:26:41 -07:00
parent cb17e0cc57
commit fbef655568
14 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -65,6 +65,8 @@ all: config.mk
for i in $(SUBDIRS); \
do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done
.PHONY: clean clobber distclean check cscope version
help:
@echo "Make Targets:"
@echo " all - build binaries"
@ -73,7 +75,7 @@ help:
@echo " install - install binaries on local machine"
@echo " check - run tests"
@echo " cscope - build cscope database"
@echo " snapshot - generate version number header"
@echo " version - update version"
@echo ""
@echo "Make Arguments:"
@echo " V=[0|1] - set build verbosity level"
@ -93,9 +95,9 @@ install: all
install -m 0644 bash-completion/devlink $(DESTDIR)$(BASH_COMPDIR)
install -m 0644 include/bpf_elf.h $(DESTDIR)$(HDRDIR)
snapshot:
echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
> include/SNAPSHOT.h
version:
echo "static const char version[] = \""`git describe --tags --long`"\";" \
> include/version.h
clean:
@for i in $(SUBDIRS) testsuite; \

2
bridge/bridge.c
View File

@ -12,7 +12,7 @@
#include <string.h>
#include <errno.h>
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
#include "br_common.h"
#include "namespace.h"

4
devlink/devlink.c
View File

@ -34,7 +34,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include "SNAPSHOT.h"
#include "version.h"
#include "list.h"
#include "mnlg.h"
#include "json_print.h"
@ -7606,7 +7606,7 @@ int main(int argc, char **argv)
switch (opt) {
case 'V':
printf("devlink utility, iproute2-ss%s\n", SNAPSHOT);
printf("devlink utility, iproute2-%s\n", version);
ret = EXIT_SUCCESS;
goto dl_free;
case 'f':

4
genl/genl.c
View File

@ -22,7 +22,7 @@
#include <errno.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h> /* until we put our own header */
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
#include "genl_utils.h"
@ -118,7 +118,7 @@ int main(int argc, char **argv)
} else if (matches(argv[1], "-raw") == 0) {
++show_raw;
} else if (matches(argv[1], "-Version") == 0) {
printf("genl utility, iproute2-ss%s\n", SNAPSHOT);
printf("genl utility, iproute2-%s\n", version);
exit(0);
} else if (matches(argv[1], "-help") == 0) {
usage();

1
include/SNAPSHOT.h
View File

@ -1 +0,0 @@
static const char SNAPSHOT[] = "200602";

1
include/version.h Normal file
View File

@ -0,0 +1 @@
static const char version[] = "v5.7.0-77-gb687d1067169";

4
ip/ip.c
View File

@ -18,7 +18,7 @@
#include <string.h>
#include <errno.h>
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
#include "ip_common.h"
#include "namespace.h"
@ -255,7 +255,7 @@ int main(int argc, char **argv)
++timestamp;
++timestamp_short;
} else if (matches(opt, "-Version") == 0) {
printf("ip utility, iproute2-ss%s\n", SNAPSHOT);
printf("ip utility, iproute2-%s\n", version);
exit(0);
} else if (matches(opt, "-force") == 0) {
++force;

4
ip/rtmon.c
View File

@ -19,7 +19,7 @@
#include <netinet/in.h>
#include <string.h>
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
#include "libnetlink.h"
@ -107,7 +107,7 @@ main(int argc, char **argv)
} else if (strcmp(argv[1], "-0") == 0) {
family = AF_PACKET;
} else if (matches(argv[1], "-Version") == 0) {
printf("rtmon utility, iproute2-ss%s\n", SNAPSHOT);
printf("rtmon utility, iproute2-%s\n", version);
exit(0);
} else if (matches(argv[1], "file") == 0) {
argc--;

4
misc/ifstat.c
View File

@ -33,7 +33,7 @@
#include "libnetlink.h"
#include "json_writer.h"
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
int dump_zeros;
@ -869,7 +869,7 @@ int main(int argc, char *argv[])
break;
case 'v':
case 'V':
printf("ifstat utility, iproute2-ss%s\n", SNAPSHOT);
printf("ifstat utility, iproute2-%s\n", version);
exit(0);
case 'h':
case '?':

4
misc/nstat.c
View File

@ -29,7 +29,7 @@
#include <getopt.h>
#include <json_writer.h>
#include <SNAPSHOT.h>
#include "version.h"
#include "utils.h"
int dump_zeros;
@ -621,7 +621,7 @@ int main(int argc, char *argv[])
break;
case 'v':
case 'V':
printf("nstat utility, iproute2-ss%s\n", SNAPSHOT);
printf("nstat utility, iproute2-%s\n", version);
exit(0);
case 'h':
case '?':

4
misc/rtacct.c
View File

@ -30,7 +30,7 @@
#include "rt_names.h"
#include <SNAPSHOT.h>
#include "version.h"
int reset_history;
int ignore_history;
@ -463,7 +463,7 @@ int main(int argc, char *argv[])
break;
case 'v':
case 'V':
printf("rtacct utility, iproute2-ss%s\n", SNAPSHOT);
printf("rtacct utility, iproute2-%s\n", version);
exit(0);
case 'M':
/* Some secret undocumented option, nobody

4
misc/ss.c
View File

@ -35,7 +35,7 @@
#include "ll_map.h"
#include "libnetlink.h"
#include "namespace.h"
#include "SNAPSHOT.h"
#include "version.h"
#include "rt_names.h"
#include "cg_map.h"
@ -5411,7 +5411,7 @@ int main(int argc, char *argv[])
break;
case 'v':
case 'V':
printf("ss utility, iproute2-ss%s\n", SNAPSHOT);
printf("ss utility, iproute2-%s\n", version);
exit(0);
case 'z':
show_sock_ctx++;

6
rdma/rdma.c
View File

@ -5,7 +5,7 @@
*/
#include "rdma.h"
#include "SNAPSHOT.h"
#include "version.h"
#include "color.h"
static void help(char *name)
@ -131,8 +131,8 @@ int main(int argc, char **argv)
long_options, NULL)) >= 0) {
switch (opt) {
case 'V':
printf("%s utility, iproute2-ss%s\n",
filename, SNAPSHOT);
printf("%s utility, iproute2-%s\n",
filename, version);
return EXIT_SUCCESS;
case 'p':
pretty = 1;

4
tc/tc.c
View File

@ -24,7 +24,7 @@
#include <string.h>
#include <errno.h>
#include "SNAPSHOT.h"
#include "version.h"
#include "utils.h"
#include "tc_util.h"
#include "tc_common.h"
@ -299,7 +299,7 @@ int main(int argc, char **argv)
} else if (matches(argv[1], "-graph") == 0) {
show_graph = 1;
} else if (matches(argv[1], "-Version") == 0) {
printf("tc utility, iproute2-ss%s\n", SNAPSHOT);
printf("tc utility, iproute2-%s\n", version);
return 0;
} else if (matches(argv[1], "-iec") == 0) {
++use_iec;