summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2008-10-05 17:43:23 +0000
committerThilo Bangert <bangert@gentoo.org>2008-10-05 17:43:23 +0000
commit1743d1f98ee440200141a832c17a3cdec34373fb (patch)
tree97c98722e7a44bbe63c4ba7d61e258603154447d
parentVersion bump (diff)
downloadhistorical-1743d1f98ee440200141a832c17a3cdec34373fb.tar.gz
historical-1743d1f98ee440200141a832c17a3cdec34373fb.tar.bz2
historical-1743d1f98ee440200141a832c17a3cdec34373fb.zip
fix install of symlinks - bug# 219947 - thanks Enrico Weigelt
Package-Manager: portage-2.1.4.4
-rw-r--r--app-emulation/domi/ChangeLog6
-rw-r--r--app-emulation/domi/Manifest5
-rw-r--r--app-emulation/domi/domi-20060816.ebuild4
-rw-r--r--app-emulation/domi/files/fix_install_links.patch15
4 files changed, 26 insertions, 4 deletions
diff --git a/app-emulation/domi/ChangeLog b/app-emulation/domi/ChangeLog
index 60af24b780a5..cc0e3b5b3d5c 100644
--- a/app-emulation/domi/ChangeLog
+++ b/app-emulation/domi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/domi
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/domi/ChangeLog,v 1.10 2008/10/01 18:47:54 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/domi/ChangeLog,v 1.11 2008/10/05 17:43:22 bangert Exp $
+
+ 05 Oct 2008; Thilo Bangert <bangert@gentoo.org>
+ +files/fix_install_links.patch, domi-20060816.ebuild:
+ fix install of symlinks - bug# 219947
*domi-20060816 (01 Oct 2008)
diff --git a/app-emulation/domi/Manifest b/app-emulation/domi/Manifest
index d6d5c1b3da2d..ee10325ef952 100644
--- a/app-emulation/domi/Manifest
+++ b/app-emulation/domi/Manifest
@@ -1,7 +1,8 @@
AUX domi.conf 2863 RMD160 b10527bd88de1861a9ab3bce1b8ffe4b0644b87a SHA1 3d3586080911b7334a63dadb7777fe87f6b65f15 SHA256 d218140555df30b29bcfa305f7d4740b7457092a653e9cd17caf15d1658e2795
+AUX fix_install_links.patch 612 RMD160 e46a6a363b4a753651702bcfa29e2315f4a2c4d3 SHA1 22948d08e1aeb2755f0f9b7a743b14a877867a23 SHA256 80c3a576ca21fd5d37d9c107065ca6dc1454dd251594ab2f645a9c6a1c5a6bb4
DIST domi-20060630-145440.tar.gz 15464 RMD160 22a9525a4fb27e8d0a3d281f1acdc828490c99f0 SHA1 b584d6e2136e68e58d204bd88ee1421caeef9b0b SHA256 afcd220f35aad039b83d72621a7ec7709c64b713f2fc9d0f6fdcb802948f1ec8
DIST domi-20060816-153213.tar.gz 15503 RMD160 e6c92f621125c61a2f2444a8aced7d473ff36e99 SHA1 6341b9ebbc62c35b7af751a8b3c978a19a1a4161 SHA256 2eba3bbd36738764a1443544388472dbc603db81974b74402954d2693d231c78
EBUILD domi-20060630.ebuild 946 RMD160 d9967208dfcaa3811199495ed1e2ccf1017b5c3f SHA1 f5137e74f68d1711efbdd379e3dbcd811dcf3823 SHA256 61f98f4601b3da13de2570b1b51857d51cb515dedcdf3462ffc08919141f28df
-EBUILD domi-20060816.ebuild 953 RMD160 ee692de3e64343c1bf0cf865ddbb3ec18fd90dda SHA1 2351a92f01f9cead3ad07be32954ef8b59f199a0 SHA256 ff42a13bff9b4d20d8e56a99c2348dfb9944513a963840dfc592bb4463ce0894
-MISC ChangeLog 1722 RMD160 9b91974ce2d5bb19786e9e4244fdba324e183ba8 SHA1 96ded8804ea6c34a61a0c5e8abe68f44929cd836 SHA256 d1591c14a6756b60e90ccd2c57059530aabee98d25a8af5ef3b2856772d5934c
+EBUILD domi-20060816.ebuild 1010 RMD160 162631d7b79c8b1432c20c3135a4ef138e3d5ed5 SHA1 c9c4f75362d5a67b56db0827dddb48de5201f8f8 SHA256 f1cf8af75e085fc340ea8858b483e32c675d627746554c0bdc2357288362b77d
+MISC ChangeLog 1869 RMD160 d03f7f425c5b26d61fa81f1f1b32a8fe29ac3aa8 SHA1 9a09e0ec56e286ee4731be1b082ae9358616f404 SHA256 db2db00b05e9477fe9d305316f037e0e5fc465aa54f6ec61ea44a7c28a7da3f1
MISC metadata.xml 315 RMD160 6db40628efc1f34ca82924a66f4f1472d3b9cae8 SHA1 a539f1d1977aff40b8996581a3f4d6d30ba5ae8e SHA256 6de5aac6162e04d9aded8cfd1d8012738e43f4d38ad3c3f048324265413ce7f6
diff --git a/app-emulation/domi/domi-20060816.ebuild b/app-emulation/domi/domi-20060816.ebuild
index 4a92de576821..e49da73a36c0 100644
--- a/app-emulation/domi/domi-20060816.ebuild
+++ b/app-emulation/domi/domi-20060816.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/domi/domi-20060816.ebuild,v 1.1 2008/10/01 18:47:54 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/domi/domi-20060816.ebuild,v 1.2 2008/10/05 17:43:22 bangert Exp $
inherit eutils
DESCRIPTION="Scripts for building Xen domains"
@@ -27,6 +27,8 @@ S=${WORKDIR}/${PN}
src_unpack() {
unpack ${A}
sed -i -e 's:/dev/loop\$:/dev/loop/\$:' "${S}"/domi
+ cd "${S}"
+ epatch "${FILESDIR}"/fix_install_links.patch
}
src_install() {
diff --git a/app-emulation/domi/files/fix_install_links.patch b/app-emulation/domi/files/fix_install_links.patch
new file mode 100644
index 000000000000..29a7eb7ca299
--- /dev/null
+++ b/app-emulation/domi/files/fix_install_links.patch
@@ -0,0 +1,15 @@
+--- Makefile.orig 2008-10-05 18:59:51.000000000 +0200
++++ Makefile 2008-10-05 19:37:58.000000000 +0200
+@@ -23,9 +23,9 @@
+ install -d $(DESTDIR)$(mandir)/man8
+ install -m755 $(scripts) $(DESTDIR)$(libdir)
+ install -m644 domi.man $(DESTDIR)$(mandir)/man8/domi.8
+- ln -s $(libdir)/domi $(DESTDIR)$(bindir)/domi
+- ln -s $(libdir)/ttylinux $(DESTDIR)$(bindir)/ttylinux
+- ln -s $(libdir)/initramfs $(DESTDIR)$(bindir)/busybox.initramfs
++ ln -s ../share/domi/domi $(bindir)/domi
++ ln -s ../share/domi/ttylinux $(bindir)/ttylinux
++ ln -s ../share/domi/initramfs $(bindir)/busybox.initramfs
+
+ test:
+ su -c tests/Run