Skip to content

Commit ff9a1d5

Browse files
authored
[202012][buildsystem]: Fix hiredis package version: 0.14.1-1. (#15719)
Backport #15461 #### Why I did it * To fix `hiredis` compilation #### How I did it * Changed package version: `0.14.0-3~bpo9+1` -> `0.14.1-1` #### How to verify it 1. make configure PLATFORM=mellanox 2. make target/sonic-mellanox.bin #### Tested branch (Please provide the tested image version) - [X] 202012 <!-- image version 1 -->
1 parent 4e628f0 commit ff9a1d5

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

rules/hiredis.mk

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# libhiredis package
22

3-
HIREDIS_VERSION = 0.14.0
4-
HIREDIS_VERSION_FULL = $(HIREDIS_VERSION)-3~bpo9+1
3+
HIREDIS_VERSION = 0.14.1
4+
HIREDIS_VERSION_FULL = ${HIREDIS_VERSION}-1
55

66
export HIREDIS_VERSION HIREDIS_VERSION_FULL
77

@@ -12,6 +12,7 @@ SONIC_MAKE_DEBS += $(LIBHIREDIS)
1212
LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
1313
$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV)))
1414

15-
LIBHIREDIS_DBG = libhiredis-dbg_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
1615
LIBHIREDIS_DBG = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
1716
$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG)))
17+
18+
export LIBHIREDIS LIBHIREDIS_DEV LIBHIREDIS_DBG

src/hiredis/Makefile

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
SHELL = /bin/bash
33
.SHELLFLAGS += -e
44

5-
MAIN_TARGET = libhiredis0.14_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
6-
DERIVED_TARGETS = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
5+
MAIN_TARGET = $(LIBHIREDIS)
6+
DERIVED_TARGETS = $(LIBHIREDIS_DBG) $(LIBHIREDIS_DEV)
77

88
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
9-
rm -rf hiredis-$(HIREDIS_VERSION)
9+
# Remove any stale files
10+
rm -rf ./hiredis-$(HIREDIS_VERSION)
1011

11-
wget -O hiredis_$(HIREDIS_VERSION).orig.tar.gz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION).orig.tar.gz
12-
wget -O hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).debian.tar.xz
13-
wget -O hiredis_$(HIREDIS_VERSION_FULL).dsc http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
12+
# Get hiredis release, debian files
13+
dget -u http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
1414

15-
dpkg-source -x hiredis_$(HIREDIS_VERSION_FULL).dsc
16-
pushd hiredis-$(HIREDIS_VERSION)
15+
# Build source and Debian packages
16+
pushd ./hiredis-$(HIREDIS_VERSION)
1717
dpkg-buildpackage -rfakeroot -d -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
1818
popd
1919

20+
# Move the newly-built .deb packages to the destination directory
2021
mv $* $(DERIVED_TARGETS) $(DEST)/
2122

2223
$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

0 commit comments

Comments
 (0)