* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-01-18 15:00 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-18 15:00 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/18 15:00:31
Modified: intel-sdp.eclass ChangeLog
Log:
No EPREFIX with helper functions
Revision Changes Path
1.6 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.5&r2=1.6
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- intel-sdp.eclass 5 Dec 2012 19:41:21 -0000 1.5
+++ intel-sdp.eclass 18 Jan 2013 15:00:31 -0000 1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.5 2012/12/05 19:41:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.6 2013/01/18 15:00:31 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -390,8 +390,8 @@
[[ -d "${ED}" ]] || dodir /
mv opt "${ED}"/ || die "moving files failed"
- dodir "${INTEL_SDP_EDIR}"/licenses
- keepdir "${INTEL_SDP_EDIR}"/licenses
+ dodir "${INTEL_SDP_DIR}"/licenses
+ keepdir "${INTEL_SDP_DIR}"/licenses
}
# @FUNCTION: intel-sdp_pkg_postinst
1.626 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.626&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.626&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.625&r2=1.626
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- ChangeLog 16 Jan 2013 23:57:37 -0000 1.625
+++ ChangeLog 18 Jan 2013 15:00:31 -0000 1.626
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.625 2013/01/16 23:57:37 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.626 2013/01/18 15:00:31 jlec Exp $
+
+ 18 Jan 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ No EPREFIX with helper functions
16 Jan 2013; Jory A. Pratt <anarchy@gentoo.org> mozconfig-3.eclass:
Remove webrtc block as it is supported on all archs now.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-01-23 9:44 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-23 9:44 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/23 09:44:24
Modified: intel-sdp.eclass ChangeLog
Log:
Add support for license server, #447262
Revision Changes Path
1.7 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.6&r2=1.7
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- intel-sdp.eclass 18 Jan 2013 15:00:31 -0000 1.6
+++ intel-sdp.eclass 23 Jan 2013 09:44:24 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.6 2013/01/18 15:00:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.7 2013/01/23 09:44:24 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -260,6 +260,12 @@
: ${CHECKREQS_DISK_BUILD:=256M}
check-reqs_pkg_pretend
+ if [[ $(echo ${INTEL_LICENSE_FILE} | grep -q @) ]]; then
+ einfo "Looks like you are using following license server:"
+ einfo " ${INTEL_LICENSE_FILE}"
+ return 0
+ fi
+
dirs=(
"${INTEL_SDP_EDIR}/licenses"
"${INTEL_SDP_EDIR}/Licenses"
1.632 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.632&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.632&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.631&r2=1.632
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.631
retrieving revision 1.632
diff -u -r1.631 -r1.632
--- ChangeLog 21 Jan 2013 19:28:16 -0000 1.631
+++ ChangeLog 23 Jan 2013 09:44:24 -0000 1.632
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.631 2013/01/21 19:28:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.632 2013/01/23 09:44:24 jlec Exp $
+
+ 23 Jan 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Add support for license server, #447262
21 Jan 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass,
python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass:
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-01-23 11:14 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-23 11:14 UTC (permalink / raw
To: gentoo-commits
jlec 13/01/23 11:14:33
Modified: intel-sdp.eclass ChangeLog
Log:
Add dummy dir to avoid sandbox violations when emerging with FEATURES=-userpriv, #437512
Revision Changes Path
1.9 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.8&r2=1.9
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- intel-sdp.eclass 23 Jan 2013 09:49:30 -0000 1.8
+++ intel-sdp.eclass 23 Jan 2013 11:14:33 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.8 2013/01/23 09:49:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.9 2013/01/23 11:14:33 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -396,8 +396,8 @@
[[ -d "${ED}" ]] || dodir /
mv opt "${ED}"/ || die "moving files failed"
- dodir "${INTEL_SDP_DIR}"/licenses
- keepdir "${INTEL_SDP_DIR}"/licenses
+ dodir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
+ keepdir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
}
# @FUNCTION: intel-sdp_pkg_postinst
1.633 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.633&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.633&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.632&r2=1.633
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- ChangeLog 23 Jan 2013 09:44:24 -0000 1.632
+++ ChangeLog 23 Jan 2013 11:14:33 -0000 1.633
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.632 2013/01/23 09:44:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.633 2013/01/23 11:14:33 jlec Exp $
+
+ 23 Jan 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Add dummy dir to avoid sandbox violations when emerging with
+ FEATURES=-userpriv, #437512
23 Jan 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Add support for license server, #447262
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-07-19 13:05 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2013-07-19 13:05 UTC (permalink / raw
To: gentoo-commits
jlec 13/07/19 13:05:23
Modified: intel-sdp.eclass ChangeLog
Log:
Support different tarball extentions
Revision Changes Path
1.12 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.11&r2=1.12
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- intel-sdp.eclass 14 Feb 2013 16:29:00 -0000 1.11
+++ intel-sdp.eclass 19 Jul 2013 13:05:23 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.11 2013/02/14 16:29:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.12 2013/07/19 13:05:23 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -41,6 +41,18 @@
#
# Must be defined before inheriting the eclass
+# @ECLASS-VARIABLE: INTEL_TARX
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The package extention.
+# To find out its value, see the links to download in
+# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
+#
+# e.g. tar.gz
+#
+# Must be defined before inheriting the eclass
+: ${INTEL_TARX:=tgz}
+
# @ECLASS-VARIABLE: INTEL_SUBDIR
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -95,9 +107,9 @@
_INTEL_URI="http://registrationcenter-download.intel.com/irc_nas/${INTEL_DID}/${INTEL_DPN}"
SRC_URI="
- amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.tgz ) )
- amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.tgz ) )
- x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.tgz )"
+ amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX} ) )
+ amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} ) )
+ x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )"
LICENSE="Intel-SDP"
# Future work, #394411
@@ -341,10 +353,11 @@
for r in ${INTEL_RPMS}; do
for subdir in ${INTEL_RPMS_DIRS}; do
rpmdir=${t%%.*}/${subdir}
+ debug-print "Adding ${rpmdir}/${r} to decompression list"
list+=( ${rpmdir}/${r})
done
done
- tar xf "${DISTDIR}"/${t} ${list[@]} 2> /dev/null || die
+ tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log || die
for r in ${list[@]}; do
rb=$(basename ${r})
l=.${rb}_$(date +'%d%m%y_%H%M%S').log
1.884 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.884&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.884&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.883&r2=1.884
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- ChangeLog 18 Jul 2013 23:45:54 -0000 1.883
+++ ChangeLog 19 Jul 2013 13:05:23 -0000 1.884
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.883 2013/07/18 23:45:54 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.884 2013/07/19 13:05:23 jlec Exp $
+
+ 19 Jul 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Support different tarball extentions
18 Jul 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
libffi installation was fixed in 4.8.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-07-29 9:50 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2013-07-29 9:50 UTC (permalink / raw
To: gentoo-commits
jlec 13/07/29 09:50:09
Modified: intel-sdp.eclass ChangeLog
Log:
Intel-sdp.eclass: Allow single package downloads, custom suffix, full specified rpm target location
Revision Changes Path
1.14 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.13&r2=1.14
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- intel-sdp.eclass 19 Jul 2013 14:00:50 -0000 1.13
+++ intel-sdp.eclass 29 Jul 2013 09:50:09 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.13 2013/07/19 14:00:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.14 2013/07/29 09:50:09 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -65,11 +65,10 @@
# Possibility to skip the mandatory check for licenses. Only set this if there
# is really no fix.
-# @ECLASS-VARIABLE: INTEL_RPMS_DIRS
+# @ECLASS-VARIABLE: INTEL_RPMS_DIR
# @DESCRIPTION:
-# List of subdirectories in the main archive which contains the
-# rpms to extract.
-: ${INTEL_RPMS_DIRS:=rpm}
+# Main subdirectory which contains the rpms to extract.
+: ${INTEL_RPMS_DIR:=rpm}
# @ECLASS-VARIABLE: INTEL_X86
# @DESCRIPTION:
@@ -84,6 +83,11 @@
# Functional name of rpm without any version/arch tag
#
# e.g. compilerprof
+#
+# if the rpm is located in a directory different to INTEL_RPMS_DIR you can
+# specify the full path
+#
+# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli
# @ECLASS-VARIABLE: INTEL_DAT_RPMS
# @DEFAULT_UNSET
@@ -92,6 +96,16 @@
# without any version tag
#
# e.g. openmp
+#
+# if the rpm is located in a directory different to INTEL_RPMS_DIR you can
+# specify the full path
+#
+# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common
+
+# @ECLASS-VARIABLE: INTEL_SINGLE_ARCH
+# @DESCRIPTION:
+# Unset, if only the multilib package will be provided by intel
+: ${INTEL_SINGLE_ARCH:=true}
# @ECLASS-VARIABLE: INTEL_SDP_DB
# @DESCRIPTION:
@@ -106,10 +120,14 @@
_INTEL_PV4=$(get_version_component_range 4)
_INTEL_URI="http://registrationcenter-download.intel.com/irc_nas/${INTEL_DID}/${INTEL_DPN}"
-SRC_URI="
- amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX} ) )
- amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} ) )
- x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )"
+if [ ${INTEL_SINGLE_ARCH} == true ]; then
+ SRC_URI="
+ amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX} ) )
+ amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} ) )
+ x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )"
+else
+ SRC_URI="${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX}"
+fi
LICENSE="Intel-SDP"
# Future work, #394411
@@ -328,14 +346,23 @@
INTEL_ARCH="intel64 ia32"
fi
fi
- INTEL_RPMS=""
+ INTEL_RPMS=()
+ INTEL_RPMS_FULL=()
for p in ${INTEL_BIN_RPMS}; do
for a in ${arch}; do
- INTEL_RPMS+=" intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm"
+ if [ ${p} == $(basename ${p}) ]; then
+ INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm )
+ else
+ INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm )
+ fi
done
done
for p in ${INTEL_DAT_RPMS}; do
- INTEL_RPMS+=" intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm"
+ if [ ${p} == $(basename ${p}) ]; then
+ INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
+ else
+ INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
+ fi
done
case "${EAPI:-0}" in
@@ -347,23 +374,31 @@
# @DESCRIPTION:
# Unpacking necessary rpms from tarball, extract them and rearrange the output.
intel-sdp_src_unpack() {
- local l r subdir rb t list=()
+ local l r subdir rb t list=() debug_list
for t in ${A}; do
- for r in ${INTEL_RPMS}; do
- for subdir in ${INTEL_RPMS_DIRS}; do
- rpmdir=${t%%.*}/${subdir}
- debug-print "Adding to decompression list: ${rpmdir}/${r}"
- list+=( ${rpmdir}/${r})
- done
+ for r in ${INTEL_RPMS[@]}; do
+ rpmdir=${t%%.*}/${INTEL_RPMS_DIR}
+ list+=( ${rpmdir}/${r} )
+ done
+
+ for r in ${INTEL_RPMS_FULL[@]}; do
+ list+=( ${t%%.*}/${r} )
done
- tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log || die
+
+ debug_list="$(IFS=$'\n'; echo ${list[@]} )"
+
+ debug-print "Adding to decompression list:"
+ debug-print ${debug_list}
+
+ tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log
+
for r in ${list[@]}; do
rb=$(basename ${r})
l=.${rb}_$(date +'%d%m%y_%H%M%S').log
einfo "Unpacking ${rb}"
rpm2tar -O ${r} | tar xvf - | sed -e \
- "s:^\.:${EROOT#/}:g" > ${l} || die "unpacking ${r} failed"
+ "s:^\.:${EROOT#/}:g" > ${l}; assert "unpacking ${r} failed"
mv ${l} opt/intel/ || die "failed moving extract log file"
done
done
1.901 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.901&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.901&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.900&r2=1.901
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -r1.900 -r1.901
--- ChangeLog 27 Jul 2013 23:47:20 -0000 1.900
+++ ChangeLog 29 Jul 2013 09:50:09 -0000 1.901
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.900 2013/07/27 23:47:20 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.901 2013/07/29 09:50:09 jlec Exp $
+
+ 29 Jul 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Intel-sdp.eclass: Allow single package downloads, custom suffix, full
+ specified rpm target location
27 Jul 2013; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Rewrite sed expression in qt_nolibx11() to work on both 4.8.4 and 4.8.5.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2013-09-29 18:00 Christoph Junghans (ottxor)
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Junghans (ottxor) @ 2013-09-29 18:00 UTC (permalink / raw
To: gentoo-commits
ottxor 13/09/29 18:00:30
Modified: intel-sdp.eclass ChangeLog
Log:
EAPI bump, ccache support
Revision Changes Path
1.15 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.14&r2=1.15
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- intel-sdp.eclass 29 Jul 2013 09:50:09 -0000 1.14
+++ intel-sdp.eclass 29 Sep 2013 18:00:30 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.14 2013/07/29 09:50:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.15 2013/09/29 18:00:30 ottxor Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -364,10 +364,6 @@
INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
fi
done
-
- case "${EAPI:-0}" in
- 0|1|2|3) intel-sdp_pkg_pretend ;;
- esac
}
# @FUNCTION: intel-sdp_src_unpack
@@ -472,6 +468,11 @@
"<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>"
done
_isdp_run-test
+
+ if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" ; then
+ #add ccache links as icc might get installed after ccache
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ fi
}
# @FUNCTION: intel-sdp_pkg_postrm
@@ -487,11 +488,16 @@
${INTEL_SDP_DB}
done
fi
+
+ if [[ ${PN} = icc ]] && has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
+ # --remove-links would remove all links, --install-links updates them
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ fi
}
-EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm
+EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
case "${EAPI:-0}" in
- 0|1|2|3) ;;
- 4|5) EXPORT_FUNCTIONS pkg_pretend ;;
+ 0|1|2|3)die "EAPI=${EAPI} is not supported anymore" ;;
+ 4|5) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
1.1000 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1000&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1000&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.999&r2=1.1000
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.999
retrieving revision 1.1000
diff -u -r1.999 -r1.1000
--- ChangeLog 29 Sep 2013 17:47:13 -0000 1.999
+++ ChangeLog 29 Sep 2013 18:00:30 -0000 1.1000
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.999 2013/09/29 17:47:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1000 2013/09/29 18:00:30 ottxor Exp $
+
+ 29 Sep 2013; Christoph Junghans <ottxor@gentoo.org> intel-sdp.eclass:
+ EAPI bump, ccache support
29 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass:
Add support for gstreamer 1.2 release series.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog
@ 2015-06-04 10:36 Justin Lecher (jlec)
0 siblings, 0 replies; 7+ messages in thread
From: Justin Lecher (jlec) @ 2015-06-04 10:36 UTC (permalink / raw
To: gentoo-commits
jlec 15/06/04 10:36:27
Modified: intel-sdp.eclass ChangeLog
Log:
Use path_exists from eutils.eclass
Revision Changes Path
1.21 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.20&r2=1.21
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- intel-sdp.eclass 4 Jun 2015 10:22:33 -0000 1.20
+++ intel-sdp.eclass 4 Jun 2015 10:36:27 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.20 2015/06/04 10:22:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.21 2015/06/04 10:36:27 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -112,7 +112,7 @@
# Full path to intel registry db
INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db
-inherit check-reqs multilib versionator
+inherit check-reqs eutils multilib versionator
_INTEL_PV1=$(get_version_component_range 1)
_INTEL_PV2=$(get_version_component_range 2)
@@ -445,9 +445,9 @@
fi
if [[ -d "${INTEL_SDP_DIR}"/man ]]; then
- ls "${INTEL_SDP_DIR}"/man/en_US/man1/* &> /dev/null &&
+ path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \
doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
- ls "${INTEL_SDP_DIR}"/man/man1/* &> /dev/null &&
+ path_exists "${INTEL_SDP_DIR}"/man/man1/* && \
doman "${INTEL_SDP_DIR}"/man/man1/*
has linguas_ja ${IUSE} && use linguas_ja && \
doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/*
1.1639 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1639&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1639&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1638&r2=1.1639
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1638
retrieving revision 1.1639
diff -u -r1.1638 -r1.1639
--- ChangeLog 4 Jun 2015 10:22:33 -0000 1.1638
+++ ChangeLog 4 Jun 2015 10:36:27 -0000 1.1639
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1638 2015/06/04 10:22:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1639 2015/06/04 10:36:27 jlec Exp $
+
+ 04 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Use path_exists from eutils.eclass
04 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Fix homepage url for license registration, #538284; do a precheck instead fo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-06-04 10:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23 11:14 [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass ChangeLog Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2015-06-04 10:36 Justin Lecher (jlec)
2013-09-29 18:00 Christoph Junghans (ottxor)
2013-07-29 9:50 Justin Lecher (jlec)
2013-07-19 13:05 Justin Lecher (jlec)
2013-01-23 9:44 Justin Lecher (jlec)
2013-01-18 15:00 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox