From 096f6692b8129ea18bae9be1ca06b03a6eba6a84 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Thu, 5 Sep 2019 10:28:48 -1000 Subject: Don't use separate version deps by arch --- control.sh | 2 +- data/apt7-key/_metadata/apt7-lib.ver | 1 + data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm | 1 - data/apt7-lib/_metadata/dpkg.ver | 1 + data/apt7-lib/_metadata/dpkg.ver.iphoneos-arm | 1 - data/apt7/_metadata/apt7-lib.ver | 1 + data/apt7/_metadata/apt7-lib.ver.iphoneos-arm | 1 - data/coreutils/_metadata/coreutils-bin.ver | 1 + data/coreutils/_metadata/coreutils-bin.ver.iphoneos-arm | 1 - data/dpkg/_metadata/coreutils-bin.ver | 1 + data/dpkg/_metadata/ldid.ver | 1 + data/fakeroot/_metadata/shell-cmds.ver | 1 + data/fakeroot/_metadata/shell-cmds.ver.iphoneos-arm | 1 - data/git/_metadata/expat.ver | 1 + data/git/_metadata/expat.ver.iphoneos-arm | 1 - data/gnupg2/_metadata/gnupg.ver | 1 + data/gnupg2/_metadata/gnupg.ver.iphoneos-arm | 1 - data/htop/_metadata/ncurses.ver | 1 + data/htop/_metadata/ncurses.ver.iphoneos-arm | 1 - data/lame/_metadata/libmp3lame0.ver | 1 + data/lame/_metadata/libmp3lame0.ver.iphoneos-arm | 1 - data/libapt/_metadata/dpkg.ver | 1 + data/libapt/_metadata/dpkg.ver.iphoneos-arm | 1 - data/libmp3lame-dev/_metadata/libmp3lame0.ver | 1 + data/libmp3lame-dev/_metadata/libmp3lame0.ver.iphoneos-arm | 1 - data/libogg-dev/_metadata/libogg0.ver | 1 + data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm | 1 - data/libssl-dev/_metadata/libssl1.0.ver | 1 + data/libssl-dev/_metadata/libssl1.0.ver.iphoneos-arm | 1 - data/libvorbis-dev/_metadata/libvorbis0.ver | 1 + data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm | 1 - data/libvorbis-dev/_metadata/libvorbisenc2.ver | 1 + data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm | 1 - data/libvorbis-dev/_metadata/libvorbisfile3.ver | 1 + data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm | 1 - data/libx264-dev/_metadata/libx264-157.ver | 1 + data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm | 1 - data/netatalk/_metadata/berkeleydb.ver | 1 + data/netatalk/_metadata/berkeleydb.ver.iphoneos-arm | 1 - data/openssl/_metadata/libssl1.0.ver | 1 + data/openssl/_metadata/libssl1.0.ver.iphoneos-arm | 1 - data/readline/_metadata/ncurses.ver | 1 + data/x264/_metadata/libx264-157.ver | 1 + data/x264/_metadata/libx264-157.ver.iphoneos-arm | 1 - 44 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 data/apt7-key/_metadata/apt7-lib.ver delete mode 100644 data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm create mode 100644 data/apt7-lib/_metadata/dpkg.ver delete mode 100644 data/apt7-lib/_metadata/dpkg.ver.iphoneos-arm create mode 100644 data/apt7/_metadata/apt7-lib.ver delete mode 100644 data/apt7/_metadata/apt7-lib.ver.iphoneos-arm create mode 100644 data/coreutils/_metadata/coreutils-bin.ver delete mode 100644 data/coreutils/_metadata/coreutils-bin.ver.iphoneos-arm create mode 100644 data/dpkg/_metadata/coreutils-bin.ver create mode 100644 data/dpkg/_metadata/ldid.ver create mode 100644 data/fakeroot/_metadata/shell-cmds.ver delete mode 100644 data/fakeroot/_metadata/shell-cmds.ver.iphoneos-arm create mode 100644 data/git/_metadata/expat.ver delete mode 100644 data/git/_metadata/expat.ver.iphoneos-arm create mode 100644 data/gnupg2/_metadata/gnupg.ver delete mode 100644 data/gnupg2/_metadata/gnupg.ver.iphoneos-arm create mode 100644 data/htop/_metadata/ncurses.ver delete mode 100644 data/htop/_metadata/ncurses.ver.iphoneos-arm create mode 120000 data/lame/_metadata/libmp3lame0.ver delete mode 120000 data/lame/_metadata/libmp3lame0.ver.iphoneos-arm create mode 100644 data/libapt/_metadata/dpkg.ver delete mode 100644 data/libapt/_metadata/dpkg.ver.iphoneos-arm create mode 120000 data/libmp3lame-dev/_metadata/libmp3lame0.ver delete mode 120000 data/libmp3lame-dev/_metadata/libmp3lame0.ver.iphoneos-arm create mode 120000 data/libogg-dev/_metadata/libogg0.ver delete mode 120000 data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm create mode 120000 data/libssl-dev/_metadata/libssl1.0.ver delete mode 120000 data/libssl-dev/_metadata/libssl1.0.ver.iphoneos-arm create mode 120000 data/libvorbis-dev/_metadata/libvorbis0.ver delete mode 120000 data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm create mode 120000 data/libvorbis-dev/_metadata/libvorbisenc2.ver delete mode 120000 data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm create mode 120000 data/libvorbis-dev/_metadata/libvorbisfile3.ver delete mode 120000 data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm create mode 120000 data/libx264-dev/_metadata/libx264-157.ver delete mode 120000 data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm create mode 100644 data/netatalk/_metadata/berkeleydb.ver delete mode 100644 data/netatalk/_metadata/berkeleydb.ver.iphoneos-arm create mode 120000 data/openssl/_metadata/libssl1.0.ver delete mode 120000 data/openssl/_metadata/libssl1.0.ver.iphoneos-arm create mode 100644 data/readline/_metadata/ncurses.ver create mode 120000 data/x264/_metadata/libx264-157.ver delete mode 120000 data/x264/_metadata/libx264-157.ver.iphoneos-arm diff --git a/control.sh b/control.sh index 37154da45..db0f65280 100755 --- a/control.sh +++ b/control.sh @@ -110,7 +110,7 @@ if [[ ! -e ${PKG_DATA}/_metadata/depends_ ]]; then echo -n " $(basename "${dep}" .dep)" - ver=${PKG_DATA}/_metadata/${dep%.dep}.ver.${PKG_ARCH} + ver=${PKG_DATA}/_metadata/${dep%.dep}.ver if [[ -e "${ver}" ]]; then echo -n " (>= $(cat "${ver}"))" fi diff --git a/data/apt7-key/_metadata/apt7-lib.ver b/data/apt7-key/_metadata/apt7-lib.ver new file mode 100644 index 000000000..138a91ba8 --- /dev/null +++ b/data/apt7-key/_metadata/apt7-lib.ver @@ -0,0 +1 @@ +0.7.25.3-7 diff --git a/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm b/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm deleted file mode 100644 index 138a91ba8..000000000 --- a/data/apt7-key/_metadata/apt7-lib.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -0.7.25.3-7 diff --git a/data/apt7-lib/_metadata/dpkg.ver b/data/apt7-lib/_metadata/dpkg.ver new file mode 100644 index 000000000..930ccbe2c --- /dev/null +++ b/data/apt7-lib/_metadata/dpkg.ver @@ -0,0 +1 @@ +1.14.25-9 diff --git a/data/apt7-lib/_metadata/dpkg.ver.iphoneos-arm b/data/apt7-lib/_metadata/dpkg.ver.iphoneos-arm deleted file mode 100644 index 930ccbe2c..000000000 --- a/data/apt7-lib/_metadata/dpkg.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -1.14.25-9 diff --git a/data/apt7/_metadata/apt7-lib.ver b/data/apt7/_metadata/apt7-lib.ver new file mode 100644 index 000000000..138a91ba8 --- /dev/null +++ b/data/apt7/_metadata/apt7-lib.ver @@ -0,0 +1 @@ +0.7.25.3-7 diff --git a/data/apt7/_metadata/apt7-lib.ver.iphoneos-arm b/data/apt7/_metadata/apt7-lib.ver.iphoneos-arm deleted file mode 100644 index 138a91ba8..000000000 --- a/data/apt7/_metadata/apt7-lib.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -0.7.25.3-7 diff --git a/data/coreutils/_metadata/coreutils-bin.ver b/data/coreutils/_metadata/coreutils-bin.ver new file mode 100644 index 000000000..1b5c9f81f --- /dev/null +++ b/data/coreutils/_metadata/coreutils-bin.ver @@ -0,0 +1 @@ +7.4-5 diff --git a/data/coreutils/_metadata/coreutils-bin.ver.iphoneos-arm b/data/coreutils/_metadata/coreutils-bin.ver.iphoneos-arm deleted file mode 100644 index 1b5c9f81f..000000000 --- a/data/coreutils/_metadata/coreutils-bin.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -7.4-5 diff --git a/data/dpkg/_metadata/coreutils-bin.ver b/data/dpkg/_metadata/coreutils-bin.ver new file mode 100644 index 000000000..72b9b4216 --- /dev/null +++ b/data/dpkg/_metadata/coreutils-bin.ver @@ -0,0 +1 @@ +8.31 diff --git a/data/dpkg/_metadata/ldid.ver b/data/dpkg/_metadata/ldid.ver new file mode 100644 index 000000000..22a7a7448 --- /dev/null +++ b/data/dpkg/_metadata/ldid.ver @@ -0,0 +1 @@ +2:2.1.1 diff --git a/data/fakeroot/_metadata/shell-cmds.ver b/data/fakeroot/_metadata/shell-cmds.ver new file mode 100644 index 000000000..cbda91a61 --- /dev/null +++ b/data/fakeroot/_metadata/shell-cmds.ver @@ -0,0 +1 @@ +118-8 diff --git a/data/fakeroot/_metadata/shell-cmds.ver.iphoneos-arm b/data/fakeroot/_metadata/shell-cmds.ver.iphoneos-arm deleted file mode 100644 index cbda91a61..000000000 --- a/data/fakeroot/_metadata/shell-cmds.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -118-8 diff --git a/data/git/_metadata/expat.ver b/data/git/_metadata/expat.ver new file mode 100644 index 000000000..8bbe6cf74 --- /dev/null +++ b/data/git/_metadata/expat.ver @@ -0,0 +1 @@ +2.2 diff --git a/data/git/_metadata/expat.ver.iphoneos-arm b/data/git/_metadata/expat.ver.iphoneos-arm deleted file mode 100644 index 8bbe6cf74..000000000 --- a/data/git/_metadata/expat.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -2.2 diff --git a/data/gnupg2/_metadata/gnupg.ver b/data/gnupg2/_metadata/gnupg.ver new file mode 100644 index 000000000..cd5ac039d --- /dev/null +++ b/data/gnupg2/_metadata/gnupg.ver @@ -0,0 +1 @@ +2.0 diff --git a/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm b/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm deleted file mode 100644 index cd5ac039d..000000000 --- a/data/gnupg2/_metadata/gnupg.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -2.0 diff --git a/data/htop/_metadata/ncurses.ver b/data/htop/_metadata/ncurses.ver new file mode 100644 index 000000000..e0ea36fee --- /dev/null +++ b/data/htop/_metadata/ncurses.ver @@ -0,0 +1 @@ +6.0 diff --git a/data/htop/_metadata/ncurses.ver.iphoneos-arm b/data/htop/_metadata/ncurses.ver.iphoneos-arm deleted file mode 100644 index e0ea36fee..000000000 --- a/data/htop/_metadata/ncurses.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -6.0 diff --git a/data/lame/_metadata/libmp3lame0.ver b/data/lame/_metadata/libmp3lame0.ver new file mode 120000 index 000000000..5ba0ce5f0 --- /dev/null +++ b/data/lame/_metadata/libmp3lame0.ver @@ -0,0 +1 @@ +../../libmp3lame0/_metadata/version \ No newline at end of file diff --git a/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm b/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm deleted file mode 120000 index 5ba0ce5f0..000000000 --- a/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libmp3lame0/_metadata/version \ No newline at end of file diff --git a/data/libapt/_metadata/dpkg.ver b/data/libapt/_metadata/dpkg.ver new file mode 100644 index 000000000..930ccbe2c --- /dev/null +++ b/data/libapt/_metadata/dpkg.ver @@ -0,0 +1 @@ +1.14.25-9 diff --git a/data/libapt/_metadata/dpkg.ver.iphoneos-arm b/data/libapt/_metadata/dpkg.ver.iphoneos-arm deleted file mode 100644 index 930ccbe2c..000000000 --- a/data/libapt/_metadata/dpkg.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -1.14.25-9 diff --git a/data/libmp3lame-dev/_metadata/libmp3lame0.ver b/data/libmp3lame-dev/_metadata/libmp3lame0.ver new file mode 120000 index 000000000..5ba0ce5f0 --- /dev/null +++ b/data/libmp3lame-dev/_metadata/libmp3lame0.ver @@ -0,0 +1 @@ +../../libmp3lame0/_metadata/version \ No newline at end of file diff --git a/data/libmp3lame-dev/_metadata/libmp3lame0.ver.iphoneos-arm b/data/libmp3lame-dev/_metadata/libmp3lame0.ver.iphoneos-arm deleted file mode 120000 index 5ba0ce5f0..000000000 --- a/data/libmp3lame-dev/_metadata/libmp3lame0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libmp3lame0/_metadata/version \ No newline at end of file diff --git a/data/libogg-dev/_metadata/libogg0.ver b/data/libogg-dev/_metadata/libogg0.ver new file mode 120000 index 000000000..b2e9951af --- /dev/null +++ b/data/libogg-dev/_metadata/libogg0.ver @@ -0,0 +1 @@ +../../libogg0/_metadata/version \ No newline at end of file diff --git a/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm b/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm deleted file mode 120000 index b2e9951af..000000000 --- a/data/libogg-dev/_metadata/libogg0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libogg0/_metadata/version \ No newline at end of file diff --git a/data/libssl-dev/_metadata/libssl1.0.ver b/data/libssl-dev/_metadata/libssl1.0.ver new file mode 120000 index 000000000..827dd0dfb --- /dev/null +++ b/data/libssl-dev/_metadata/libssl1.0.ver @@ -0,0 +1 @@ +../../libssl1.0/_metadata/version \ No newline at end of file diff --git a/data/libssl-dev/_metadata/libssl1.0.ver.iphoneos-arm b/data/libssl-dev/_metadata/libssl1.0.ver.iphoneos-arm deleted file mode 120000 index 827dd0dfb..000000000 --- a/data/libssl-dev/_metadata/libssl1.0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbis0.ver b/data/libvorbis-dev/_metadata/libvorbis0.ver new file mode 120000 index 000000000..ef0c53714 --- /dev/null +++ b/data/libvorbis-dev/_metadata/libvorbis0.ver @@ -0,0 +1 @@ +../../libvorbis0/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm deleted file mode 120000 index ef0c53714..000000000 --- a/data/libvorbis-dev/_metadata/libvorbis0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libvorbis0/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbisenc2.ver b/data/libvorbis-dev/_metadata/libvorbisenc2.ver new file mode 120000 index 000000000..29d0be352 --- /dev/null +++ b/data/libvorbis-dev/_metadata/libvorbisenc2.ver @@ -0,0 +1 @@ +../../libvorbisenc2/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm deleted file mode 120000 index 29d0be352..000000000 --- a/data/libvorbis-dev/_metadata/libvorbisenc2.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libvorbisenc2/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbisfile3.ver b/data/libvorbis-dev/_metadata/libvorbisfile3.ver new file mode 120000 index 000000000..3b1520dd0 --- /dev/null +++ b/data/libvorbis-dev/_metadata/libvorbisfile3.ver @@ -0,0 +1 @@ +../../libvorbisfile3/_metadata/version \ No newline at end of file diff --git a/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm b/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm deleted file mode 120000 index 3b1520dd0..000000000 --- a/data/libvorbis-dev/_metadata/libvorbisfile3.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libvorbisfile3/_metadata/version \ No newline at end of file diff --git a/data/libx264-dev/_metadata/libx264-157.ver b/data/libx264-dev/_metadata/libx264-157.ver new file mode 120000 index 000000000..a264216fa --- /dev/null +++ b/data/libx264-dev/_metadata/libx264-157.ver @@ -0,0 +1 @@ +../../libx264-157/_metadata/version \ No newline at end of file diff --git a/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm b/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm deleted file mode 120000 index a264216fa..000000000 --- a/data/libx264-dev/_metadata/libx264-157.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libx264-157/_metadata/version \ No newline at end of file diff --git a/data/netatalk/_metadata/berkeleydb.ver b/data/netatalk/_metadata/berkeleydb.ver new file mode 100644 index 000000000..220293e22 --- /dev/null +++ b/data/netatalk/_metadata/berkeleydb.ver @@ -0,0 +1 @@ +4.6.21-4 diff --git a/data/netatalk/_metadata/berkeleydb.ver.iphoneos-arm b/data/netatalk/_metadata/berkeleydb.ver.iphoneos-arm deleted file mode 100644 index 220293e22..000000000 --- a/data/netatalk/_metadata/berkeleydb.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -4.6.21-4 diff --git a/data/openssl/_metadata/libssl1.0.ver b/data/openssl/_metadata/libssl1.0.ver new file mode 120000 index 000000000..827dd0dfb --- /dev/null +++ b/data/openssl/_metadata/libssl1.0.ver @@ -0,0 +1 @@ +../../libssl1.0/_metadata/version \ No newline at end of file diff --git a/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm b/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm deleted file mode 120000 index 827dd0dfb..000000000 --- a/data/openssl/_metadata/libssl1.0.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0/_metadata/version \ No newline at end of file diff --git a/data/readline/_metadata/ncurses.ver b/data/readline/_metadata/ncurses.ver new file mode 100644 index 000000000..e0ea36fee --- /dev/null +++ b/data/readline/_metadata/ncurses.ver @@ -0,0 +1 @@ +6.0 diff --git a/data/x264/_metadata/libx264-157.ver b/data/x264/_metadata/libx264-157.ver new file mode 120000 index 000000000..a264216fa --- /dev/null +++ b/data/x264/_metadata/libx264-157.ver @@ -0,0 +1 @@ +../../libx264-157/_metadata/version \ No newline at end of file diff --git a/data/x264/_metadata/libx264-157.ver.iphoneos-arm b/data/x264/_metadata/libx264-157.ver.iphoneos-arm deleted file mode 120000 index a264216fa..000000000 --- a/data/x264/_metadata/libx264-157.ver.iphoneos-arm +++ /dev/null @@ -1 +0,0 @@ -../../libx264-157/_metadata/version \ No newline at end of file -- cgit v1.2.3