matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrade to ntp 4.2.8p15 for Bullseye

Browse Source 
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
This commit is contained in:
Saikrishna Arcot 2021-08-16 08:49:43 -07:00 committed by Saikrishna Arcot
parent fb03bd2440
commit 91f6800500
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_debian.sh
View File

@ -352,7 +352,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c "find /usr/share/i18n/locales/ ! -na
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install \
picocom \ picocom \
systemd \ systemd \
systemd-sysv systemd-sysv \
ntp
if [[ $CONFIGURED_ARCH == amd64 ]]; then if [[ $CONFIGURED_ARCH == amd64 ]]; then
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \

4
rules/ntp.mk
View File

@ -1,9 +1,9 @@
# ntp package # ntp package
NTP_VERSION = 4.2.8p12+dfsg NTP_VERSION = 4.2.8p15+dfsg
export NTP_VERSION export NTP_VERSION
NTP = ntp_$(NTP_VERSION)-4+deb10u2_$(CONFIGURED_ARCH).deb NTP = ntp_$(NTP_VERSION)-1+deb10u2_$(CONFIGURED_ARCH).deb
$(NTP)_SRC_PATH = $(SRC_PATH)/ntp $(NTP)_SRC_PATH = $(SRC_PATH)/ntp
SONIC_MAKE_DEBS += $(NTP) SONIC_MAKE_DEBS += $(NTP)
SONIC_STRETCH_DEBS += $(NTP) SONIC_STRETCH_DEBS += $(NTP)

6
src/ntp/Makefile
View File

@ -10,15 +10,15 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Get ntp release, debian files # Get ntp release, debian files
wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION).orig.tar.xz wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION).orig.tar.xz
wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION)-4.debian.tar.xz wget http://deb.debian.org/debian/pool/main/n/ntp/ntp_$(NTP_VERSION)-1.debian.tar.xz
# UnTar ntp release # UnTar ntp release
xzcat ntp_$(NTP_VERSION).orig.tar.xz | tar -xvf - xzcat ntp_$(NTP_VERSION).orig.tar.xz | tar -xvf -
pushd ./ntp-4.2.8p12 pushd ./ntp-4.2.8p15
# UnTar debian files # UnTar debian files
xzcat ../ntp_$(NTP_VERSION)-4.debian.tar.xz | tar -xvf - xzcat ../ntp_$(NTP_VERSION)-1.debian.tar.xz | tar -xvf -
# Add the additional patch # Add the additional patch
cp ../patch/bug1970-UNLINK_EXPR_SLIST_empty_list.patch debian/patches/ cp ../patch/bug1970-UNLINK_EXPR_SLIST_empty_list.patch debian/patches/

4
src/ntp/patch/changelog
View File

@ -1,10 +1,10 @@
ntp (1:4.2.8p12+dfsg-4+deb10u2) stretch; urgency=medium ntp (1:4.2.8p15+dfsg-1+deb10u2) bullseye; urgency=medium
* Adjust the ENOBUFS syslog level on the Netlink routing to LOG_WARNING. * Adjust the ENOBUFS syslog level on the Netlink routing to LOG_WARNING.
-- Arun Barboza <arun.barboza@broadcom.com> Mon, 09 Sep 2019 10:15:35 -0700 -- Arun Barboza <arun.barboza@broadcom.com> Mon, 09 Sep 2019 10:15:35 -0700
ntp (1:4.2.8p12+dfsg-4+deb10u1) stretch; urgency=medium ntp (1:4.2.8p15+dfsg-1+deb10u1) bullseye; urgency=medium
* Apply Bug1970 fix for UNLINK_EXPR_SLIST_empty_list from dev branch. * Apply Bug1970 fix for UNLINK_EXPR_SLIST_empty_list from dev branch.