Skip to content

Commit

Permalink
signed flashfiles when RELEASE_BUILD = true
Browse files Browse the repository at this point in the history
Tracked-On: OAM-71340
Signed-off-by: Zhang, Xuepeng <[email protected]>
  • Loading branch information
Zhang, Xuepeng authored and swaroopbalan committed Mar 27, 2019
1 parent 911bf1a commit d40b06d
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 0 deletions.
18 changes: 18 additions & 0 deletions tasks/flashfiles.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,27 @@ endif
ifeq ($(TARGET_BUILD_TYPE),debug)
name := $(name)_debug
endif
ifeq ($(RELEASE_BUILD),true)
sign_flashfiles_name := $(name)-sign-flashfiles-$(FILE_NAME_TAG)
sign_targetfiles_name := $(name)-sign-targetfiles-$(FILE_NAME_TAG)
endif
name := $(name)-flashfiles-$(FILE_NAME_TAG)

BUILDNUM := $(shell $(DATE) +%H%M%3S)

ifeq ($(RELEASE_BUILD),true)
BUILT_RELEASE_FLASH_FILES_PACKAGE := $(PRODUCT_OUT)/$(sign_flashfiles_name).zip
BUILT_RELEASE_TARGET_FILES_PACKAGE := $(PRODUCT_OUT)/$(sign_targetfiles_name).zip
$(BUILT_RELEASE_TARGET_FILES_PACKAGE):$(BUILT_TARGET_FILES_PACKAGE)
@echo "Package release: $@"
build/tools/releasetools/sign_target_files_apks -o \
-d device/intel/build/testkeys/cts-release-test \
$(BUILT_TARGET_FILES_PACKAGE) $@
$(BUILT_RELEASE_FLASH_FILES_PACKAGE):$(BUILT_RELEASE_TARGET_FILES_PACKAGE) $(fftf) $(UEFI_ADDITIONAL_TOOLS)
$(hide) mkdir -p $(dir $@)
$(fftf) $(FLASHFILES_ADD_ARGS) --mv_config_default=$(notdir $(mvcfg_default_arg)) $(BUILT_RELEASE_TARGET_FILES_PACKAGE) $@
endif

ifeq ($(USE_INTEL_FLASHFILES),true)
fftf := $(INTEL_PATH_BUILD)/releasetools/flashfiles_from_target_files
odf := $(INTEL_PATH_BUILD)/releasetools/ota_deployment_fixup
Expand Down Expand Up @@ -71,6 +88,7 @@ else
mvcfg_default_arg = $(MV_CONFIG_DEFAULT_TYPE)
endif


$(INTEL_FACTORY_FLASHFILES_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(fftf) $(UEFI_ADDITIONAL_TOOLS)
$(hide) mkdir -p $(dir $@)
$(fftf) $(FLASHFILES_ADD_ARGS) --mv_config_default=$(notdir $(mvcfg_default_arg)) $(BUILT_TARGET_FILES_PACKAGE) $@
Expand Down
8 changes: 8 additions & 0 deletions tasks/publish.mk
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ endif
FIRMWARE_SYMBOLS_FILE := $(TARGET_DEVICE)-symbols_firmware.zip
FIRMWARE_SYMBOLS_PATH := $(wildcard $(INTEL_PATH_HARDWARE)/$(TARGET_BOARD_PLATFORM)-fls/$(PRODUCT_MODEL)/symbols/*.elf)

ifeq ($(RELEASE_BUILD),true)
publish_firmware_symbols: publish_mkdir_dest publish_flashfiles publish_signflashfiles
else
publish_firmware_symbols: publish_mkdir_dest publish_flashfiles
endif
ifneq ($(BUILD_OSAS),1) # prebuilt
@echo "------------Publish prebuilt firmware symbols from $(FIRMWARE_SYMBOLS_PATH) -----------"
ifneq ($(FIRMWARE_SYMBOLS_PATH),)
Expand All @@ -112,6 +116,10 @@ PUBLISH_SDK := $(strip $(filter sdk sdk_x86,$(TARGET_PRODUCT)))

ifndef PUBLISH_SDK

.PHONY: publish_signflashfiles
publish_signflashfiles: publish_mkdir_dest $(BUILT_RELEASE_FLASH_FILES_PACKAGE)
@$(ACP) $(BUILT_RELEASE_FLASH_FILES_PACKAGE) $(publish_dest)

.PHONY: publish_flashfiles
ifdef INTEL_FACTORY_FLASHFILES_TARGET
publish_flashfiles: publish_mkdir_dest $(INTEL_FACTORY_FLASHFILES_TARGET)
Expand Down
Binary file added testkeys/cts-release-test/media.pk8
Binary file not shown.
24 changes: 24 additions & 0 deletions testkeys/cts-release-test/media.x509.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIID/TCCAuWgAwIBAgIJANuz641n8Z4RMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
Fw0xODA4MjIwNzU0MzJaFw00NjAxMDcwNzU0MzJaMIGUMQswCQYDVQQGEwJVUzET
MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBALxumkH8ZYIW7ksrNSslTKQIUsS1YPE1rLeJ
gPTVftL0tAtCsE52Czuhvjuor9KAF5hZKiAp/JWK36fsyPzUzzQhY4nEXFYLEnT7
pnl88OCg8hZ3+eZuLYUMiTU0h7q2cqBjhC3LLsInHxBXKS9adj5mTBMlIBUvDu+q
OlwfLLmJD7zQlRSGAbd8nytpduB/mfvs0GwHRRVi92fvEcf49QASHpNlOf2WALij
4V0iLHjbzEHi90MEa3tzo/My+QsD3i2v8Y2gVN8ZNz+zJGUgmyHXeXaKpchwkI/Y
JMpC5bRFyPYkF5NkL/Nlqlc+1AS8gUKGYHxgYrUZIqgLEy2SCaMCAwEAAaNQME4w
HQYDVR0OBBYEFELIP1hFdYrigq4Bu2uDVfL33yR1MB8GA1UdIwQYMBaAFELIP1hF
dYrigq4Bu2uDVfL33yR1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AKm/MgpS9NFY0Kt7xHkRGJNOMEmW2bN6RP4Atb6yoXaybS7Egx0Dnwaq+lbq8EDd
pU8BlztVL2zRvyMXOQXScVEukLfH4b9Aqz/pjnpC231DJfuUOK/O8lZ5oCS9jRGg
Qoum6Q+zGj/DNHAenixyB+ibjpf7whlT3H+QFOAsSvilDDBJW9ryb19obFvo2sAq
b+Voc/FEhz4r45sAtbcKiZWxUWmVKMqmJ/ckYRU4XkedKT/2IY5AvLKRGl6jfSm7
fqiiIEemOPE5Th49460x3YNRSb6TXGhryuN9d/ApMc6vXQk87qyP7aVDJatr/7jK
B0neKXUNerj8pU8R7Tqchec=
-----END CERTIFICATE-----
Binary file added testkeys/cts-release-test/platform.pk8
Binary file not shown.
24 changes: 24 additions & 0 deletions testkeys/cts-release-test/platform.x509.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIID/TCCAuWgAwIBAgIJALZYEQhJDhe5MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
Fw0xODA4MjIwNzU0NTJaFw00NjAxMDcwNzU0NTJaMIGUMQswCQYDVQQGEwJVUzET
MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBALeUrgqq0xxRdok0abBLKHVAz+vcqE740W/C
/RBVE5PHPZVcn7RHcX19qRngErl6vz/L2LjM7bkT5kEkQRVz9iz6OMnSWVYFnIn+
EGPbCb2ZOQCtR2Zr/OkNbsbsvvSzK4xMyjjZgqOcOI/nA5hAHl5QFjf8hYv55gNm
+q+s1NWibA70+sQtuD1M55evMm6cudVlcuP2jQ+TEkamI0fahXiDxKJWg9sQBFjb
8pkCDxWvuYMCh1Oc0RSu0ONUhIN8WhNaYo2ywgpCc3G+gtHx0MOuqJmKTlW6T9HD
F07IanJmtpUGeNoasSlwp293UwrWcwxOQIQoVlTH6NBtt3Cn4YkCAwEAAaNQME4w
HQYDVR0OBBYEFIJAV6n1p82N90jjcVEHiLMQ59aLMB8GA1UdIwQYMBaAFIJAV6n1
p82N90jjcVEHiLMQ59aLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AHn1wCytrkIjJvEnImgbyc8CTRAglTcEyLK0OqGWPcVjTboMGRsPhiXKviXkUc35
bvoRTY9gHfV1GHHFzbH+/vCm6kzWakgmq0TbHWblW/OZnCEZLvu/5jnXId1xQ6iV
+a1J8YYZcdmqYB/w7Qhny3ARMEH4HvhLz6m/erkGVJ77vf3gxTQNtrgCDZn15ygD
lTjezaqpT24ffVTESlMVHNbGzGL/iY3rWQtx4KTw51IVYDH9XDKiXZlAooo27to6
Gge2HI1FwlWWbLUvbZuR4sK2lslihsXbL4Fk9OVBN9iCga8XMfqLT8/2hxF4ms0i
2f+MeCcSYB6lnCScJ4TAZAc=
-----END CERTIFICATE-----
Binary file added testkeys/cts-release-test/releasekey.pk8
Binary file not shown.
24 changes: 24 additions & 0 deletions testkeys/cts-release-test/releasekey.x509.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIID/TCCAuWgAwIBAgIJALRMW2ojHuFEMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
Fw0xODA4MjIwNzU2MDNaFw00NjAxMDcwNzU2MDNaMIGUMQswCQYDVQQGEwJVUzET
MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAMO7vYqFZtEAcic8dJ3xJ2ngXugtQ6p/BxOj
ymgiKKKPyIthtLhk5Nb0q9Y5hzrbMVlmgG9bdae2UkutgSdkpgKWUs8tbKtryulI
lXMZlf5AE7hv9VLristqsifAuW97oC5x7KFDiXt0GnJ+2oHOcw97FJEy4MzKXduF
FhAyJOJl28nm1g5UfBB3HazYN0KuzhJcgpv2OuSHKqWCEea6TNegCfums2IY4fNo
Q6koTmU5rtTuDSTCgaPtiI1y5rlPraSVIJKPIVqF1fXYyqhvuYdXCb2c+bFTrvJD
ntFwT72k4SxoUgN13H219lUT6/uXF4W4m59UtNSr5RAo88q9i2kCAwEAAaNQME4w
HQYDVR0OBBYEFEuRBjZHZHPOdCcG/3Mej6guASnxMB8GA1UdIwQYMBaAFEuRBjZH
ZHPOdCcG/3Mej6guASnxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AEAz5OadtgFm+hybrDb/GukGHpw+oqZnGNVtVHzO91FM8Y/mdBlQFnjJm3ZJ5hS4
1/hqy9Y/TEmwFflo2qsFymmnqSrXUJ6MK0vErpctPLPOqB9Ev7bKvNPPTKBDpj2w
N9FDogyLxNWAt6DYSNX6aXpqEhqEwH1lLoddIAtcaHG0biXB1LyS+FLMXaQ8ECGS
Lm3AVrMHFE0KE+SaAtkqDpc6l0CavzsPNod3zyloA+WGdDY8YhbOFuXsCRjx0JHs
XLOpKFk4vSVV6VtgdZm5h+uxjfisi+VuqM/C9C2Ue8DYAaqE2r0FykeBQbkmrBA9
KtWLzv4zfIgtKBfkUjeL7X8=
-----END CERTIFICATE-----
Binary file added testkeys/cts-release-test/shared.pk8
Binary file not shown.
24 changes: 24 additions & 0 deletions testkeys/cts-release-test/shared.x509.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIID/TCCAuWgAwIBAgIJAPruXm5zNpnaMA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4g
VmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UE
AwwHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAe
Fw0xODA4MjIwNzU1MDVaFw00NjAxMDcwNzU1MDVaMIGUMQswCQYDVQQGEwJVUzET
MBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4G
A1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEQMA4GA1UEAwwHQW5kcm9p
ZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAK1GjvSqvT9+KY1QQZ9WVH/VLhOPkWV2MVEM
ecjq8wBoggPvJ2XRac8kOl8O+TEvY85IaImWRpS4NLkiHRdqRyHnfE2dkKVBn5L8
rPRxOlYLMtUIwSi26QbklGYHSkw7fgZ0NSyKHw+opt4jkVRcdb/HZ3THdnt94jbs
DbuZGgkDrw1Mra92mcgwQPzgpOdIyQwri5MZtJj32G9Z19enBE8wC59GTp6pwlgJ
OLYr5oOzUFMQUyBHVFMo/vzbzyu9TMWVoAH13qQIT8NDRS9gjauEAYYI32UEopaT
7KyefheomwjgK5jTXSX+8qKGnhRgr6BY5rrXS6ampYTuBD0vJQ8CAwEAAaNQME4w
HQYDVR0OBBYEFNplXdZ5bM6vdfqVgssP2pdFOk3DMB8GA1UdIwQYMBaAFNplXdZ5
bM6vdfqVgssP2pdFOk3DMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AGdLznBJbe9RXxb2Cs4Obyl2TUS5ab2FpAY031WMoKOlYgNnwDudIKI8BnbW5JX+
GAOFL8fwv3Aa2JaO6M3Nnc4IIXJknyeicUizG9Q3KWWIgRGTbDp5/dlln82dVGts
kEmkn+UYmRcRaHeVY2WG6zW9Ursx3nTZWGUW80ngVRocEGikcaNhGD2yGVpSlTAA
SNEtJIrb8dS/b3v/vN4NoHIvjRxLWlFOD8aXPfC4oiArCelShW3UHtumkAkHOxT8
2Pq45acyDOnHfyVRSfc0FarTfz6bMGQEu6Fphx37A/+ixo50S+3sb0xz7+oNKEZ1
gHGKxfRhkCRubiKCdUZuQ84=
-----END CERTIFICATE-----

0 comments on commit d40b06d

Please sign in to comment.