Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- config/rootfiles/common/i586/amd-microcode | 1 + config/rootfiles/common/x86_64/amd-microcode | 1 + lfs/amd-microcode | 79 ++++++++++++++++++++++++++++ make.sh | 1 + 4 files changed, 82 insertions(+) create mode 100644 config/rootfiles/common/i586/amd-microcode create mode 100644 config/rootfiles/common/x86_64/amd-microcode create mode 100644 lfs/amd-microcode
diff --git a/config/rootfiles/common/i586/amd-microcode b/config/rootfiles/common/i586/amd-microcode new file mode 100644 index 000000000..54dd311c8 --- /dev/null +++ b/config/rootfiles/common/i586/amd-microcode @@ -0,0 +1 @@ +lib/firmware/amd-ucode/microcode_amd_fam17h.bin diff --git a/config/rootfiles/common/x86_64/amd-microcode b/config/rootfiles/common/x86_64/amd-microcode new file mode 100644 index 000000000..54dd311c8 --- /dev/null +++ b/config/rootfiles/common/x86_64/amd-microcode @@ -0,0 +1 @@ +lib/firmware/amd-ucode/microcode_amd_fam17h.bin diff --git a/lfs/amd-microcode b/lfs/amd-microcode new file mode 100644 index 000000000..cec3a16a2 --- /dev/null +++ b/lfs/amd-microcode @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 17h + +THISAPP = microcode_amd_fam$(VER) +DL_FILE = $(THISAPP).bin +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = i586 x86_64 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4610fdded46938a4b094c5897e5c92b2 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:. + $(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && mv $(DIR_DL)/$(DL_FILE) $(DIR_APP)/ + # Copy the firmware file into the right position + cd $(DIR_APP) && cp -Rv $(DL_FILE) /lib/firmware/amd-ucode/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3f10ffaec..992159105 100755 --- a/make.sh +++ b/make.sh @@ -1121,6 +1121,7 @@ buildipfire() { ;; esac lfsmake2 intel-microcode + lfsmake2 amd-microcode lfsmake2 xtables-addons USPACE="1" lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
Hi,
there are a few issues with this patch...
On Thu, 2018-01-18 at 19:14 +0100, Jonatan Schlag wrote:
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org
config/rootfiles/common/i586/amd-microcode | 1 + config/rootfiles/common/x86_64/amd-microcode | 1 + lfs/amd-microcode | 79 ++++++++++++++++++++++++++++ make.sh | 1 + 4 files changed, 82 insertions(+) create mode 100644 config/rootfiles/common/i586/amd-microcode create mode 100644 config/rootfiles/common/x86_64/amd-microcode create mode 100644 lfs/amd-microcode
diff --git a/config/rootfiles/common/i586/amd-microcode b/config/rootfiles/common/i586/amd-microcode new file mode 100644 index 000000000..54dd311c8 --- /dev/null +++ b/config/rootfiles/common/i586/amd-microcode @@ -0,0 +1 @@ +lib/firmware/amd-ucode/microcode_amd_fam17h.bin diff --git a/config/rootfiles/common/x86_64/amd-microcode b/config/rootfiles/common/x86_64/amd-microcode new file mode 100644 index 000000000..54dd311c8 --- /dev/null +++ b/config/rootfiles/common/x86_64/amd-microcode @@ -0,0 +1 @@ +lib/firmware/amd-ucode/microcode_amd_fam17h.bin diff --git a/lfs/amd-microcode b/lfs/amd-microcode new file mode 100644 index 000000000..cec3a16a2 --- /dev/null +++ b/lfs/amd-microcode @@ -0,0 +1,79 @@ +############################################################################# ## +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################# ##
+############################################################################# ## +# Definitions +############################################################################# ##
+include Config
+VER = 17h
This is not really a version number.
It is the name of the architecture/CPU family.
Maybe you can use a date.
+THISAPP = microcode_amd_fam$(VER) +DL_FILE = $(THISAPP).bin +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = i586 x86_64
+############################################################################# ## +# Top-level Rules +############################################################################# ##
+objects = $(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE)_MD5 = 4610fdded46938a4b094c5897e5c92b2
+install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+md5 : $(subst %,%_MD5,$(objects))
+dist:.
- $(PAK)
+############################################################################# ## +# Downloading, checking, md5sum +############################################################################# ##
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
+$(subst %,%_MD5,$(objects)) :
- @$(MD5)
+############################################################################# ## +# Installation Details +############################################################################# ##
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && mkdir -p $(DIR_APP) && mv
$(DIR_DL)/$(DL_FILE) $(DIR_APP)/
- # Copy the firmware file into the right position
- cd $(DIR_APP) && cp -Rv $(DL_FILE) /lib/firmware/amd-ucode/
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
You are moving the source file here which would cause that every time it would be re-downloaded again.
diff --git a/make.sh b/make.sh index 3f10ffaec..992159105 100755 --- a/make.sh +++ b/make.sh @@ -1121,6 +1121,7 @@ buildipfire() { ;; esac lfsmake2 intel-microcode
- lfsmake2 amd-microcode lfsmake2 xtables-addons USPACE="1" lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
-
Jonatan Schlag -
Michael Tremer