Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4/4] New rsync target #1080

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[4/4] New rsync target #1080

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1ff87f
Fix libpcap creates a wrong destination folder
abhisit Dec 19, 2024
99b876b
Support OpenSSL 3.4.0
abhisit Dec 19, 2024
45b51bd
tcpdump auto-select/depends on libpcap and openssl
abhisit Dec 19, 2024
057a296
Add rsync command/target
abhisit Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Support OpenSSL 3.4.0 
Signed-off-by: Abhisit Sangjan <[email protected]>
  • Loading branch information
@abhisit
abhisit committed Dec 19, 2024
commit 99b876b2d4c4f19135e753b9094962a0cb3e47ed
20 changes: 19 additions & 1 deletion build-config/make/openssl.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# This is a makefile fragment that defines the build of openssl
#

OPENSSL_VERSION = 1.1.1g
OPENSSL_VERSION ?= 1.1.1g
OPENSSL_TARBALL = openssl-$(OPENSSL_VERSION).tar.gz
OPENSSL_TARBALL_URLS += $(ONIE_MIRROR) \
https://www.openssl.org/source
Expand All @@ -31,10 +31,26 @@ PHONY += openssl openssl-download openssl-source \
openssl-configure openssl-build openssl-install openssl-clean \
openssl-download-clean

ifeq ($(OPENSSL_VERSION),1.1.1g)
OPENSSL_ARCH =
OPENSSL_LIBS = \
engines-1.1 \
libcrypto.so libcrypto.so.1.1 \
libssl.so libssl.so.1.1
else ifeq ($(OPENSSL_VERSION),3.4.0)
ifeq ($(ARCH),arm64)
OPENSSL_ARCH = linux-aarch64
else
OPENSSL_ARCH = linux-$(ARCH)
endif

OPENSSL_LIBS = \
engines \
libcrypto.so libcrypto.so.3 \
libssl.so libssl.so.3
else
$(error OPENSSL_LIBS: Unsupported OpenSSL version: $(OPENSSL_VERSION))
endif

OPENSSL_BINS = openssl

Expand Down Expand Up @@ -63,7 +79,9 @@ $(OPENSSL_CONFIGURE_STAMP): $(OPENSSL_SOURCE_STAMP) $(ZLIB_BUILD_STAMP) \
$(Q) rm -f $@ && eval $(PROFILE_STAMP)
$(Q) echo "==== Configure openssl-$(OPENSSL_VERSION) ===="
$(Q) cd $(OPENSSL_DIR) && PATH='$(CROSSBIN):$(PATH)' \
MACHINE=$(TARGET) RELEASE=$(LINUX_RELEASE) \
$(OPENSSL_DIR)/config \
$(OPENSSL_ARCH) \
--prefix=/usr \
--cross-compile-prefix=$(CROSSPREFIX) \
shared \
Expand Down
1 change: 1 addition & 0 deletions upstream/openssl-3.4.0.tar.gz.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5c2f33c3f3601676f225109231142cdc30d44127 openssl-3.4.0.tar.gz