| 1 |
vapier 14/05/30 14:41:46 |
| 2 |
|
| 3 |
Modified: hwids-99999999.ebuild hwids-20140509.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Simplify the ROOT check in pkg_postinst. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.24 sys-apps/hwids/hwids-99999999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.24&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?rev=1.24&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild?r1=1.23&r2=1.24 |
| 16 |
|
| 17 |
Index: hwids-99999999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v |
| 20 |
retrieving revision 1.23 |
| 21 |
retrieving revision 1.24 |
| 22 |
diff -u -r1.23 -r1.24 |
| 23 |
--- hwids-99999999.ebuild 11 Aug 2013 18:59:22 -0000 1.23 |
| 24 |
+++ hwids-99999999.ebuild 30 May 2014 14:41:46 -0000 1.24 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.23 2013/08/11 18:59:22 ssuominen Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-99999999.ebuild,v 1.24 2014/05/30 14:41:46 vapier Exp $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
inherit udev eutils git-2 |
| 34 |
@@ -44,9 +44,6 @@ |
| 35 |
if use udev; then |
| 36 |
udevadm hwdb --update --root="${ROOT%/}" |
| 37 |
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda |
| 38 |
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then |
| 39 |
- return 0 |
| 40 |
- fi |
| 41 |
- udevadm control --reload |
| 42 |
+ [ "${ROOT:-/}" = "/" ] && udevadm control --reload |
| 43 |
fi |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.2 sys-apps/hwids/hwids-20140509.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild?rev=1.2&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild?rev=1.2&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild?r1=1.1&r2=1.2 |
| 53 |
|
| 54 |
Index: hwids-20140509.ebuild |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild,v |
| 57 |
retrieving revision 1.1 |
| 58 |
retrieving revision 1.2 |
| 59 |
diff -u -r1.1 -r1.2 |
| 60 |
--- hwids-20140509.ebuild 9 May 2014 10:16:47 -0000 1.1 |
| 61 |
+++ hwids-20140509.ebuild 30 May 2014 14:41:46 -0000 1.2 |
| 62 |
@@ -1,6 +1,6 @@ |
| 63 |
# Copyright 1999-2014 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild,v 1.1 2014/05/09 10:16:47 flameeyes Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20140509.ebuild,v 1.2 2014/05/30 14:41:46 vapier Exp $ |
| 67 |
|
| 68 |
EAPI=5 |
| 69 |
inherit udev eutils |
| 70 |
@@ -43,9 +43,6 @@ |
| 71 |
if use udev; then |
| 72 |
udevadm hwdb --update --root="${ROOT%/}" |
| 73 |
# http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda |
| 74 |
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then |
| 75 |
- return 0 |
| 76 |
- fi |
| 77 |
- udevadm control --reload |
| 78 |
+ [ "${ROOT:-/}" = "/" ] && udevadm control --reload |
| 79 |
fi |
| 80 |
} |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.142 sys-apps/hwids/ChangeLog |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.142&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?rev=1.142&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hwids/ChangeLog?r1=1.141&r2=1.142 |
| 89 |
|
| 90 |
Index: ChangeLog |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v |
| 93 |
retrieving revision 1.141 |
| 94 |
retrieving revision 1.142 |
| 95 |
diff -u -r1.141 -r1.142 |
| 96 |
--- ChangeLog 30 May 2014 14:38:10 -0000 1.141 |
| 97 |
+++ ChangeLog 30 May 2014 14:41:46 -0000 1.142 |
| 98 |
@@ -1,6 +1,10 @@ |
| 99 |
# ChangeLog for sys-apps/hwids |
| 100 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.141 2014/05/30 14:38:10 vapier Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.142 2014/05/30 14:41:46 vapier Exp $ |
| 103 |
+ |
| 104 |
+ 30 May 2014; Mike Frysinger <vapier@g.o> hwids-20140509.ebuild, |
| 105 |
+ hwids-99999999.ebuild: |
| 106 |
+ Simplify the ROOT check in pkg_postinst. |
| 107 |
|
| 108 |
30 May 2014; Mike Frysinger <vapier@g.o> hwids-20140317.ebuild: |
| 109 |
Stabilize for everyone else #506026. |
Archives