From 9a81cf4ae199947772303c737d99c21f853aae6c Mon Sep 17 00:00:00 2001 From: goldberg Date: Fri, 4 Feb 2022 14:52:50 -0500 Subject: [PATCH] name using SDK_VERSION The sdk version will be used to name the debian --- .gitignore | 3 +++ nfpm-dbg.yaml => nfpm-dbg.yaml.in | 2 +- nfpm-dev.yaml => nfpm-dev.yaml.in | 2 +- nfpm.yaml => nfpm.yaml.in | 2 +- secondary.mk | 10 +++++++++- 5 files changed, 15 insertions(+), 4 deletions(-) rename nfpm-dbg.yaml => nfpm-dbg.yaml.in (96%) rename nfpm-dev.yaml => nfpm-dev.yaml.in (96%) rename nfpm.yaml => nfpm.yaml.in (96%) diff --git a/.gitignore b/.gitignore index 2ba1189..620b2ea 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ bcm/sdk* sdk libbcmsdk* openbcm/ +nfpm-dbg.yaml +nfpm-dev.yaml +nfpm.yaml diff --git a/nfpm-dbg.yaml b/nfpm-dbg.yaml.in similarity index 96% rename from nfpm-dbg.yaml rename to nfpm-dbg.yaml.in index 867506d..fb6910b 100644 --- a/nfpm-dbg.yaml +++ b/nfpm-dbg.yaml.in @@ -9,7 +9,7 @@ name: "libbcmsdk-dbg" arch: "amd64" platform: "linux" -version: "v1.0.0" +version: "v%SDK_VERSION%" section: "default" priority: "extra" replaces: diff --git a/nfpm-dev.yaml b/nfpm-dev.yaml.in similarity index 96% rename from nfpm-dev.yaml rename to nfpm-dev.yaml.in index 9a89493..d0e4334 100644 --- a/nfpm-dev.yaml +++ b/nfpm-dev.yaml.in @@ -9,7 +9,7 @@ name: "libbcmsdk-dev" arch: "amd64" platform: "linux" -version: "v1.0.0" +version: "v%SDK_VERSION%" section: "default" priority: "extra" replaces: diff --git a/nfpm.yaml b/nfpm.yaml.in similarity index 96% rename from nfpm.yaml rename to nfpm.yaml.in index 5a9728c..4eea42e 100644 --- a/nfpm.yaml +++ b/nfpm.yaml.in @@ -9,7 +9,7 @@ name: "libbcmsdk" arch: "amd64" platform: "linux" -version: "v1.0.0" +version: "v%SDK_VERSION%" section: "default" priority: "extra" replaces: diff --git a/secondary.mk b/secondary.mk index 5e8fede..3a67552 100644 --- a/secondary.mk +++ b/secondary.mk @@ -15,9 +15,17 @@ secondary.mk: ; include bcmsdk.mk +nfpm_yaml = \ +./nfpm.yaml \ +./nfpm-dbg.yaml \ +./nfpm-dev.yaml + +$(nfpm_yaml): + cat $@.in | sed "s,%SDK_VERSION%,$(SDK_VERSION),g" > $@ + # make pkgs word2(deb,rpm) .PHONY: pkg_% -pkg_%: bcmsdk_all +pkg_%: bcmsdk_all $(nfpm_yaml) nfpm pkg --packager $(word2) --config ./nfpm-dev.yaml --target ./ nfpm pkg --packager $(word2) --config ./nfpm.yaml --target ./ nfpm pkg --packager $(word2) --config ./nfpm-dbg.yaml --target ./