summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 17:36:14 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-04 17:36:14 (EDT)
commite30cba792afeed6a1b42fb62393781332b8a1544 (patch)
tree8c84e23ade7b6902fb69097e95fefd2fbc0b9f55
parent5efe3be539e3305db38f543a693b0028c4ffce58 (diff)
build, opkg-lede: Manage opkg-key and u-a with u-a
How meta.
-rwxr-xr-xbuild4
-rw-r--r--changelog1
-rw-r--r--opkg-lede.pkg/postinst5
3 files changed, 7 insertions, 3 deletions
diff --git a/build b/build
index 2dbd66f..84de890 100755
--- a/build
+++ b/build
@@ -23,9 +23,9 @@ install: build
oh-autoinstall
mv dest/usr/bin/opkg-cl dest/usr/bin/opkg-lede
@# opkg-lede's CMake build system doesn't install these...
- cp ../opkg-key dest/usr/bin/opkg-key
+ cp ../opkg-key dest/usr/bin/opkg-key-lede
sed 's|@opkglibdir@|/var/lib|g' src/utils/update-alternatives.in \
- >dest/usr/bin/update-alternatives
+ >dest/usr/bin/update-alternatives-lede
oh-fixperms
oh-strip
oh-installfiles
diff --git a/changelog b/changelog
index bc6ec73..0065800 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ opkg-lede (0+git20190131.d4ba162-2) trunk
"/etc/opkg/opkg.conf".
* Set lock file path to "/var/lib/opkg/lock", as it has always been
with the original opkg.
+ * Manage opkg-key and update-alternatives with update-alternatives.
-- Patrick McDermott <patrick.mcdermott@libiquity.com> Thu, 04 Apr 2019 16:52:10 -0400
diff --git a/opkg-lede.pkg/postinst b/opkg-lede.pkg/postinst
index 187a8cc..f1ee124 100644
--- a/opkg-lede.pkg/postinst
+++ b/opkg-lede.pkg/postinst
@@ -1,5 +1,8 @@
#!/bin/sh
if [ x"${1}" = x'configure' ]; then
- update-alternatives --install /usr/bin/opkg opkg /usr/bin/opkg-lede 30
+ for f in opkg opkg-key update-alternatives; do
+ update-alternatives --install "/usr/bin/${f}" "${f}" \
+ "/usr/bin/${f}-lede" 30
+ done
fi