[arch-commits] Commit in os-prober/repos (8 files)
Timothy Redaelli
tredaelli at archlinux.org
Tue Nov 4 16:10:24 UTC 2014
Date: Tuesday, November 4, 2014 @ 17:10:24
Author: tredaelli
Revision: 121839
archrelease: copy trunk to community-i686, community-x86_64
Added:
os-prober/repos/community-i686/PKGBUILD
(from rev 121838, os-prober/trunk/PKGBUILD)
os-prober/repos/community-i686/os-prober-util-linux-2.24.patch
(from rev 121838, os-prober/trunk/os-prober-util-linux-2.24.patch)
os-prober/repos/community-x86_64/PKGBUILD
(from rev 121838, os-prober/trunk/PKGBUILD)
os-prober/repos/community-x86_64/os-prober-util-linux-2.24.patch
(from rev 121838, os-prober/trunk/os-prober-util-linux-2.24.patch)
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 | 108 +++++++++++++++++++
/os-prober-util-linux-2.24.patch | 116 +++++++++++++++++++++
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 ----------
6 files changed, 224 insertions(+), 224 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-11-04 16:10:13 UTC (rev 121838)
+++ community-i686/PKGBUILD 2014-11-04 16:10:24 UTC (rev 121839)
@@ -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.58
-pkgrel=3
-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.gz
- os-prober-util-linux-2.24.patch)
-md5sums=('11406f47d9536bccb655456d6d92d111'
- 'ce6218a8a0f791b617a79d29d097d7d8')
-sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93'
- '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- 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-$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
-}
Copied: os-prober/repos/community-i686/PKGBUILD (from rev 121838, os-prober/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-11-04 16:10:24 UTC (rev 121839)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: darkcoder <mario_vazq at hotmail.com>
+
+pkgname=os-prober
+pkgver=1.64
+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=('b13047131d2b1a924ed97dd0fa0885a7'
+ 'ce6218a8a0f791b617a79d29d097d7d8')
+sha256sums=('b0c14b530dd83856d17736e3758700f7e89fbf0ff6f6c20104b3b4ae1d8579df'
+ '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
+}
Deleted: community-i686/os-prober-util-linux-2.24.patch
===================================================================
--- community-i686/os-prober-util-linux-2.24.patch 2014-11-04 16:10:13 UTC (rev 121838)
+++ community-i686/os-prober-util-linux-2.24.patch 2014-11-04 16:10:24 UTC (rev 121839)
@@ -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"
Copied: os-prober/repos/community-i686/os-prober-util-linux-2.24.patch (from rev 121838, os-prober/trunk/os-prober-util-linux-2.24.patch)
===================================================================
--- community-i686/os-prober-util-linux-2.24.patch (rev 0)
+++ community-i686/os-prober-util-linux-2.24.patch 2014-11-04 16:10:24 UTC (rev 121839)
@@ -0,0 +1,58 @@
+--- 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 2014-11-04 16:10:13 UTC (rev 121838)
+++ community-x86_64/PKGBUILD 2014-11-04 16:10:24 UTC (rev 121839)
@@ -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.58
-pkgrel=3
-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.gz
- os-prober-util-linux-2.24.patch)
-md5sums=('11406f47d9536bccb655456d6d92d111'
- 'ce6218a8a0f791b617a79d29d097d7d8')
-sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93'
- '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- 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-$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
-}
Copied: os-prober/repos/community-x86_64/PKGBUILD (from rev 121838, os-prober/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-11-04 16:10:24 UTC (rev 121839)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: darkcoder <mario_vazq at hotmail.com>
+
+pkgname=os-prober
+pkgver=1.64
+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=('b13047131d2b1a924ed97dd0fa0885a7'
+ 'ce6218a8a0f791b617a79d29d097d7d8')
+sha256sums=('b0c14b530dd83856d17736e3758700f7e89fbf0ff6f6c20104b3b4ae1d8579df'
+ '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
+}
Deleted: community-x86_64/os-prober-util-linux-2.24.patch
===================================================================
--- community-x86_64/os-prober-util-linux-2.24.patch 2014-11-04 16:10:13 UTC (rev 121838)
+++ community-x86_64/os-prober-util-linux-2.24.patch 2014-11-04 16:10:24 UTC (rev 121839)
@@ -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"
Copied: os-prober/repos/community-x86_64/os-prober-util-linux-2.24.patch (from rev 121838, os-prober/trunk/os-prober-util-linux-2.24.patch)
===================================================================
--- community-x86_64/os-prober-util-linux-2.24.patch (rev 0)
+++ community-x86_64/os-prober-util-linux-2.24.patch 2014-11-04 16:10:24 UTC (rev 121839)
@@ -0,0 +1,58 @@
+--- 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