[PATCH] 2.4.21-rc2 syntax error in toplevel Makefile

[PATCH] 2.4.21-rc2 syntax error in toplevel Makefile

[Olaf Hering]

The used syntax is obsolete since a while.
Update two places to the correct syntax.

Please apply for 2.4.21.


nectarine:/ # tail -1
tail: `-1' option is obsolete; use `-n 1'
Try `tail --help' for more information.
nectarine:/ # tail --version
tail (coreutils) 5.0
Written by Paul Rubin, David MacKenzie, Ian Lance Taylor, and Jim Meyering.

Copyright (C) 2003 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.


diff -purN linux-2.4.21-rc2/Makefile linux-2.4.21-rc2.tail/Makefile
--- linux-2.4.21-rc2/Makefile	2003-05-18 12:39:41.000000000 +0200
+++ linux-2.4.21-rc2.tail/Makefile	2003-05-18 12:37:05.000000000 +0200
@@ -342,7 +342,7 @@ include/linux/compile.h: $(CONFIGURATION
 	 ([ -x /bin/domainname ] && /bin/domainname > .ver1) || \
 	 echo > .ver1
 	@echo \#define LINUX_COMPILE_DOMAIN \"`cat .ver1 | $(uts_truncate)`\" >> .ver
-	@echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -1`\" >> .ver
+	@echo \#define LINUX_COMPILER \"`$(CC) $(CFLAGS) -v 2>&1 | tail -n 1`\" >> .ver
 	@mv -f .ver $@
 	@rm -f .ver1
 
diff -purN linux-2.4.21-rc2/arch/ppc64/boot/Makefile linux-2.4.21-rc2.tail/arch/ppc64/boot/Makefile
--- linux-2.4.21-rc2/arch/ppc64/boot/Makefile	2003-05-18 12:39:42.000000000 +0200
+++ linux-2.4.21-rc2.tail/arch/ppc64/boot/Makefile	2003-05-18 12:37:46.000000000 +0200
@@ -90,7 +90,7 @@ addnote: addnote.c
 
 imagesize.c: $(TOPDIR)/vmlinux
 	ls -l $(TOPDIR)/vmlinux | awk '{printf "/* generated -- do not edit! */\nunsigned long vmlinux_filesize = %d;\n", $$5}' > imagesize.c
-	$(CROSS_COMPILE)nm -n $(TOPDIR)/vmlinux | tail -1 | awk '{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr($$1,8)}' >> imagesize.c
+	$(CROSS_COMPILE)nm -n $(TOPDIR)/vmlinux | awk '{i=$$1}END{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr(i,8)}' >> imagesize.c
 
 zImage.o: $(TOPDIR)/vmlinux
 
-- 
USB is for mice, FireWire is for men!