[arch-commits] Commit in os-prober/repos (6 files)
Timothy Redaelli
tredaelli at archlinux.org
Mon Nov 2 16:20:16 UTC 2015
Date: Monday, November 2, 2015 @ 17:20:16
Author: tredaelli
Revision: 145679
archrelease: copy trunk to community-i686, community-x86_64
Added:
os-prober/repos/community-i686/PKGBUILD
(from rev 145678, os-prober/trunk/PKGBUILD)
os-prober/repos/community-x86_64/PKGBUILD
(from rev 145678, os-prober/trunk/PKGBUILD)
Deleted:
os-prober/repos/community-i686/PKGBUILD
os-prober/repos/community-i686/os-prober-util-linux-2.24.patch
os-prober/repos/community-x86_64/PKGBUILD
os-prober/repos/community-x86_64/os-prober-util-linux-2.24.patch
--------------------------------------------------+
/PKGBUILD | 98 +++++++++++++++++++++
community-i686/PKGBUILD | 54 -----------
community-i686/os-prober-util-linux-2.24.patch | 58 ------------
community-x86_64/PKGBUILD | 54 -----------
community-x86_64/os-prober-util-linux-2.24.patch | 58 ------------
5 files changed, 98 insertions(+), 224 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-11-02 16:20:04 UTC (rev 145678)
+++ community-i686/PKGBUILD 2015-11-02 16:20:16 UTC (rev 145679)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: darkcoder <mario_vazq at hotmail.com>
-
-pkgname=os-prober
-pkgver=1.66
-pkgrel=1
-pkgdesc="Utility to detect other OSes on a set of drives"
-url="http://joey.kitenet.net/code/os-prober/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('sh')
-source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz
- os-prober-util-linux-2.24.patch)
-md5sums=('7ac4903d4aa114cd4709152f604dd0ea'
- 'ce6218a8a0f791b617a79d29d097d7d8')
-sha256sums=('ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057'
- '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
-
-prepare() {
- cd "$pkgname"
-
- patch -p1 -i "$srcdir"/os-prober-util-linux-2.24.patch
-
- # adjust lib dir to allow detection of 64-bit distros
- sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
-
- rm -f Makefile
-}
-
-build() {
- cd "$pkgname"
-
- make newns
-}
-
-package() {
- cd "$pkgname"
-
- install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
- install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober
- install -Dm755 newns "$pkgdir"/usr/lib/os-prober/newns
- install -Dm755 common.sh $pkgdir/usr/share/os-prober/common.sh
-
- for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
- install -dm755 "$pkgdir/usr/lib/$dir"
- install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/*
- [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir"
- done
-
- install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx
-
- install -dm755 "$pkgdir"/var/lib/os-prober
-}
Copied: os-prober/repos/community-i686/PKGBUILD (from rev 145678, os-prober/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-11-02 16:20:16 UTC (rev 145679)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: darkcoder <mario_vazq at hotmail.com>
+
+pkgname=os-prober
+pkgver=1.70
+pkgrel=1
+pkgdesc="Utility to detect other OSes on a set of drives"
+url="http://joey.kitenet.net/code/os-prober/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('sh')
+source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz)
+md5sums=('c1cfdd90dc958f12b932ccc8d64051e1')
+sha256sums=('f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # adjust lib dir to allow detection of 64-bit distros
+ sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
+
+ rm -f Makefile
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ make newns
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
+ install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober
+ install -Dm755 newns "$pkgdir"/usr/lib/os-prober/newns
+ install -Dm755 common.sh $pkgdir/usr/share/os-prober/common.sh
+
+ for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+ install -dm755 "$pkgdir/usr/lib/$dir"
+ install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/*
+ [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir"
+ done
+
+ install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx
+
+ install -dm755 "$pkgdir"/var/lib/os-prober
+}
Deleted: community-i686/os-prober-util-linux-2.24.patch
===================================================================
--- community-i686/os-prober-util-linux-2.24.patch 2015-11-02 16:20:04 UTC (rev 145678)
+++ community-i686/os-prober-util-linux-2.24.patch 2015-11-02 16:20:16 UTC (rev 145679)
@@ -1,58 +0,0 @@
---- a/common.sh
-+++ b/common.sh
-@@ -116,6 +116,29 @@ fs_type () {
- fi
- }
-
-+is_dos_extended_partition() {
-+ if type blkid >/dev/null 2>&1; then
-+ local output
-+
-+ output="$(blkid -o export $1)"
-+
-+ # old blkid (util-linux << 2.24) errors out on extended p.
-+ if [ "$?" = "2" ]; then
-+ return 0
-+ fi
-+
-+ # dos partition type and no filesystem type?...
-+ if echo $output | grep -q ' PTTYPE=dos ' &&
-+ ! echo $output | grep -q ' TYPE='; then
-+ return 0
-+ else
-+ return 1
-+ fi
-+ fi
-+
-+ return 1
-+}
-+
- parse_proc_mounts () {
- while read -r line; do
- set -f
---- a/linux-boot-probes/common/50mounted-tests
-+++ b/linux-boot-probes/common/50mounted-tests
-@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
- types='ntfs-3g ntfs'
- fi
- elif [ -z "$types" ]; then
-+ if is_dos_extended_partition "$partition"; then
-+ debug "$1 looks like an extended dos partition; skipping"
-+ exit 0
-+ fi
- if type cryptsetup >/dev/null 2>&1 && \
- cryptsetup luksDump "$partition" >/dev/null 2>&1; then
- debug "$1 is a LUKS partition; skipping"
---- a/os-probes/common/50mounted-tests
-+++ b/os-probes/common/50mounted-tests
-@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
- types='ntfs-3g ntfs'
- fi
- elif [ -z "$types" ]; then
-+ if is_dos_extended_partition "$partition"; then
-+ debug "$1 looks like an extended dos partition; skipping"
-+ exit 0
-+ fi
- if type cryptsetup >/dev/null 2>&1 && \
- cryptsetup luksDump "$partition" >/dev/null 2>&1; then
- debug "$1 is a LUKS partition; skipping"
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-11-02 16:20:04 UTC (rev 145678)
+++ community-x86_64/PKGBUILD 2015-11-02 16:20:16 UTC (rev 145679)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: darkcoder <mario_vazq at hotmail.com>
-
-pkgname=os-prober
-pkgver=1.66
-pkgrel=1
-pkgdesc="Utility to detect other OSes on a set of drives"
-url="http://joey.kitenet.net/code/os-prober/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('sh')
-source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz
- os-prober-util-linux-2.24.patch)
-md5sums=('7ac4903d4aa114cd4709152f604dd0ea'
- 'ce6218a8a0f791b617a79d29d097d7d8')
-sha256sums=('ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057'
- '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
-
-prepare() {
- cd "$pkgname"
-
- patch -p1 -i "$srcdir"/os-prober-util-linux-2.24.patch
-
- # adjust lib dir to allow detection of 64-bit distros
- sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
-
- rm -f Makefile
-}
-
-build() {
- cd "$pkgname"
-
- make newns
-}
-
-package() {
- cd "$pkgname"
-
- install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
- install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober
- install -Dm755 newns "$pkgdir"/usr/lib/os-prober/newns
- install -Dm755 common.sh $pkgdir/usr/share/os-prober/common.sh
-
- for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
- install -dm755 "$pkgdir/usr/lib/$dir"
- install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/*
- [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir"
- done
-
- install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx
-
- install -dm755 "$pkgdir"/var/lib/os-prober
-}
Copied: os-prober/repos/community-x86_64/PKGBUILD (from rev 145678, os-prober/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-11-02 16:20:16 UTC (rev 145679)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: darkcoder <mario_vazq at hotmail.com>
+
+pkgname=os-prober
+pkgver=1.70
+pkgrel=1
+pkgdesc="Utility to detect other OSes on a set of drives"
+url="http://joey.kitenet.net/code/os-prober/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('sh')
+source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz)
+md5sums=('c1cfdd90dc958f12b932ccc8d64051e1')
+sha256sums=('f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # adjust lib dir to allow detection of 64-bit distros
+ sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
+
+ rm -f Makefile
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ make newns
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
+ install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober
+ install -Dm755 newns "$pkgdir"/usr/lib/os-prober/newns
+ install -Dm755 common.sh $pkgdir/usr/share/os-prober/common.sh
+
+ for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+ install -dm755 "$pkgdir/usr/lib/$dir"
+ install -m755 -t "$pkgdir/usr/lib/$dir" "$dir"/common/*
+ [[ -d "$dir"/x86 ]] && cp -r "$dir"/x86/* "$pkgdir/usr/lib/$dir"
+ done
+
+ install -Dm755 os-probes/mounted/powerpc/20macosx "$pkgdir"/usr/lib/os-probes/mounted/20macosx
+
+ install -dm755 "$pkgdir"/var/lib/os-prober
+}
Deleted: community-x86_64/os-prober-util-linux-2.24.patch
===================================================================
--- community-x86_64/os-prober-util-linux-2.24.patch 2015-11-02 16:20:04 UTC (rev 145678)
+++ community-x86_64/os-prober-util-linux-2.24.patch 2015-11-02 16:20:16 UTC (rev 145679)
@@ -1,58 +0,0 @@
---- a/common.sh
-+++ b/common.sh
-@@ -116,6 +116,29 @@ fs_type () {
- fi
- }
-
-+is_dos_extended_partition() {
-+ if type blkid >/dev/null 2>&1; then
-+ local output
-+
-+ output="$(blkid -o export $1)"
-+
-+ # old blkid (util-linux << 2.24) errors out on extended p.
-+ if [ "$?" = "2" ]; then
-+ return 0
-+ fi
-+
-+ # dos partition type and no filesystem type?...
-+ if echo $output | grep -q ' PTTYPE=dos ' &&
-+ ! echo $output | grep -q ' TYPE='; then
-+ return 0
-+ else
-+ return 1
-+ fi
-+ fi
-+
-+ return 1
-+}
-+
- parse_proc_mounts () {
- while read -r line; do
- set -f
---- a/linux-boot-probes/common/50mounted-tests
-+++ b/linux-boot-probes/common/50mounted-tests
-@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
- types='ntfs-3g ntfs'
- fi
- elif [ -z "$types" ]; then
-+ if is_dos_extended_partition "$partition"; then
-+ debug "$1 looks like an extended dos partition; skipping"
-+ exit 0
-+ fi
- if type cryptsetup >/dev/null 2>&1 && \
- cryptsetup luksDump "$partition" >/dev/null 2>&1; then
- debug "$1 is a LUKS partition; skipping"
---- a/os-probes/common/50mounted-tests
-+++ b/os-probes/common/50mounted-tests
-@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
- types='ntfs-3g ntfs'
- fi
- elif [ -z "$types" ]; then
-+ if is_dos_extended_partition "$partition"; then
-+ debug "$1 looks like an extended dos partition; skipping"
-+ exit 0
-+ fi
- if type cryptsetup >/dev/null 2>&1 && \
- cryptsetup luksDump "$partition" >/dev/null 2>&1; then
- debug "$1 is a LUKS partition; skipping"
More information about the arch-commits
mailing list