forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Flashrom refactoring (sonic-net#6922)
#### Why I did it To build flashrom properly with dependency tracking. #### How I did it Moved flashrom code from platform/broadcom/sonic-platform-modules-dell/tools directory to src/flashrom directory. At the end, flashrom_0.9.7_amd64.deb package is build which will be installed in the devices.
- Loading branch information
1 parent
f2678f0
commit 1b024eb
Showing
13 changed files
with
133 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
platform/broadcom/sonic-platform-modules-dell/tools/flashrom.sh
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
SPATH := $($(FLASHROM)_SRC_PATH) | ||
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/flashrom.mk rules/flashrom.dep | ||
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) | ||
DEP_FILES += $(shell git ls-files $(SPATH)) | ||
|
||
$(FLASHROM)_CACHE_MODE := GIT_CONTENT_SHA | ||
$(FLASHROM)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) | ||
$(FLASHROM)_DEP_FILES := $(DEP_FILES) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# flashrom package | ||
# | ||
|
||
FLASHROM_VERSION_FULL = 0.9.7 | ||
|
||
export FLASHROM_VERSION_FULL | ||
|
||
FLASHROM = flashrom_$(FLASHROM_VERSION_FULL)_$(CONFIGURED_ARCH).deb | ||
$(FLASHROM)_SRC_PATH = $(SRC_PATH)/flashrom | ||
|
||
SONIC_MAKE_DEBS += $(FLASHROM) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
SHELL = /bin/bash | ||
.ONESHELL: | ||
.SHELLFLAGS += -e | ||
|
||
|
||
MAIN_TARGET = flashrom_$(FLASHROM_VERSION_FULL)_$(CONFIGURED_ARCH).deb | ||
|
||
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : | ||
rm -rf ./flashrom-$(FLASHROM_VERSION_FULL) | ||
# Obtain flashrom | ||
git clone https://github.com/flashrom/flashrom.git flashrom-$(FLASHROM_VERSION_FULL) | ||
pushd ./flashrom-$(FLASHROM_VERSION_FULL) | ||
|
||
# Check out tag: tags/0.9.7 | ||
git checkout -b flashrom-src tags/$(FLASHROM_VERSION_FULL) | ||
|
||
# Apply patch series | ||
stg init | ||
stg import -s ../patch/series | ||
|
||
# Build package | ||
dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) | ||
popd | ||
|
||
mv $* $(DEST)/ |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
diff --git a/debian/changelog b/debian/changelog | ||
new file mode 100644 | ||
index 0000000..a7acb04 | ||
--- /dev/null | ||
+++ b/debian/changelog | ||
@@ -0,0 +1,5 @@ | ||
+flashrom (0.9.7) unstable; urgency=low | ||
+ | ||
+ * Initial release | ||
+ | ||
+ -- Dell Team <support@dell.com> Mon, 14 Dec 2020 10:10:10 -0800 | ||
diff --git a/debian/compat b/debian/compat | ||
new file mode 100644 | ||
index 0000000..ec63514 | ||
--- /dev/null | ||
+++ b/debian/compat | ||
@@ -0,0 +1 @@ | ||
+9 | ||
diff --git a/debian/control b/debian/control | ||
new file mode 100644 | ||
index 0000000..8aafc90 | ||
--- /dev/null | ||
+++ b/debian/control | ||
@@ -0,0 +1,8 @@ | ||
+Source: flashrom | ||
+Section: main | ||
+Priority: optional | ||
+Maintainer: Dell Team <support@dell.com> | ||
+ | ||
+Package: flashrom | ||
+Architecture: amd64 | ||
+Description: Flashrom Utility | ||
diff --git a/debian/rules b/debian/rules | ||
new file mode 100755 | ||
index 0000000..492b21d | ||
--- /dev/null | ||
+++ b/debian/rules | ||
@@ -0,0 +1,7 @@ | ||
+#!/usr/bin/make -f | ||
+ | ||
+ | ||
+%: | ||
+ dh $@ | ||
+ | ||
+override_dh_usrlocal: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff --git a/Makefile b/Makefile | ||
index 0e976e5..d4413df 100644 | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -686,7 +686,7 @@ FEATURE_LIBS += $(shell LC_ALL=C grep -q "NEEDLIBZ := yes" .libdeps && printf "% | ||
LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) | ||
OBJS = $(CLI_OBJS) $(LIBFLASHROM_OBJS) | ||
|
||
-all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 | ||
+all: hwlibs features $(PROGRAM)$(EXEC_SUFFIX) | ||
ifeq ($(ARCH), x86) | ||
@+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX) | ||
endif | ||
@@ -914,22 +914,9 @@ endif | ||
@$(DIFF) -q .features.tmp .features >/dev/null 2>&1 && rm .features.tmp || mv .features.tmp .features | ||
@rm -f .featuretest.c .featuretest$(EXEC_SUFFIX) | ||
|
||
-$(PROGRAM).8: $(PROGRAM).8.tmpl | ||
- @sed -e '1 s#".*".*#"$(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl)" "$(VERSION)"#' <$< >$@ | ||
- | ||
-install: $(PROGRAM)$(EXEC_SUFFIX) $(PROGRAM).8 | ||
+install: $(PROGRAM)$(EXEC_SUFFIX) | ||
mkdir -p $(DESTDIR)$(PREFIX)/sbin | ||
- mkdir -p $(DESTDIR)$(MANDIR)/man8 | ||
$(INSTALL) -m 0755 $(PROGRAM)$(EXEC_SUFFIX) $(DESTDIR)$(PREFIX)/sbin | ||
- $(INSTALL) -m 0644 $(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 | ||
- | ||
-export: $(PROGRAM).8 | ||
- @rm -rf $(EXPORTDIR)/flashrom-$(RELEASENAME) | ||
- @svn export -r BASE . $(EXPORTDIR)/flashrom-$(RELEASENAME) | ||
- @sed "s/^SVNVERSION.*/SVNVERSION := $(SVNVERSION)/" Makefile >$(EXPORTDIR)/flashrom-$(RELEASENAME)/Makefile | ||
- @cp $(PROGRAM).8 "$(EXPORTDIR)/flashrom-$(RELEASENAME)/$(PROGRAM).8" | ||
- @LC_ALL=C svn log >$(EXPORTDIR)/flashrom-$(RELEASENAME)/ChangeLog | ||
- @echo Exported $(EXPORTDIR)/flashrom-$(RELEASENAME)/ | ||
|
||
tarball: export | ||
@tar cjf $(EXPORTDIR)/flashrom-$(RELEASENAME).tar.bz2 -C $(EXPORTDIR)/ $(TAROPTIONS) flashrom-$(RELEASENAME)/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
0002-Flashrom-support-for-Intel-Rangeley-and-Denverton-CP.patch | ||
0003-Debian-package-base.patch | ||
0004-Flashrom-remove-tmpl.patch |