From 0e3419d1c9fe6a14c44aefee8aa2b047822cb403 Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com> Date: Mon, 3 Jan 2022 19:21:47 +0300 Subject: [PATCH] Remove ipctool from firmware --- general/overlay/etc/profile | 4 ++-- general/package/ipctool/ipctool.mk | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/general/overlay/etc/profile b/general/overlay/etc/profile index 7e40b6a5..8046a317 100644 --- a/general/overlay/etc/profile +++ b/general/overlay/etc/profile @@ -20,8 +20,8 @@ export EDITOR='/bin/vi' [ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; } -ipctool_install() { curl -s -L -o /tmp/ipctool2 https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool && \ - chmod +x /tmp/ipctool2 && echo -e "\n\e[1;36mipctool installed\e[0m\n\n"; } +ipctool_install() { curl -s -L -o /tmp/ipctool https://github.com/OpenIPC/ipctool/releases/download/latest/ipctool && \ + chmod +x /tmp/ipctool && echo -e "\n\e[1;36mipctool installed\e[0m\n\n"; } majestic_changes() { diff -L "Majestic changes" -U 3 /rom/etc/majestic.yaml /etc/majestic.yaml; } diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk index a5b152a4..18f8d6a5 100644 --- a/general/package/ipctool/ipctool.mk +++ b/general/package/ipctool/ipctool.mk @@ -13,4 +13,10 @@ IPCTOOL_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_VE IPCTOOL_MAKE_OPTS += VERBOSE=1 +define IPCTOOL_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/ipcinfo +endef + + $(eval $(cmake-package))