Revert "Ipmitool bookworm: Fix and patch enterprise-numbers URL (#17878…

…)" (#20349) (#20844) The latest version of ipmitool in Debian has the enterprise-numbers.txt file. Don't compile this package locally anymore. This reverts commit 4753953. Co-authored-by: Saikrishna Arcot <[email protected]>
sonic-net · Nov 19, 2024 · 87493db · 87493db
1 parent 858916c
commit 87493db
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 175 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -382,6 +382,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     mtr-tiny                \
     locales                 \
     cgroup-tools            \
+    ipmitool                \
     ndisc6                  \
     makedumpfile            \
     conntrack               \

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -103,10 +103,6 @@ sudo mkdir -p $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ifupdown2_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 
-# Install a patched version of ipmitool  (and its dependencies via 'apt-get -y install -f')
-sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ipmitool_*.deb || \
-    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-
 # Install a patched version of ntp  (and its dependencies via 'apt-get -y install -f')
 sudo dpkg --root=$FILESYSTEM_ROOT --force-confdef --force-confold -i $debs_path/ntp_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y \

diff --git a/rules/ipmitool.dep b/rules/ipmitool.dep
diff --git a/rules/ipmitool.mk b/rules/ipmitool.mk
diff --git a/slave.mk b/slave.mk
@@ -1360,7 +1360,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(LINUX_KERNEL) \
                 $(SONIC_DEVICE_DATA) \
                 $(IFUPDOWN2) \
-                $(IPMITOOL) \
                 $(KDUMP_TOOLS) \
                 $(LIBPAM_RADIUS) \
                 $(LIBNSS_RADIUS) \

diff --git a/src/ipmitool/Makefile b/src/ipmitool/Makefile
diff --git a/src/ipmitool/patch/0001-Changes-needed-to-install-enterprise.txt.patch b/src/ipmitool/patch/0001-Changes-needed-to-install-enterprise.txt.patch
diff --git a/src/ipmitool/patch/series b/src/ipmitool/patch/series