cmd: Fix license command

The license command isn't usually built and has a few problems: - The rules to generate license.h haven't worked in a long time, re-write these based on the bmp_logo.h rules. - 'tok' is unused and the license text size has increased - bin2header.c wasn't grabbing unistd.h to know the prototype for read(). Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Tom Rini <trini@konsulko.com>

cmd: Fix license command
The license command isn't usually built and has a few problems: - The rules to generate license.h haven't worked in a long time, re-write these based on the bmp_logo.h rules. - 'tok' is unused and the license text size has increased - bin2header.c wasn't grabbing unistd.h to know the prototype for read(). Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini
1 parent cd0fa5bff8
Showing 5 changed files with 15 additions and 8 deletions Side-by-side Diff
Makefile
cmd/license.c
include/.gitignore
tools/Makefile
tools/bin2header.c
@@ -1405,8 +1405,6 @@
 	git log --no-merges U-Boot-1_1_5.. | \
 	unexpand -a | sed -e 's/\s\s*$$//' > $@
  
-include/license.h: tools/bin2header COPYING
-	cat COPYING | gzip -9 -c | ./tools/bin2header license_gzip > include/license.h
 #########################################################################
  
 ###
@@ -1421,7 +1419,7 @@
 	       $(foreach d, spl tpl, $(patsubst %,$d/%, \
 			$(filter-out include, $(shell ls -1 $d 2>/dev/null))))
  
-CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
+CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h include/license.h \
 	       boot* u-boot* MLO* SPL System.map
  
 # Directories & files removed with 'make mrproper'
@@ -7,7 +7,7 @@
  
 #include <common.h>
  
-/* COPYING is currently 15951 bytes in size */
+/* Licenses/gpl-2.0.txt is currently 18092 bytes in size */
 #define LICENSE_MAX	20480
  
 #include <command.h>
  
@@ -16,13 +16,13 @@
  
 int do_license(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	char *tok, *dst = malloc(LICENSE_MAX);
+	char *dst = malloc(LICENSE_MAX);
 	unsigned long len = LICENSE_MAX;
  
 	if (!dst)
 		return -1;
  
-	if (gunzip(dst, LICENSE_MAX, license_gz, &len) != 0) {
+	if (gunzip(dst, LICENSE_MAX, license_gzip, &len) != 0) {
 		printf("Error uncompressing license text\n");
 		free(dst);
 		return -1;
@@ -2,4 +2,5 @@
 /bmp_logo.h
 /bmp_logo_data.h
 /config.h
+/license.h
@@ -31,7 +31,6 @@
  
 hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
  
-# TODO: CONFIG_CMD_LICENSE does not work
 hostprogs-$(CONFIG_CMD_LICENSE) += bin2header
 hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
 hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
@@ -212,6 +211,10 @@
  
 endif # !LOGO_BMP
  
+# Generated gziped GPL-2.0 license text
+LICENSE_H = $(objtree)/include/license.h
+LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H)
+
 #
 # Use native tools and options
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
  
@@ -226,13 +229,17 @@
 		-D__KERNEL_STRICT_NAMES \
 		-D_GNU_SOURCE
  
-__build:	$(LOGO-y)
+__build:	$(LOGO-y) $(LICENSE-y)
  
 $(LOGO_H):	$(obj)/bmp_logo $(LOGO_BMP)
 	$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
  
 $(LOGO_DATA_H):	$(obj)/bmp_logo $(LOGO_BMP)
 	$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
+
+$(LICENSE_H): $(obj)/bin2header $(srctree)/Licenses/gpl-2.0.txt
+	cat $(srctree)/Licenses/gpl-2.0.txt | gzip -9 -c | \
+		$(obj)/bin2header license_gzip > $(LICENSE_H)
  
 # Let clean descend into subdirs
 subdir- += env
@@ -8,6 +8,7 @@
  
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
  
 int main(int argc, char **argv)
 {
...	...	@@ -1405,8 +1405,6 @@
1405	1405	git log --no-merges U-Boot-1_1_5.. \| \
1406	1406	unexpand -a \| sed -e 's/\s\s*$$//' > $@
1407	1407
1408		-include/license.h: tools/bin2header COPYING
1409		- cat COPYING \| gzip -9 -c \| ./tools/bin2header license_gzip > include/license.h
1410	1408	#########################################################################
1411	1409
1412	1410	###
...	...	@@ -1421,7 +1419,7 @@
1421	1419	$(foreach d, spl tpl, $(patsubst %,$d/%, \
1422	1420	$(filter-out include, $(shell ls -1 $d 2>/dev/null))))
1423	1421
1424		-CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \
	1422	+CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h include/license.h \
1425	1423	boot* u-boot* MLO* SPL System.map
1426	1424
1427	1425	# Directories & files removed with 'make mrproper'
...	...	@@ -7,7 +7,7 @@
7	7
8	8	#include <common.h>
9	9
10		-/* COPYING is currently 15951 bytes in size */
	10	+/* Licenses/gpl-2.0.txt is currently 18092 bytes in size */
11	11	#define LICENSE_MAX 20480
12	12
13	13	#include <command.h>
14	14
...	...	@@ -16,13 +16,13 @@
16	16
17	17	int do_license(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
18	18	{
19		- char tok, dst = malloc(LICENSE_MAX);
	19	+ char *dst = malloc(LICENSE_MAX);
20	20	unsigned long len = LICENSE_MAX;
21	21
22	22	if (!dst)
23	23	return -1;
24	24
25		- if (gunzip(dst, LICENSE_MAX, license_gz, &len) != 0) {
	25	+ if (gunzip(dst, LICENSE_MAX, license_gzip, &len) != 0) {
26	26	printf("Error uncompressing license text\n");
27	27	free(dst);
28	28	return -1;
...	...	@@ -2,4 +2,5 @@
2	2	/bmp_logo.h
3	3	/bmp_logo_data.h
4	4	/config.h
	5	+/license.h
...	...	@@ -31,7 +31,6 @@
31	31
32	32	hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
33	33
34		-# TODO: CONFIG_CMD_LICENSE does not work
35	34	hostprogs-$(CONFIG_CMD_LICENSE) += bin2header
36	35	hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
37	36	hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
...	...	@@ -212,6 +211,10 @@
212	211
213	212	endif # !LOGO_BMP
214	213
	214	+# Generated gziped GPL-2.0 license text
	215	+LICENSE_H = $(objtree)/include/license.h
	216	+LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H)
	217	+
215	218	#
216	219	# Use native tools and options
217	220	# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
218	221
...	...	@@ -226,13 +229,17 @@
226	229	-D__KERNEL_STRICT_NAMES \
227	230	-D_GNU_SOURCE
228	231
229		-__build: $(LOGO-y)
	232	+__build: $(LOGO-y) $(LICENSE-y)
230	233
231	234	$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
232	235	$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
233	236
234	237	$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
235	238	$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
	239	+
	240	+$(LICENSE_H): $(obj)/bin2header $(srctree)/Licenses/gpl-2.0.txt
	241	+ cat $(srctree)/Licenses/gpl-2.0.txt \| gzip -9 -c \| \
	242	+ $(obj)/bin2header license_gzip > $(LICENSE_H)
236	243
237	244	# Let clean descend into subdirs
238	245	subdir- += env
...	...	@@ -8,6 +8,7 @@
8	8
9	9	#include <stdlib.h>
10	10	#include <stdio.h>
	11	+#include <unistd.h>
11	12
12	13	int main(int argc, char **argv)
13	14	{