diff options
| author |   Michal Hrušecký <miska@gentoo.org> | 2013-03-18 10:07:44 +0000 |
|---|---|---|
| committer | Michal Hrušecký <miska@gentoo.org> | 2013-03-18 10:07:44 +0000 |
| commit | 8a93f5be859d606b5060dbb6b687125d04ba7260 (patch) | |
| tree | 2993755d70adeb34905758ec22fa95f17e9b7a78 /eclass | |
| parent | Fix detecting python cflags and libs until there is nice eclass call for it. ... (diff) | |
| download | gentoo-2-8a93f5be859d606b5060dbb6b687125d04ba7260.tar.gz gentoo-2-8a93f5be859d606b5060dbb6b687125d04ba7260.tar.bz2 gentoo-2-8a93f5be859d606b5060dbb6b687125d04ba7260.zip | |
Change default path for obs services (bug#446074)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/obs-service.eclass | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0217b56af476..0b3ccd6fb711 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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. diff --git a/eclass/obs-service.eclass b/eclass/obs-service.eclass index 2bc47c85f5b6..c0c644d9e25f 100644 --- a/eclass/obs-service.eclass +++ b/eclass/obs-service.eclass @@ -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 @@ 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' {} + + sed -i 's|/usr/lib/build|/usr/libexec/suse-build|g' {} + } # @FUNCTION: obs-service_src_install @@ -92,14 +92,14 @@ obs-service_src_prepare() { 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 |