From c853e10d5063d533503324671e7dd4f4d1375cfc Mon Sep 17 00:00:00 2001 From: "xiaolongx.jiang" Date: Mon, 18 May 2020 07:07:38 +0000 Subject: openssl update and modify make clean Signed-off-by: xiaolongx.jiang Change-Id: Ifbaa86d0b724642ed46a67d93fb12adcf2ba84e9 --- Makefile | 4 ++-- README.md | 8 +++++++- openssl_patches/0001-openssl3.0.0-alpha1.patch | 24 ------------------------ packages/openssl-dl.mk | 4 ++-- packages/openssl.mk | 10 +++++----- 5 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 openssl_patches/0001-openssl3.0.0-alpha1.patch diff --git a/Makefile b/Makefile index 9cf7a3f..b84bf10 100644 --- a/Makefile +++ b/Makefile @@ -68,11 +68,11 @@ clean: .PHONY: clean-vcl clean-vcl: - @rm -f $(B)/.vcl* + @rm -f $(B)/.*vcl* .PHONY: clean-ldp clean-ldp: - @rm -f $(B)/.ldp* + @rm -f $(B)/.*ldp* $(BR)/.deps.ok: make dep diff --git a/README.md b/README.md index 880a115..e8cf839 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,13 @@ $ make deb-ldp Build ldp vpp and ldp nginx and store the vcl files in folder '/path/to/this/repo/_install/local' $ make build-ldp -Clean all packages +Clean up build vcl environment, remove _build/.*vcl*. for example: rm _build/.vpp_vcl.build.ok and so on +$ make clean-vcl + +Clean up build ldp environment, remove _build/.*vcl*. for example: rm _build/.vpp_ldp.build.ok and so on +$ make clean-ldp + +Clean up build environment $ make clean ``` diff --git a/openssl_patches/0001-openssl3.0.0-alpha1.patch b/openssl_patches/0001-openssl3.0.0-alpha1.patch deleted file mode 100644 index f639104..0000000 --- a/openssl_patches/0001-openssl3.0.0-alpha1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 47904f922ac042c24d3c8d4ecfda15d902c48c2e Mon Sep 17 00:00:00 2001 -From: "xiaolongx.jiang" -Date: Fri, 8 May 2020 07:06:30 +0000 -Subject: [PATCH] openssl3.0.0-alpha1 - -Signed-off-by: xiaolongx.jiang ---- - VERSION | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/VERSION b/VERSION -index b7529b4..bfcd4fc 100644 ---- a/VERSION -+++ b/VERSION -@@ -3,5 +3,5 @@ MINOR=0 - PATCH=0 - PRE_RELEASE_TAG=alpha1 - BUILD_METADATA= --RELEASE_DATE="23 Apr 2020" -+RELEASE_DATE=23 Apr 2020 - SHLIB_VERSION=3 --- -2.17.1 - diff --git a/packages/openssl-dl.mk b/packages/openssl-dl.mk index e7b8d5b..29f679c 100644 --- a/packages/openssl-dl.mk +++ b/packages/openssl-dl.mk @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -openssl_version := 3.0.0-alpha1 +openssl_version := 3.0.0-alpha2 openssl_tarball := openssl-$(openssl_version).tar.gz -openssl_tarball_md5sum := d9326bd068a0382193ab0cb1c6e4685b +openssl_tarball_md5sum := a09ce9a0f52a6744457ee2a37c9f10b4 openssl_url := https://www.openssl.org/source/$(openssl_tarball) $(eval $(call download,openssl)) diff --git a/packages/openssl.mk b/packages/openssl.mk index 37f2c84..3f76a7b 100644 --- a/packages/openssl.mk +++ b/packages/openssl.mk @@ -11,8 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -openssl_version := 3.0.0-alpha1 -openssl_patch_dir := $(CURDIR)/openssl_patches +openssl_version := 3.0.0-alpha2 openssl_install_dir := $(I)/local/ssl openssl_deb_inst_dir := /usr/local/ssl openssl_pkg_deb_name := openssl3 @@ -20,12 +19,13 @@ openssl_pkg_deb_dir := $(I)/openssl-deb openssl_rpm_inst_dir := /usr/local/ssl openssl_pkg_rpm_name := openssl3 openssl_pkg_rpm_dir := $(I)/openssl-rpm -openssl_tarball := openssl-$(openssl_version).tar.gz -openssl_tarball_md5sum := d9326bd068a0382193ab0cb1c6e4685b openssl_tarball_strip_dirs := 1 -openssl_url := https://www.openssl.org/source/$(openssl_tarball) openssl_desc := "openssl3.0.0" +define openssl_patch_cmds + @true +endef + define openssl_config_cmds @cd $(openssl_build_dir) && \ $(openssl_src_dir)/config \ -- cgit 1.2.3-korg