Skip to content

Commit

Permalink
Revert "Ipmitool bookworm: Fix and patch enterprise-numbers URL (soni…
Browse files Browse the repository at this point in the history
…c-net#17878)"

The latest version of ipmitool in Debian has the enterprise-numbers.txt
file. Don't compile this package locally anymore.

This reverts commit 4753953.
  • Loading branch information
saiarcot895 committed Sep 25, 2024
1 parent 8ad497f commit 5073910
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 175 deletions.
1 change: 1 addition & 0 deletions build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
mtr-tiny \
locales \
cgroup-tools \
ipmitool \
ndisc6 \
makedumpfile \
conntrack \
Expand Down
4 changes: 0 additions & 4 deletions files/build_templates/sonic_debian_extension.j2
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ sudo setcap 'cap_net_raw=+ep' $FILESYSTEM_ROOT/usr/bin/wol
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 \
Expand Down
11 changes: 0 additions & 11 deletions rules/ipmitool.dep

This file was deleted.

17 changes: 0 additions & 17 deletions rules/ipmitool.mk

This file was deleted.

1 change: 0 additions & 1 deletion slave.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
$(LINUX_KERNEL) \
$(SONIC_DEVICE_DATA) \
$(IFUPDOWN2) \
$(IPMITOOL) \
$(KDUMP_TOOLS) \
$(LIBPAM_RADIUS) \
$(LIBNSS_RADIUS) \
Expand Down
28 changes: 0 additions & 28 deletions src/ipmitool/Makefile

This file was deleted.

113 changes: 0 additions & 113 deletions src/ipmitool/patch/0001-Changes-needed-to-install-enterprise.txt.patch

This file was deleted.

1 change: 0 additions & 1 deletion src/ipmitool/patch/series

This file was deleted.

0 comments on commit 5073910

Please sign in to comment.