openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

fixup! Convert flashrom to git

Browse Source 
Use a more generic file name for the exported VCS data.

Change-Id: Ie57b20dc014ba44ded5783bdb432eb7d0e0e28ad
Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-on: https://review.coreboot.org/21826
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Stefan Tauner 2017-10-04 02:18:33 +02:00 committed by Nico Huber
parent e4136854f1
commit 2dc5d29400
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -526,10 +526,10 @@ LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich
CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
# Makefile.version is used when packaging flashrom and is generated by the # versioninfo.inc is used when packaging flashrom and is generated by the
# export rule. If Makefile.version is not found, version info will be obtained # export rule. If versioninfo.inc is not found, version info will be obtained
# using util/getrevision.sh or "unknown" if SCM metadata directory isn't found. # using util/getrevision.sh or "unknown" if SCM metadata directory isn't found.
ifeq ($(wildcard Makefile.version),) ifeq ($(wildcard versioninfo.inc),)
ifeq ($(wildcard .git),) ifeq ($(wildcard .git),)
VERSION ?= unknown VERSION ?= unknown
MAN_DATE ?= unknown MAN_DATE ?= unknown
@ -540,7 +540,7 @@ MAN_DATE ?= $(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl 2>/dev/null)
$(shell ./util/git-hooks/install.sh) $(shell ./util/git-hooks/install.sh)
endif endif
else else
include Makefile.version include versioninfo.inc
endif endif
# VERSION equals "offline" if online access is required but the respective git # VERSION equals "offline" if online access is required but the respective git
@ -1402,10 +1402,9 @@ _export: $(PROGRAM).8
@rm -rf "$(EXPORTDIR)/flashrom-$(RELEASENAME)" @rm -rf "$(EXPORTDIR)/flashrom-$(RELEASENAME)"
@mkdir -p "$(EXPORTDIR)/flashrom-$(RELEASENAME)" @mkdir -p "$(EXPORTDIR)/flashrom-$(RELEASENAME)"
@git archive HEAD | tar -x -C "$(EXPORTDIR)/flashrom-$(RELEASENAME)" @git archive HEAD | tar -x -C "$(EXPORTDIR)/flashrom-$(RELEASENAME)"
# Generate Makefile.version since SCM metadata won't be available in # Generate versioninfo.inc containing metadata that would not be available in exported sources otherwise.
# exported sources. @echo "VERSION = $(VERSION)" > "$(EXPORTDIR)/flashrom-$(RELEASENAME)/versioninfo.inc"
@echo "VERSION = $(VERSION)" > "$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile.version" @echo "MAN_DATE = $(MAN_DATE)" >> "$(EXPORTDIR)/flashrom-$(RELEASENAME)/versioninfo.inc"
@echo "MAN_DATE = $(MAN_DATE)" >> "$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile.version"
# Restore modification date of all tracked files not marked 'export-ignore' in .gitattributes. # Restore modification date of all tracked files not marked 'export-ignore' in .gitattributes.
# sed is required to filter out file names having the attribute set. # sed is required to filter out file names having the attribute set.
# The sed program saves the file name in the hold buffer and then checks if the respective value is 'set'. # The sed program saves the file name in the hold buffer and then checks if the respective value is 'set'.