Skip to content

Commit

Permalink
Fix the lib not overwritten issue in docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
xumia committed Sep 9, 2022
1 parent ac25437 commit 3a0539a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ $(addprefix $(TARGET_PATH)/, $(MAIN_TARGETS)) : $(TARGET_PATH)/% : $$(addprefix
# Merge the debian patches if not applied
if [ -f $($*_SRC_PATH).patch/debian.patch/series ]; then
LAST_PATCH=$$(tail -n1 $($*_SRC_PATH).patch/debian.patch/series)
if ! grep -q $$LAST_PATCH $($*_SRC_PATH)/debian/patches/series 2>/null; then
if ! grep -q $$LAST_PATCH $($*_SRC_PATH)/debian/patches/series 2>/dev/null; then
echo "Applying patches for $($*_SRC_PATH)/debian/patches/"
cat $($*_SRC_PATH).patch/debian.patch/series >> $($*_SRC_PATH)/debian/patches/series
cp $($*_SRC_PATH).patch/debian.patch/*.patch $($*_SRC_PATH)/debian/patches/
Expand All @@ -66,6 +66,8 @@ $(addprefix $(TARGET_PATH)/, $(MAIN_TARGETS)) : $(TARGET_PATH)/% : $$(addprefix
fi
# Fix Misc/NEWS not found issue for python
if [[ "$*" == python3* ]]; then touch Misc/NEWS; fi
# Fix package overwrite issue, increase the timestamp
export SOURCE_DATE_EPOCH="$$(($$(dpkg-parsechangelog -STimestamp) + 86400))"
$($*_BUILD_OPTIONS) dpkg-buildpackage -b -d -rfakeroot -us -uc | tee $(DEST)/$*.log
popd
mkdir -p $(DEST)
Expand Down
2 changes: 1 addition & 1 deletion rules/symcrypt-openssl.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SYMCRYPT_OPENSSL

SYMCRYPT_OPENSSL_VERSION = 0.2
SYMCRYPT_OPENSSL_VERSION = 0.3
SYMCRYPT_OPENSSL = symcrypt-openssl_$(SYMCRYPT_OPENSSL_VERSION)_$(ARCH).deb
$(SYMCRYPT_OPENSSL)_SRC_PATH = $(SRC_PATH)/SymCrypt-OpenSSL-Debian
$(SYMCRYPT_OPENSSL)_MAKEFILE = Makefile
Expand Down

0 comments on commit 3a0539a

Please sign in to comment.