From b14db911a4316f4cf2802d8653b0e9e4052570c3 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Tue, 3 Dec 2019 11:29:21 -1000 Subject: Add diverts to work around binpack on tvos --- data/bash/_metadata/postinst.appletvos-arm64 | 18 +++++++++++++++ data/bash/_metadata/prerm.appletvos-arm64 | 26 ++++++++++++++++++++++ .../coreutils-bin/_metadata/postrm.appletvos-arm64 | 10 +++++++++ .../_metadata/preinst.appletvos-arm64 | 10 +++++++++ data/coreutils/_metadata/postrm.appletvos-arm64 | 7 ++++++ data/coreutils/_metadata/preinst.appletvos-arm64 | 6 +++++ data/htop/_metadata/depends.appletvos-arm64 | 1 + data/lzma/_metadata/postrm.appletvos-arm64 | 8 +++++++ data/lzma/_metadata/preinst.appletvos-arm64 | 8 +++++++ data/network-cmds/_metadata/postrm.appletvos-arm64 | 8 +++++++ .../network-cmds/_metadata/preinst.appletvos-arm64 | 8 +++++++ data/readline/_metadata/depends.appletvos-arm64 | 1 + data/shell-cmds/_metadata/postrm.appletvos-arm64 | 8 +++++++ data/shell-cmds/_metadata/preinst.appletvos-arm64 | 8 +++++++ data/sqlite3/_metadata/postrm.appletvos-arm64 | 8 +++++++ data/sqlite3/_metadata/preinst.appletvos-arm64 | 8 +++++++ data/system-cmds/_metadata/postrm.appletvos-arm64 | 10 +++++++++ data/system-cmds/_metadata/preinst.appletvos-arm64 | 10 +++++++++ data/vim/_metadata/postrm.appletvos-arm64 | 10 +++++++++ data/vim/_metadata/preinst.appletvos-arm64 | 10 +++++++++ 20 files changed, 183 insertions(+) create mode 100755 data/bash/_metadata/postinst.appletvos-arm64 create mode 100755 data/bash/_metadata/prerm.appletvos-arm64 create mode 100755 data/coreutils-bin/_metadata/postrm.appletvos-arm64 create mode 100755 data/coreutils-bin/_metadata/preinst.appletvos-arm64 create mode 100755 data/coreutils/_metadata/postrm.appletvos-arm64 create mode 100755 data/coreutils/_metadata/preinst.appletvos-arm64 create mode 100644 data/htop/_metadata/depends.appletvos-arm64 create mode 100755 data/lzma/_metadata/postrm.appletvos-arm64 create mode 100755 data/lzma/_metadata/preinst.appletvos-arm64 create mode 100755 data/network-cmds/_metadata/postrm.appletvos-arm64 create mode 100755 data/network-cmds/_metadata/preinst.appletvos-arm64 create mode 100644 data/readline/_metadata/depends.appletvos-arm64 create mode 100755 data/shell-cmds/_metadata/postrm.appletvos-arm64 create mode 100755 data/shell-cmds/_metadata/preinst.appletvos-arm64 create mode 100755 data/sqlite3/_metadata/postrm.appletvos-arm64 create mode 100755 data/sqlite3/_metadata/preinst.appletvos-arm64 create mode 100755 data/system-cmds/_metadata/postrm.appletvos-arm64 create mode 100755 data/system-cmds/_metadata/preinst.appletvos-arm64 create mode 100755 data/vim/_metadata/postrm.appletvos-arm64 create mode 100755 data/vim/_metadata/preinst.appletvos-arm64 diff --git a/data/bash/_metadata/postinst.appletvos-arm64 b/data/bash/_metadata/postinst.appletvos-arm64 new file mode 100755 index 000000000..22e6d7064 --- /dev/null +++ b/data/bash/_metadata/postinst.appletvos-arm64 @@ -0,0 +1,18 @@ +#!/bin/bash + +set -e + +if [ ! -e /bin/sh ]; then + ln -s bash /bin/sh +fi + +case "$1" in + abort-remove|configure) + dpkg-divert --quiet --local --rename /bin/sh + update-alternatives --quiet --install /bin/sh sh /bin/bash 100 || true + ln -fs /bin/bash /usr/bin/bash + ;; + *) + exit 0 + ;; +esac diff --git a/data/bash/_metadata/prerm.appletvos-arm64 b/data/bash/_metadata/prerm.appletvos-arm64 new file mode 100755 index 000000000..b599c5202 --- /dev/null +++ b/data/bash/_metadata/prerm.appletvos-arm64 @@ -0,0 +1,26 @@ +#!/bin/bash + +set -e + +case "$1" in + upgrade) + ;; + + remove|deconfigure) + update-alternatives --quiet --remove sh /bin/bash + dpkg-divert --local --quiet --rename --remove /bin/sh + rm -f /usr/bin/bash + if [ ! -e /bin/sh ]; then + echo There would be no shell! + ln -fs bash /bin/sh + exit 1 + fi + ;; + + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac diff --git a/data/coreutils-bin/_metadata/postrm.appletvos-arm64 b/data/coreutils-bin/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..605c0a4af --- /dev/null +++ b/data/coreutils-bin/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for bin in cat chmod cp date dd kill ln ls mkdir mv pwd rm rmdir sleep stty; do + dpkg-divert --package coreutils-bin --remove --rename \ + --divert /bin/.${bin}.binpack /bin/${bin} + done + dpkg-divert --package coreutils-bin --remove --rename \ + --divert /usr/bin/.dirname.binpack /usr/bin/dirname +fi diff --git a/data/coreutils-bin/_metadata/preinst.appletvos-arm64 b/data/coreutils-bin/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..30b09ada1 --- /dev/null +++ b/data/coreutils-bin/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for bin in cat chmod cp date dd kill ln ls mkdir mv pwd rm rmdir sleep stty; do + dpkg-divert --package coreutils-bin --add --rename \ + --divert /bin/.${bin}.binpack /bin/${bin} + done + dpkg-divert --package coreutils-bin --add --rename \ + --divert /usr/bin/.dirname.binpack /usr/bin/dirname +fi diff --git a/data/coreutils/_metadata/postrm.appletvos-arm64 b/data/coreutils/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..5a511563d --- /dev/null +++ b/data/coreutils/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ] || \ + ( [ abort-upgrade = "$1" ] && dpkg --compare-versions "$2" le "8.31-1" ); then + dpkg-divert --package coreutils --remove --rename \ + --divert /usr/sbin/.chown.binpack /usr/sbin/chown +fi diff --git a/data/coreutils/_metadata/preinst.appletvos-arm64 b/data/coreutils/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..351b7fc6b --- /dev/null +++ b/data/coreutils/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ upgrade != "$1" ] || dpkg --compare-versions "$2" le "8.31-1"; then + dpkg-divert --package coreutils --add --rename \ + --divert /usr/sbin/.chown.binpack /usr/sbin/chown +fi diff --git a/data/htop/_metadata/depends.appletvos-arm64 b/data/htop/_metadata/depends.appletvos-arm64 new file mode 100644 index 000000000..035f923dd --- /dev/null +++ b/data/htop/_metadata/depends.appletvos-arm64 @@ -0,0 +1 @@ +ncurses (>= 6.1) diff --git a/data/lzma/_metadata/postrm.appletvos-arm64 b/data/lzma/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..6edb88182 --- /dev/null +++ b/data/lzma/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for file in lzmadec lzmainfo; do + dpkg-divert --package lzma --remove --rename \ + --divert /usr/bin/.${bin}.xz /usr/bin/${bin} + done +fi diff --git a/data/lzma/_metadata/preinst.appletvos-arm64 b/data/lzma/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..05e1d5bb5 --- /dev/null +++ b/data/lzma/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for bin in lzmadec lzmainfo; do + dpkg-divert --package lzma --add --rename \ + --divert /usr/bin/.${bin}.xz /usr/bin/${bin} + done +fi diff --git a/data/network-cmds/_metadata/postrm.appletvos-arm64 b/data/network-cmds/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..a6d4ba0b9 --- /dev/null +++ b/data/network-cmds/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for bin in ifconfig; do + dpkg-divert --package network-cmds --remove --rename \ + --divert /sbin/.${bin}.binpack /sbin/${bin} + done +fi diff --git a/data/network-cmds/_metadata/preinst.appletvos-arm64 b/data/network-cmds/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..0850ca85f --- /dev/null +++ b/data/network-cmds/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for bin in ifconfig; do + dpkg-divert --package network-cmds --add --rename \ + --divert /sbin/.${bin}.binpack /sbin/${bin} + done +fi diff --git a/data/readline/_metadata/depends.appletvos-arm64 b/data/readline/_metadata/depends.appletvos-arm64 new file mode 100644 index 000000000..035f923dd --- /dev/null +++ b/data/readline/_metadata/depends.appletvos-arm64 @@ -0,0 +1 @@ +ncurses (>= 6.1) diff --git a/data/shell-cmds/_metadata/postrm.appletvos-arm64 b/data/shell-cmds/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..3b8efeb0b --- /dev/null +++ b/data/shell-cmds/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for bin in time renice killall script which; do + dpkg-divert --package shell-cmds --remove --rename \ + --divert /usr/bin/.${bin}.binpack /usr/bin/${bin} + done +fi diff --git a/data/shell-cmds/_metadata/preinst.appletvos-arm64 b/data/shell-cmds/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..28ed9e85e --- /dev/null +++ b/data/shell-cmds/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for bin in time renice killall script which; do + dpkg-divert --package shell-cmds --add --rename \ + --divert /usr/bin/.${bin}.binpack /usr/bin/${bin} + done +fi diff --git a/data/sqlite3/_metadata/postrm.appletvos-arm64 b/data/sqlite3/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..f3a9ad425 --- /dev/null +++ b/data/sqlite3/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for bin in sqlite3; do + dpkg-divert --package sqlite3 --remove --rename \ + --divert /usr/bin/.${bin}.binpack /usr/bin/${bin} + done +fi diff --git a/data/sqlite3/_metadata/preinst.appletvos-arm64 b/data/sqlite3/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..6800da35b --- /dev/null +++ b/data/sqlite3/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for bin in sqlite3; do + dpkg-divert --package sqlite3 --add --rename \ + --divert /usr/bin/.${bin}.binpack /usr/bin/${bin} + done +fi diff --git a/data/system-cmds/_metadata/postrm.appletvos-arm64 b/data/system-cmds/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..0077f1b9e --- /dev/null +++ b/data/system-cmds/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for file in /sbin/dmesg /usr/bin/arch /usr/bin/hostinfo /usr/bin/login /usr/bin/passwd /usr/sbin/reboot /usr/sbin/sysctl; do + filename=$(basename $file) + dirname=$(dirname $file) + dpkg-divert --package system-cmds --remove --rename \ + --divert ${dirname}/.${filename}.binpack $file + done +fi diff --git a/data/system-cmds/_metadata/preinst.appletvos-arm64 b/data/system-cmds/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..29247f142 --- /dev/null +++ b/data/system-cmds/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for file in /sbin/dmesg /usr/bin/arch /usr/bin/hostinfo /usr/bin/login /usr/bin/passwd /usr/sbin/reboot /usr/sbin/sysctl; do + filename=$(basename $file) + dirname=$(dirname $file) + dpkg-divert --package system-cmds --add --rename \ + --divert ${dirname}/.${filename}.binpack $file + done +fi diff --git a/data/vim/_metadata/postrm.appletvos-arm64 b/data/vim/_metadata/postrm.appletvos-arm64 new file mode 100755 index 000000000..02c08825e --- /dev/null +++ b/data/vim/_metadata/postrm.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then + for file in /usr/bin/vim /usr/bin/xxd + filename=$(basename $file) + dirname=$(dirname $file) + dpkg-divert --package vim --remove --rename \ + --divert ${dirname}/.${filename}.binpack $file + done +fi diff --git a/data/vim/_metadata/preinst.appletvos-arm64 b/data/vim/_metadata/preinst.appletvos-arm64 new file mode 100755 index 000000000..ec0109db2 --- /dev/null +++ b/data/vim/_metadata/preinst.appletvos-arm64 @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ upgrade != "$1" ]; then + for file in /usr/bin/vim /usr/bin/xxd; do + filename=$(basename $file) + dirname=$(dirname $file) + dpkg-divert --package vim --add --rename \ + --divert ${dirname}/.${filename}.binpack $file + done +fi -- cgit v1.2.3