public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2012-02-25 22:56 Michal HruAeckA (miska)
  0 siblings, 0 replies; 8+ messages in thread
From: Michal HruAeckA (miska) @ 2012-02-25 22:56 UTC (permalink / raw
  To: gentoo-commits

miska       12/02/25 22:56:56

  Modified:             ChangeLog obs-service.eclass
  Log:
  Improved obs-service eclass to fix paths to suse-build automatically

Revision  Changes    Path
1.143                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.142&r2=1.143

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog	25 Feb 2012 06:26:14 -0000	1.142
+++ ChangeLog	25 Feb 2012 22:56:56 -0000	1.143
@@ -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.142 2012/02/25 06:26:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.143 2012/02/25 22:56:56 miska Exp $
+
+  25 Feb 2012; Michal Hrusecky <miska@gentoo.org> obs-service.eclass:
+  Improved obs-service eclass to fix paths to suse-build automatically
 
   25 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> linux-mod.eclass:
   Bug #404193: Depend on virtual/modutils instead of



1.2                  eclass/obs-service.eclass

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

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- obs-service.eclass	16 Sep 2011 15:49:19 -0000	1.1
+++ obs-service.eclass	25 Feb 2012 22:56:56 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.1 2011/09/16 15:49:19 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.2 2012/02/25 22:56:56 miska Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -65,13 +65,25 @@
 	SRC_URI+=" ${OBS_URI}/${i}"
 done
 
-S="${WORKDIR}"
-
-# @FUNCTION: obs-service_src_configure
+# @FUNCTION: obs-service_src_unpack
 # @DESCRIPTION:
-# Does nothing. Files are not compressed.
+# Just copy files. Files are not compressed.
 obs-service_src_unpack() {
 	debug-print-function ${FUNCNAME} "$@"
+	cd "${DISTDIR}"
+	mkdir -p "${S}"
+	cp ${A} "${S}"
+}
+
+# @FUNCTION: obs-service_src_prepare
+# @DESCRIPTION:
+# Replaces all /usr/lib/build directories with /usr/share/suse-build to reflect
+# where suse-build is installed in Gentoo.
+obs-service_src_prepare() {
+	debug-print-function ${FUNCNAME} "$@"
+	debug-print "Replacing all paths to find suse-build in Gentoo"
+	find "${S}" -type f -exec \
+		sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
 }
 
 # @FUNCTION: obs-service_src_install
@@ -81,17 +93,17 @@
 	debug-print-function ${FUNCNAME} "$@"
 	debug-print "Installing service \"${OBS_SERVICE_NAME}\""
 	exeinto /usr/lib/obs/service
-	doexe "${DISTDIR}"/${OBS_SERVICE_NAME}
+	doexe "${S}"/${OBS_SERVICE_NAME}
 	insinto /usr/lib/obs/service
-	doins "${DISTDIR}"/${OBS_SERVICE_NAME}.service
+	doins "${S}"/${OBS_SERVICE_NAME}.service
 	if [[ -n ${ADDITIONAL_FILES} ]]; then
 		debug-print "Installing following additional files:"
 		debug-print "	${ADDITIONAL_FILES}"
 		exeinto /usr/lib/obs/service/${OBS_SERVICE_NAME}.files
 		for i in ${ADDITIONAL_FILES}; do
-			doexe "${DISTDIR}"/${i}
+			doexe "${S}"/${i}
 		done
 	fi
 }
 
-EXPORT_FUNCTIONS src_install src_unpack
+EXPORT_FUNCTIONS src_install src_prepare src_unpack






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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2012-10-02 10:52 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-10-02 10:52 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/10/02 10:52:31

  Modified:             ChangeLog obs-service.eclass
  Log:
  Always use openSUSE:Tools as project to get updates. Remove obs_package declaration as it is equal to pn.

Revision  Changes    Path
1.426                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.426&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.426&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.425&r2=1.426

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -r1.425 -r1.426
--- ChangeLog	2 Oct 2012 10:46:02 -0000	1.425
+++ ChangeLog	2 Oct 2012 10:52:31 -0000	1.426
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.425 2012/10/02 10:46:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.426 2012/10/02 10:52:31 scarabeus Exp $
+
+  02 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Always use openSUSE:Tools as project to get updates. Remove obs_package
+  declaration as it is equal to pn.
 
   02 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-download.eclass:
   Change the documentation a bit and take OBS_PACKAGE from PN if not set.



1.5                  eclass/obs-service.eclass

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

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- obs-service.eclass	27 Sep 2012 16:35:41 -0000	1.4
+++ obs-service.eclass	2 Oct 2012 10:52:31 -0000	1.5
@@ -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/obs-service.eclass,v 1.4 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.5 2012/10/02 10:52:31 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -30,10 +30,6 @@
 # @DESCRIPTION:
 # Name of the service. If not set, it is taken from ${PN}.
 
-# @ECLASS-VARIABLE: OPENSUSE_RELEASE
-# @DESCRIPTION:
-# From which stable openSUSE realease to take a package.
-
 # @ECLASS-VARIABLE: ADDITIONAL_FILES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -51,10 +47,9 @@
 RDEPEND="dev-util/osc"
 
 [[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
-[[ -n ${OPENSUSE_RELEASE} ]] || OBS_PROJECT="openSUSE:Tools"
+OBS_PROJECT="openSUSE:Tools"
 
 DESCRIPTION="Open Build Service client module - ${OBS_SERVICE_NAME} service"
-OBS_PACKAGE="obs-service-${OBS_SERVICE_NAME}"
 
 inherit obs-download
 





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2012-11-15 19:49 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-11-15 19:49 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/11/15 19:49:35

  Modified:             ChangeLog obs-service.eclass
  Log:
  Use src_uri arrows to allow versioning sanely.

Revision  Changes    Path
1.505                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.505&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.505&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.504&r2=1.505

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- ChangeLog	12 Nov 2012 09:28:53 -0000	1.504
+++ ChangeLog	15 Nov 2012 19:49:34 -0000	1.505
@@ -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.504 2012/11/12 09:28:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.505 2012/11/15 19:49:34 scarabeus Exp $
+
+  15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Use src_uri arrows to allow versioning sanely.
 
   12 Nov 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
   Update from qt overlay: respect AR (bug #440262); drop support for EAPI=2;



1.6                  eclass/obs-service.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?r1=1.5&r2=1.6

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- obs-service.eclass	2 Oct 2012 10:52:31 -0000	1.5
+++ obs-service.eclass	15 Nov 2012 19:49:34 -0000	1.6
@@ -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/obs-service.eclass,v 1.5 2012/10/02 10:52:31 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.6 2012/11/15 19:49:34 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -53,8 +53,9 @@
 
 inherit obs-download
 
-SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME}"
-SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service"
+# As it aint versioned at all use arrows to deal with it
+SRC_URI="${OBS_URI}/${OBS_SERVICE_NAME} -> ${OBS_SERVICE_NAME}-${PV}"
+SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service -> ${OBS_SERVICE_NAME}-${PV}.service"
 
 for i in ${ADDITIONAL_FILES}; do
 	SRC_URI+=" ${OBS_URI}/${i}"
@@ -88,9 +89,9 @@
 	debug-print-function ${FUNCNAME} "$@"
 	debug-print "Installing service \"${OBS_SERVICE_NAME}\""
 	exeinto /usr/lib/obs/service
-	doexe "${S}"/${OBS_SERVICE_NAME}
+	newexe "${S}"/${OBS_SERVICE_NAME}-${PV} "${S}"/${OBS_SERVICE_NAME}
 	insinto /usr/lib/obs/service
-	doins "${S}"/${OBS_SERVICE_NAME}.service
+	newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service "${S}"/${OBS_SERVICE_NAME}.service
 	if [[ -n ${ADDITIONAL_FILES} ]]; then
 		debug-print "Installing following additional files:"
 		debug-print "	${ADDITIONAL_FILES}"





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2012-11-15 19:52 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-11-15 19:52 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/11/15 19:52:56

  Modified:             ChangeLog obs-service.eclass
  Log:
  Darn copy pasto overlook.

Revision  Changes    Path
1.506                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.506&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.506&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.505&r2=1.506

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- ChangeLog	15 Nov 2012 19:49:34 -0000	1.505
+++ ChangeLog	15 Nov 2012 19:52:55 -0000	1.506
@@ -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.505 2012/11/15 19:49:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.506 2012/11/15 19:52:55 scarabeus Exp $
+
+  15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Darn copy pasto overlook.
 
   15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
   Use src_uri arrows to allow versioning sanely.



1.7                  eclass/obs-service.eclass

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

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- obs-service.eclass	15 Nov 2012 19:49:34 -0000	1.6
+++ obs-service.eclass	15 Nov 2012 19:52:55 -0000	1.7
@@ -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/obs-service.eclass,v 1.6 2012/11/15 19:49:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.7 2012/11/15 19:52:55 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -89,9 +89,9 @@
 	debug-print-function ${FUNCNAME} "$@"
 	debug-print "Installing service \"${OBS_SERVICE_NAME}\""
 	exeinto /usr/lib/obs/service
-	newexe "${S}"/${OBS_SERVICE_NAME}-${PV} "${S}"/${OBS_SERVICE_NAME}
+	newexe "${S}"/${OBS_SERVICE_NAME}-${PV} ${OBS_SERVICE_NAME}
 	insinto /usr/lib/obs/service
-	newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service "${S}"/${OBS_SERVICE_NAME}.service
+	newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service ${OBS_SERVICE_NAME}.service
 	if [[ -n ${ADDITIONAL_FILES} ]]; then
 		debug-print "Installing following additional files:"
 		debug-print "	${ADDITIONAL_FILES}"





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2012-11-15 20:06 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-11-15 20:06 UTC (permalink / raw
  To: gentoo-commits

scarabeus    12/11/15 20:06:34

  Modified:             ChangeLog obs-service.eclass
  Log:
  Depend on suse-build as most services require it.

Revision  Changes    Path
1.507                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.507&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.507&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.506&r2=1.507

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- ChangeLog	15 Nov 2012 19:52:55 -0000	1.506
+++ ChangeLog	15 Nov 2012 20:06:34 -0000	1.507
@@ -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.506 2012/11/15 19:52:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.507 2012/11/15 20:06:34 scarabeus Exp $
+
+  15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Depend on suse-build as most services require it.
 
   15 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
   Darn copy pasto overlook.



1.8                  eclass/obs-service.eclass

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

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obs-service.eclass	15 Nov 2012 19:52:55 -0000	1.7
+++ obs-service.eclass	15 Nov 2012 20:06:34 -0000	1.8
@@ -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/obs-service.eclass,v 1.7 2012/11/15 19:52:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.8 2012/11/15 20:06:34 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -44,7 +44,11 @@
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-RDEPEND="dev-util/osc"
+
+RDEPEND="
+	dev-util/osc
+	dev-util/suse-build
+"
 
 [[ -n ${OBS_SERVICE_NAME} ]] || OBS_SERVICE_NAME=${PN/obs-service-/}
 OBS_PROJECT="openSUSE:Tools"





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2013-01-31  9:26 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-31  9:26 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/01/31 09:26:42

  Modified:             ChangeLog obs-service.eclass
  Log:
  Additional files also must be versioned as they change between versions.

Revision  Changes    Path
1.655                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.655&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.655&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.654&r2=1.655

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -r1.654 -r1.655
--- ChangeLog	30 Jan 2013 10:42:25 -0000	1.654
+++ ChangeLog	31 Jan 2013 09:26:42 -0000	1.655
@@ -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.654 2013/01/30 10:42:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.655 2013/01/31 09:26:42 scarabeus Exp $
+
+  31 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Additional files also must be versioned as they change between versions.
 
   30 Jan 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
   python-single-r1.eclass:



1.9                  eclass/obs-service.eclass

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

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- obs-service.eclass	15 Nov 2012 20:06:34 -0000	1.8
+++ obs-service.eclass	31 Jan 2013 09:26:42 -0000	1.9
@@ -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/obs-service.eclass,v 1.8 2012/11/15 20:06:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.9 2013/01/31 09:26:42 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -62,7 +62,7 @@
 SRC_URI+=" ${OBS_URI}/${OBS_SERVICE_NAME}.service -> ${OBS_SERVICE_NAME}-${PV}.service"
 
 for i in ${ADDITIONAL_FILES}; do
-	SRC_URI+=" ${OBS_URI}/${i}"
+	SRC_URI+=" ${OBS_URI}/${i} -> ${i}-${PV}"
 done
 
 # @FUNCTION: obs-service_src_unpack
@@ -101,7 +101,7 @@
 		debug-print "	${ADDITIONAL_FILES}"
 		exeinto /usr/lib/obs/service/${OBS_SERVICE_NAME}.files
 		for i in ${ADDITIONAL_FILES}; do
-			doexe "${S}"/${i}
+			newexe "${S}"/${i}-${PV} ${i}
 		done
 	fi
 }





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2013-03-18 10:07 Michal HruAeckA (miska)
  0 siblings, 0 replies; 8+ messages in thread
From: Michal HruAeckA (miska) @ 2013-03-18 10:07 UTC (permalink / raw
  To: gentoo-commits

miska       13/03/18 10:07:44

  Modified:             ChangeLog obs-service.eclass
  Log:
  Change default path for obs services (bug#446074)

Revision  Changes    Path
1.743                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.743&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.743&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.742&r2=1.743

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- ChangeLog	18 Mar 2013 06:29:03 -0000	1.742
+++ ChangeLog	18 Mar 2013 10:07:44 -0000	1.743
@@ -1,10 +1,13 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.742 2013/03/18 06:29:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.743 2013/03/18 10:07:44 miska Exp $
 
   18 Mar 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass:
   Update the maintainer to systemd@.
 
+  18 Mar 2013; Michal Hrusecky <miska@gentoo.org> obs-service.eclass:
+  Change default path for obs services (bug#446074)
+
   16 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> mysql.eclass,
   mysql-autotools.eclass:
   Bug #461026: use append-cppflags for preprocessor flags.



1.10                 eclass/obs-service.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?r1=1.9&r2=1.10

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- obs-service.eclass	31 Jan 2013 09:26:42 -0000	1.9
+++ obs-service.eclass	18 Mar 2013 10:07:44 -0000	1.10
@@ -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/obs-service.eclass,v 1.9 2013/01/31 09:26:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.10 2013/03/18 10:07:44 miska Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -83,7 +83,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 	debug-print "Replacing all paths to find suse-build in Gentoo"
 	find "${S}" -type f -exec \
-		sed -i 's|/usr/lib/build|/usr/share/suse-build|g' {} +
+		sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
 }
 
 # @FUNCTION: obs-service_src_install
@@ -92,14 +92,14 @@
 obs-service_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 	debug-print "Installing service \"${OBS_SERVICE_NAME}\""
-	exeinto /usr/lib/obs/service
+	exeinto /usr/libexec/obs/service
 	newexe "${S}"/${OBS_SERVICE_NAME}-${PV} ${OBS_SERVICE_NAME}
-	insinto /usr/lib/obs/service
+	insinto /usr/libexec/obs/service
 	newins "${S}"/${OBS_SERVICE_NAME}-${PV}.service ${OBS_SERVICE_NAME}.service
 	if [[ -n ${ADDITIONAL_FILES} ]]; then
 		debug-print "Installing following additional files:"
 		debug-print "	${ADDITIONAL_FILES}"
-		exeinto /usr/lib/obs/service/${OBS_SERVICE_NAME}.files
+		exeinto /usr/libexec/obs/service/${OBS_SERVICE_NAME}.files
 		for i in ${ADDITIONAL_FILES}; do
 			newexe "${S}"/${i}-${PV} ${i}
 		done





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

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass
@ 2013-03-26 13:49 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-03-26 13:49 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/03/26 13:49:39

  Modified:             ChangeLog obs-service.eclass
  Log:
  Fix hardcoded libexec suse path in scripts.

Revision  Changes    Path
1.755                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.755&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.755&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.754&r2=1.755

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- ChangeLog	25 Mar 2013 13:08:39 -0000	1.754
+++ ChangeLog	26 Mar 2013 13:49:39 -0000	1.755
@@ -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.754 2013/03/25 13:08:39 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.755 2013/03/26 13:49:39 scarabeus Exp $
+
+  26 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> obs-service.eclass:
+  Fix hardcoded libexec suse path in scripts.
 
   25 Mar 2013; Jory A. Pratt <anarchy@gentoo.org> mozcoreconf-2.eclass:
   Fix a typo for svg support in older versions, bug #462994



1.11                 eclass/obs-service.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/obs-service.eclass?r1=1.10&r2=1.11

Index: obs-service.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- obs-service.eclass	18 Mar 2013 10:07:44 -0000	1.10
+++ obs-service.eclass	26 Mar 2013 13:49:39 -0000	1.11
@@ -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/obs-service.eclass,v 1.10 2013/03/18 10:07:44 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.11 2013/03/26 13:49:39 scarabeus Exp $
 
 # @ECLASS: obs-service.eclass
 # @MAINTAINER:
@@ -84,6 +84,9 @@
 	debug-print "Replacing all paths to find suse-build in Gentoo"
 	find "${S}" -type f -exec \
 		sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} +
+	debug-print "Replacing all paths from hardcoded suse libexec"
+	find "${S}" -type f -exec \
+		sed -i 's|/usr/lib/obs|/usr/libexec/obs|g' {} +
 }
 
 # @FUNCTION: obs-service_src_install





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

end of thread, other threads:[~2013-03-26 13:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-18 10:07 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog obs-service.eclass Michal HruAeckA (miska)
  -- strict thread matches above, loose matches on Subject: below --
2013-03-26 13:49 Tomas Chvatal (scarabeus)
2013-01-31  9:26 Tomas Chvatal (scarabeus)
2012-11-15 20:06 Tomas Chvatal (scarabeus)
2012-11-15 19:52 Tomas Chvatal (scarabeus)
2012-11-15 19:49 Tomas Chvatal (scarabeus)
2012-10-02 10:52 Tomas Chvatal (scarabeus)
2012-02-25 22:56 Michal HruAeckA (miska)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox