* [gentoo-commits] gentoo-x86 commit in eclass: check-reqs.eclass ChangeLog
@ 2012-10-19 2:44 Patrick Lauer (patrick)
0 siblings, 0 replies; 4+ messages in thread
From: Patrick Lauer (patrick) @ 2012-10-19 2:44 UTC (permalink / raw
To: gentoo-commits
patrick 12/10/19 02:44:21
Modified: check-reqs.eclass ChangeLog
Log:
Fixing binpkg behaviour
Revision Changes Path
1.12 eclass/check-reqs.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.11&r2=1.12
Index: check-reqs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- check-reqs.eclass 27 Sep 2012 16:35:41 -0000 1.11
+++ check-reqs.eclass 19 Oct 2012 02:44:21 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.11 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.12 2012/10/19 02:44:21 patrick Exp $
# @ECLASS: check-reqs.eclass
# @MAINTAINER:
@@ -91,6 +91,8 @@
check-reqs_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
+ [[ ${MERGE_TYPE} == binary ]] && return
+
check-reqs_prepare
check-reqs_run
check-reqs_output
1.452 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.452&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.452&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.451&r2=1.452
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -r1.451 -r1.452
--- ChangeLog 17 Oct 2012 14:09:10 -0000 1.451
+++ ChangeLog 19 Oct 2012 02:44:21 -0000 1.452
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.451 2012/10/17 14:09:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.452 2012/10/19 02:44:21 patrick Exp $
+
+ 19 Oct 2012; Patrick Lauer <patrick@gentoo.org> check-reqs.eclass:
+ Fixing binpkg behaviour
17 Oct 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Respect AR and RANLIB, wrt bug #436070.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: check-reqs.eclass ChangeLog
@ 2012-10-19 3:35 Patrick Lauer (patrick)
0 siblings, 0 replies; 4+ messages in thread
From: Patrick Lauer (patrick) @ 2012-10-19 3:35 UTC (permalink / raw
To: gentoo-commits
patrick 12/10/19 03:35:15
Modified: check-reqs.eclass ChangeLog
Log:
Fixing units
Revision Changes Path
1.13 eclass/check-reqs.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.12&r2=1.13
Index: check-reqs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- check-reqs.eclass 19 Oct 2012 02:44:21 -0000 1.12
+++ check-reqs.eclass 19 Oct 2012 03:35:15 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.12 2012/10/19 02:44:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.13 2012/10/19 03:35:15 patrick Exp $
# @ECLASS: check-reqs.eclass
# @MAINTAINER:
@@ -190,7 +190,7 @@
# Backcompat.
if [[ ${size} == ${1} ]]; then
ewarn "QA: Package does not specify unit for the size check"
- ewarn "QA: Assuming mebibytes."
+ ewarn "QA: Assuming megabytes."
ewarn "QA: File bug against the package. It should specify the unit."
fi
@@ -209,9 +209,9 @@
local unit=${1:(-1)}
case ${unit} in
- G) echo "gibibytes" ;;
- [M0-9]) echo "mebibytes" ;;
- T) echo "tebibytes" ;;
+ G) echo "gigabytes" ;;
+ [M0-9]) echo "megabytes" ;;
+ T) echo "terabytes" ;;
*)
die "${FUNCNAME}: Unknown unit: ${unit}"
;;
1.453 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.453&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.453&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.452&r2=1.453
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- ChangeLog 19 Oct 2012 02:44:21 -0000 1.452
+++ ChangeLog 19 Oct 2012 03:35:15 -0000 1.453
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.452 2012/10/19 02:44:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.453 2012/10/19 03:35:15 patrick Exp $
+
+ 19 Oct 2012; Patrick Lauer <patrick@gentoo.org> check-reqs.eclass:
+ Fixing units
19 Oct 2012; Patrick Lauer <patrick@gentoo.org> check-reqs.eclass:
Fixing binpkg behaviour
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: check-reqs.eclass ChangeLog
@ 2014-03-28 15:08 Ulrich Mueller (ulm)
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-03-28 15:08 UTC (permalink / raw
To: gentoo-commits
ulm 14/03/28 15:08:16
Modified: check-reqs.eclass ChangeLog
Log:
Output binary prefixes for units according to IEC 80000-13, as calculations are 1024 based. Fix documentation of check-reqs_get_unit function, and other minor fixes.
Revision Changes Path
1.14 eclass/check-reqs.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.13&r2=1.14
Index: check-reqs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- check-reqs.eclass 19 Oct 2012 03:35:15 -0000 1.13
+++ check-reqs.eclass 28 Mar 2014 15:08:16 -0000 1.14
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.13 2012/10/19 03:35:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.14 2014/03/28 15:08:16 ulm Exp $
# @ECLASS: check-reqs.eclass
# @MAINTAINER:
@@ -155,7 +155,7 @@
# @FUNCTION: check-reqs_get_mebibytes
# @DESCRIPTION:
# Internal function that returns number in mebibytes.
-# Converts from 1G=1024 or 1T=1048576
+# Returns 1024 for 1G or 1048576 for 1T.
check-reqs_get_mebibytes() {
debug-print-function ${FUNCNAME} "$@"
@@ -176,8 +176,8 @@
# @FUNCTION: check-reqs_get_number
# @DESCRIPTION:
-# Internal function that returns number without the unit.
-# Converts from 1G=1 or 150T=150.
+# Internal function that returns the numerical value without the unit.
+# Returns "1" for "1G" or "150" for "150T".
check-reqs_get_number() {
debug-print-function ${FUNCNAME} "$@"
@@ -190,7 +190,7 @@
# Backcompat.
if [[ ${size} == ${1} ]]; then
ewarn "QA: Package does not specify unit for the size check"
- ewarn "QA: Assuming megabytes."
+ ewarn "QA: Assuming mebibytes."
ewarn "QA: File bug against the package. It should specify the unit."
fi
@@ -199,8 +199,8 @@
# @FUNCTION: check-reqs_get_unit
# @DESCRIPTION:
-# Internal function that returns number without the unit.
-# Converts from 1G=1 or 150T=150.
+# Internal function that return the unit without the numerical value.
+# Returns "GiB" for "1G" or "TiB" for "150T".
check-reqs_get_unit() {
debug-print-function ${FUNCNAME} "$@"
@@ -209,9 +209,9 @@
local unit=${1:(-1)}
case ${unit} in
- G) echo "gigabytes" ;;
- [M0-9]) echo "megabytes" ;;
- T) echo "terabytes" ;;
+ G) echo "GiB" ;;
+ [M0-9]) echo "MiB" ;;
+ T) echo "TiB" ;;
*)
die "${FUNCNAME}: Unknown unit: ${unit}"
;;
1.1185 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1185&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1185&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1184&r2=1.1185
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1184
retrieving revision 1.1185
diff -u -r1.1184 -r1.1185
--- ChangeLog 26 Mar 2014 13:12:39 -0000 1.1184
+++ ChangeLog 28 Mar 2014 15:08:16 -0000 1.1185
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1184 2014/03/26 13:12:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1185 2014/03/28 15:08:16 ulm Exp $
+
+ 28 Mar 2014; Ulrich Müller <ulm@gentoo.org> check-reqs.eclass:
+ Output binary prefixes for units according to IEC 80000-13, as calculations
+ are 1024 based. Fix documentation of check-reqs_get_unit function, and other
+ minor fixes.
26 Mar 2014; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass:
Fix typo in prefix block by Christoph Junghans <ottxor@gentoo.org>.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: check-reqs.eclass ChangeLog
@ 2014-03-29 16:06 Ulrich Mueller (ulm)
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-03-29 16:06 UTC (permalink / raw
To: gentoo-commits
ulm 14/03/29 16:06:44
Modified: check-reqs.eclass ChangeLog
Log:
Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run().
Revision Changes Path
1.15 eclass/check-reqs.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/check-reqs.eclass?r1=1.14&r2=1.15
Index: check-reqs.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- check-reqs.eclass 28 Mar 2014 15:08:16 -0000 1.14
+++ check-reqs.eclass 29 Mar 2014 16:06:44 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.14 2014/03/28 15:08:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.15 2014/03/29 16:06:44 ulm Exp $
# @ECLASS: check-reqs.eclass
# @MAINTAINER:
@@ -91,8 +91,6 @@
check-reqs_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
- [[ ${MERGE_TYPE} == binary ]] && return
-
check-reqs_prepare
check-reqs_run
check-reqs_output
@@ -132,24 +130,29 @@
# some people are *censored*
unset CHECKREQS_FAILED
- [[ -n ${CHECKREQS_MEMORY} ]] && \
- check-reqs_memory \
- ${CHECKREQS_MEMORY}
-
- [[ -n ${CHECKREQS_DISK_BUILD} ]] && \
- check-reqs_disk \
- "${T}" \
- "${CHECKREQS_DISK_BUILD}"
-
- [[ -n ${CHECKREQS_DISK_USR} ]] && \
- check-reqs_disk \
- "${EROOT}/usr" \
- "${CHECKREQS_DISK_USR}"
-
- [[ -n ${CHECKREQS_DISK_VAR} ]] && \
- check-reqs_disk \
- "${EROOT}/var" \
- "${CHECKREQS_DISK_VAR}"
+ # use != in test, because MERGE_TYPE only exists in EAPI 4 and later
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ -n ${CHECKREQS_MEMORY} ]] && \
+ check-reqs_memory \
+ ${CHECKREQS_MEMORY}
+
+ [[ -n ${CHECKREQS_DISK_BUILD} ]] && \
+ check-reqs_disk \
+ "${T}" \
+ "${CHECKREQS_DISK_BUILD}"
+ fi
+
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ [[ -n ${CHECKREQS_DISK_USR} ]] && \
+ check-reqs_disk \
+ "${EROOT}/usr" \
+ "${CHECKREQS_DISK_USR}"
+
+ [[ -n ${CHECKREQS_DISK_VAR} ]] && \
+ check-reqs_disk \
+ "${EROOT}/var" \
+ "${CHECKREQS_DISK_VAR}"
+ fi
}
# @FUNCTION: check-reqs_get_mebibytes
@@ -350,4 +353,3 @@
# Internal, do not set yourself.
CHECKREQS_FAILED="true"
}
-
1.1186 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1186&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1185&r2=1.1186
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -r1.1185 -r1.1186
--- ChangeLog 28 Mar 2014 15:08:16 -0000 1.1185
+++ ChangeLog 29 Mar 2014 16:06:44 -0000 1.1186
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1185 2014/03/28 15:08:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1186 2014/03/29 16:06:44 ulm Exp $
+
+ 29 Mar 2014; Ulrich Müller <ulm@gentoo.org> check-reqs.eclass:
+ Move test for MERGE_TYPE from check-reqs_pkg_setup() to check-reqs_run().
28 Mar 2014; Ulrich Müller <ulm@gentoo.org> check-reqs.eclass:
Output binary prefixes for units according to IEC 80000-13, as calculations
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-29 16:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-19 2:44 [gentoo-commits] gentoo-x86 commit in eclass: check-reqs.eclass ChangeLog Patrick Lauer (patrick)
-- strict thread matches above, loose matches on Subject: below --
2012-10-19 3:35 Patrick Lauer (patrick)
2014-03-28 15:08 Ulrich Mueller (ulm)
2014-03-29 16:06 Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox