public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2013-01-23  9:49 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2013-01-23  9:49 UTC (permalink / raw
  To: gentoo-commits

jlec        13/01/23 09:49:30

  Modified:             intel-sdp.eclass
  Log:
  We are checking for return values not for output

Revision  Changes    Path
1.8                  eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.7&r2=1.8

Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- intel-sdp.eclass	23 Jan 2013 09:44:24 -0000	1.7
+++ intel-sdp.eclass	23 Jan 2013 09:49:30 -0000	1.8
@@ -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.7 2013/01/23 09:44:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.8 2013/01/23 09:49:30 jlec Exp $
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -260,7 +260,7 @@
 	: ${CHECKREQS_DISK_BUILD:=256M}
 	check-reqs_pkg_pretend
 
-	if [[ $(echo ${INTEL_LICENSE_FILE} | grep -q @) ]]; then
+	if echo ${INTEL_LICENSE_FILE} | grep -q @; then
 		einfo "Looks like you are using following license server:"
 		einfo "   ${INTEL_LICENSE_FILE}"
 		return 0





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2014-02-20  9:47 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2014-02-20  9:47 UTC (permalink / raw
  To: gentoo-commits

jlec        14/02/20 09:47:09

  Modified:             intel-sdp.eclass
  Log:
  Be precise

Revision  Changes    Path
1.16                 eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.15&r2=1.16

Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- intel-sdp.eclass	29 Sep 2013 18:00:30 -0000	1.15
+++ intel-sdp.eclass	20 Feb 2014 09:47:09 -0000	1.16
@@ -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.15 2013/09/29 18:00:30 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.16 2014/02/20 09:47:09 jlec Exp $
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -324,7 +324,7 @@
 			die "Could not find license file"
 		fi
 	else
-		eqawarn "The ebuild doesn't check for a license!"
+		eqawarn "The ebuild doesn't check for presents of a proper intel license!"
 		eqawarn "This shouldn't be done unless there is a serious reason."
 	fi
 }





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2013-07-19 14:00 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2013-07-19 14:00 UTC (permalink / raw
  To: gentoo-commits

jlec        13/07/19 14:00:51

  Modified:             intel-sdp.eclass
  Log:
  Optimize debug output layout

Revision  Changes    Path
1.13                 eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.12&r2=1.13

Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- intel-sdp.eclass	19 Jul 2013 13:05:23 -0000	1.12
+++ intel-sdp.eclass	19 Jul 2013 14:00:50 -0000	1.13
@@ -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.12 2013/07/19 13:05:23 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.13 2013/07/19 14:00:50 jlec Exp $
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -353,7 +353,7 @@
 		for r in ${INTEL_RPMS}; do
 			for subdir in ${INTEL_RPMS_DIRS}; do
 				rpmdir=${t%%.*}/${subdir}
-				debug-print "Adding ${rpmdir}/${r} to decompression list"
+				debug-print "Adding to decompression list: ${rpmdir}/${r}"
 				list+=( ${rpmdir}/${r})
 			done
 		done





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2012-09-20 13:54 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2012-09-20 13:54 UTC (permalink / raw
  To: gentoo-commits

jlec        12/09/20 13:54:56

  Modified:             intel-sdp.eclass
  Log:
  Keyword for *-linux prefix

Revision  Changes    Path
1.4                  eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.3&r2=1.4

Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- intel-sdp.eclass	20 Sep 2012 13:12:50 -0000	1.3
+++ intel-sdp.eclass	20 Sep 2012 13:54:56 -0000	1.4
@@ -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/intel-sdp.eclass,v 1.3 2012/09/20 13:12:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.4 2012/09/20 13:54:56 jlec Exp $
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -94,7 +94,7 @@
 #SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
 SLOT="0"
 IUSE="multilib"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RESTRICT="mirror"
 





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2012-09-20 13:12 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2012-09-20 13:12 UTC (permalink / raw
  To: gentoo-commits

jlec        12/09/20 13:12:50

  Modified:             intel-sdp.eclass
  Log:
  Remove empty line

Revision  Changes    Path
1.3                  eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.2&r2=1.3

Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intel-sdp.eclass	16 Sep 2012 15:59:43 -0000	1.2
+++ intel-sdp.eclass	20 Sep 2012 13:12:50 -0000	1.3
@@ -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/intel-sdp.eclass,v 1.2 2012/09/16 15:59:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.3 2012/09/20 13:12:50 jlec Exp $
 
 # @ECLASS: intel-sdp.eclass
 # @MAINTAINER:
@@ -225,7 +225,6 @@
 # Full path to intel registry db
 INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db
 
-
 intel-sdp_pkg_postinst() {
 	elog "Make sure you have recieved the an Intel license."
 	elog "To receive a non-commercial license, you need to register at:"





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass
@ 2012-09-16 14:24 Justin Lecher (jlec)
  0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher (jlec) @ 2012-09-16 14:24 UTC (permalink / raw
  To: gentoo-commits

jlec        12/09/16 14:24:40

  Added:                intel-sdp.eclass
  Log:
  New eclass

Revision  Changes    Path
1.1                  eclass/intel-sdp.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.1&content-type=text/plain

Index: intel-sdp.eclass
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.1 2012/09/16 14:24:40 jlec Exp $

# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
# Sébastien Fabbro <bicatali@gentoo.org>
# Justin Lecher <jlec@gentoo.org>
# Sci Team <sci@gentoo.org>
# @BLURB: Handling of Intel's Software Development Products package management

# @ECLASS-VARIABLE: INTEL_DID
# @DEFAULT_UNSET
# @DESCRIPTION:
# The package download ID from Intel.
# To find out its value, see the links to download in
# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
#
# e.g. 2504
#
# Must be defined before inheriting the eclass

# @ECLASS-VARIABLE: INTEL_DPN
# @DEFAULT_UNSET
# @DESCRIPTION:
# The package name to download from Intel.
# To find out its value, see the links to download in
# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
#
# e.g. parallel_studio_xe
#
# Must be defined before inheriting the eclass

# @ECLASS-VARIABLE: INTEL_DPV
# @DEFAULT_UNSET
# @DESCRIPTION:
# The package download version from Intel.
# To find out its value, see the links to download in
# https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
#
# e.g. 2011_sp1_update2
#
# Must be defined before inheriting the eclass

# @ECLASS-VARIABLE: INTEL_SUBDIR
# @DEFAULT_UNSET
# @DESCRIPTION:
# The package sub-directory where it will end-up in /opt/intel
# To find out its value, you have to do a raw install from the Intel tar ball

# @ECLASS-VARIABLE: INTEL_RPMS_DIRS
# @DESCRIPTION:
# List of subdirectories in the main archive which contains the
# rpms to extract.
: ${INTEL_RPMS_DIRS:=rpm}

# @ECLASS-VARIABLE: INTEL_X86
# @DESCRIPTION:
# 32bit arch in rpm names
#
# e.g. i484
: ${INTEL_X86:=i486}

# @ECLASS-VARIABLE: INTEL_BIN_RPMS
# @DEFAULT_UNSET
# @DESCRIPTION:
# Functional name of rpm without any version/arch tag
#
# e.g. compilerprof

# @ECLASS-VARIABLE: INTEL_DAT_RPMS
# @DEFAULT_UNSET
# @DESCRIPTION:
# Functional name of rpm of common data which are arch free
# without any version tag
#
# e.g. openmp

inherit check-reqs multilib versionator

_INTEL_PV1=$(get_version_component_range 1)
_INTEL_PV2=$(get_version_component_range 2)
_INTEL_PV3=$(get_version_component_range 3)
_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}.tgz ) )
	amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.tgz ) )
	x86?  ( ${_INTEL_URI}_${INTEL_DPV}_ia32.tgz )"

LICENSE="Intel-SDP"
# Future work, #394411
#SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
SLOT="0"
IUSE="multilib"
KEYWORDS="-* ~amd64 ~x86"

RESTRICT="mirror"

RDEPEND=""
DEPEND=">=app-arch/rpm2targz-9.0.0.3g"

_INTEL_SDP_YEAR=${INTEL_DPV%_update*}
_INTEL_SDP_YEAR=${INTEL_DPV%_sp*}

# @ECLASS-VARIABLE: INTEL_SDP_DIR
# @DEFAULT_UNSET
# @DESCRIPTION:
# Full rootless path to installation dir

INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}"

# @ECLASS-VARIABLE: INTEL_SDP_EDIR
# @DEFAULT_UNSET
# @DESCRIPTION:
# Full rooted path to installation dir

INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"

S="${WORKDIR}"

QA_PREBUILT="${INTEL_SDP_DIR}/*"

intel-sdp_pkg_pretend() {
	: ${CHECKREQS_DISK_BUILD:=256M}
	check-reqs_pkg_pretend
}

# @ECLASS-VARIABLE: INTEL_ARCH
# @DEFAULT_UNSET
# @DESCRIPTION:
# Intels internal names of the arches; will be set at runtime accordingly
#
# e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32"

intel-sdp_pkg_setup() {
	local arch a p
	if use x86; then
		arch=${INTEL_X86}
		INTEL_ARCH="ia32"
	elif use amd64; then
		arch=x86_64
		INTEL_ARCH="intel64"
		if has_multilib_profile; then
			arch="x86_64 ${INTEL_X86}"
			INTEL_ARCH="intel64 ia32"
		fi
	fi
	INTEL_RPMS=""
	for p in ${INTEL_BIN_RPMS}; do
		for a in ${arch}; do
			INTEL_RPMS="${INTEL_RPMS} intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm"
		done
	done
	for p in ${INTEL_DAT_RPMS}; do
		INTEL_RPMS="${INTEL_RPMS} intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm"
	done

	case "${EAPI:-0}" in
		0|1|2|3) intel-sdp_pkg_pretend ;;
	esac
}

intel-sdp_src_unpack() {
	local l r t rpmdir
	for t in ${A}; do
		for r in ${INTEL_RPMS}; do
			# Find which subdirectory of the archive the rpm is in
			rpm_found="false"
			for subdir in ${INTEL_RPMS_DIRS}; do
				[[ "${rpm_found}" == "true" ]] && continue
				rpmdir=${t%%.*}/${subdir}
				l=.${r}_$(date +'%d%m%y_%H%M%S').log
				tar xf "${DISTDIR}"/${t} ${rpmdir}/${r} 2> /dev/null || continue
				einfo "Unpacking ${r}"
				rpm_found="true"
				rpm2tar -O "./${rpmdir}/${r}" | tar xvf - | sed -e \
					"s:^\.:${EROOT#/}:g" > ${l} || die "unpacking ${r} failed"
				mv ${l} opt/intel/ || die "failed moving extract log file"
			done
		done
	done
	mv -v opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed"
}

intel_link_eclipse_plugins() {
	pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
	local c f
	for c in cdt*; do
		local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
		if has_version "dev-util/eclipse-sdk:${ev}"; then
			einfo "Linking eclipse (v${ev}) plugin cdt (v${cv})"
			for f in cdt${cv}/eclipse/features/*; do
				dodir /usr/$(get_libdir)/eclipse-${ev}/features
				dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
					/usr/$(get_libdir)/eclipse-${ev}/features/ || die
			done
			for f in cdt${cv}/eclipse/plugins/*; do
				dodir /usr/$(get_libdir)/eclipse-${ev}/plugins
				dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
					/usr/$(get_libdir)/eclipse-${ev}/plugins/ || die
			done
		fi
	done
	popd > /dev/null
}

intel-sdp_src_install() {
	[[ -d ${INTEL_SDP_DIR}/eclipse_support ]] && \
		has eclipse ${IUSE} && \
		use eclipse && \
		intel_link_eclipse_plugins
	einfo "Tagging ${PN}"
	find opt -name \*sh -type f -exec sed -i \
		-e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \
		'{}' \;
	mkdir -p "${ED:-${D}}"/ || die
	mv opt "${ED:-${D}}"/ || die "moving files failed"
}


# @ECLASS-VARIABLE: INTEL_SDP_DB
# @DESCRIPTION:
# Full path to intel registry db
INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db


intel-sdp_pkg_postinst() {
	# add product registry to intel "database"
	local l r
	for r in ${INTEL_RPMS}; do
		l="$(ls -1 ${EROOT%/}/opt/intel/.${r}_*.log | head -n 1)"
		echo >> ${INTEL_SDP_DB} \
			"<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>"
	done
}

intel-sdp_pkg_postrm() {
	# remove from intel "database"
	if [[ -e ${INTEL_SDP_DB} ]]; then
		local r
		for r in ${INTEL_RPMS}; do
			sed -i \
				-e "/${r}/d" \
				${INTEL_SDP_DB}
		done
	fi
}

EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm
case "${EAPI:-0}" in
	0|1|2|3) ;;
	4) EXPORT_FUNCTIONS pkg_pretend ;;
	*) die "EAPI=${EAPI} is not supported" ;;
esac





^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-02-20  9:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-23  9:49 [gentoo-commits] gentoo-x86 commit in eclass: intel-sdp.eclass Justin Lecher (jlec)
  -- strict thread matches above, loose matches on Subject: below --
2014-02-20  9:47 Justin Lecher (jlec)
2013-07-19 14:00 Justin Lecher (jlec)
2012-09-20 13:54 Justin Lecher (jlec)
2012-09-20 13:12 Justin Lecher (jlec)
2012-09-16 14:24 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