Skip to content

Commit 0b4408e

Browse files
saiarcot895mssonicbld
authored andcommitted
Revert "Ipmitool bookworm: Fix and patch enterprise-numbers URL (sonic-net#17878)" (sonic-net#20349)
The latest version of ipmitool in Debian has the enterprise-numbers.txt file. Don't compile this package locally anymore. This reverts commit 4753953.
1 parent 858916c commit 0b4408e

File tree

8 files changed

+1
-175
lines changed

8 files changed

+1
-175
lines changed

build_debian.sh

+1
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
382382
mtr-tiny \
383383
locales \
384384
cgroup-tools \
385+
ipmitool \
385386
ndisc6 \
386387
makedumpfile \
387388
conntrack \

files/build_templates/sonic_debian_extension.j2

-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ sudo mkdir -p $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
103103
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ifupdown2_*.deb || \
104104
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
105105

106-
# Install a patched version of ipmitool (and its dependencies via 'apt-get -y install -f')
107-
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ipmitool_*.deb || \
108-
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
109-
110106
# Install a patched version of ntp (and its dependencies via 'apt-get -y install -f')
111107
sudo dpkg --root=$FILESYSTEM_ROOT --force-confdef --force-confold -i $debs_path/ntp_*.deb || \
112108
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y \

rules/ipmitool.dep

-11
This file was deleted.

rules/ipmitool.mk

-17
This file was deleted.

slave.mk

-1
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
13601360
$(LINUX_KERNEL) \
13611361
$(SONIC_DEVICE_DATA) \
13621362
$(IFUPDOWN2) \
1363-
$(IPMITOOL) \
13641363
$(KDUMP_TOOLS) \
13651364
$(LIBPAM_RADIUS) \
13661365
$(LIBNSS_RADIUS) \

src/ipmitool/Makefile

-28
This file was deleted.

src/ipmitool/patch/0001-Changes-needed-to-install-enterprise.txt.patch

-113
This file was deleted.

src/ipmitool/patch/series

-1
This file was deleted.

0 commit comments

Comments
 (0)