* [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
@ 2013-02-16 0:08 Markos Chandras
0 siblings, 0 replies; 5+ messages in thread
From: Markos Chandras @ 2013-02-16 0:08 UTC (permalink / raw
To: gentoo-commits
commit: 8d5f63de8639004354a21464e55af0aea1bab88a
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 00:07:36 2013 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 00:07:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/devmanual.git;a=commit;h=8d5f63de
src_unpack/rpm-sources: Delete note about rpmcpio. Bug #377175
---
.../functions/src_unpack/rpm-sources/text.xml | 25 --------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 11b87b7..dcf9113 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -40,31 +40,6 @@ format.
</body>
<section>
-<title>Notes on Using <c>rpm.eclass</c></title>
-<body>
-
-<p>
-There are two ways to unpack a rpm file <d/> using
-the <c>rpmoffset</c> program from <c>rpm2targz</c> and <c>cpio</c>, or
-by using <c>rpm2cpio</c> from <c>app-arch/rpm</c>. Normally, for
-unpacking an RPM file, installing the entire RPM application is
-overkill. Because of this, the eclass will only use <c>rpm2cpio</c>
-if <c>rpm</c> is already installed on the system. If you want to force
-the eclass to only use the RPM offset method, set
-<c>USE_RPMOFFSET_ONLY=1</c>.
-</p>
-
-<p>
-Another issue that might arise is that <c>rpmoffset</c> and cpio are not able
-to unpack the RPM file correctly. If this occurs, then you need to add
-<c>app-arch/rpm</c> to the <c>DEPEND</c> variable so
-that <c>rpm2cpio</c> will be used instead.
-</p>
-
-</body>
-</section>
-
-<section>
<title>Example RPM Handling</title>
<body>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
@ 2018-09-14 16:55 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2018-09-14 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 00a1865827862c17a4019d56afb4b5b5f8a3f658
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 16:55:09 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 16:55:09 2018 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=00a18658
Bring rpm example up to EAPI 6 standards
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
.../functions/src_unpack/rpm-sources/text.xml | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 64ac1de..584866a 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -19,7 +19,7 @@ that will unpack the RPM files.
</p>
<p>
-If you do need to apply patches then override <c>src_unpack</c> in a
+If you do need to call additional unpack functions then override <c>src_unpack</c> in a
manner such as:
</p>
@@ -55,9 +55,11 @@ patches. The filename should be <c>suse-fetchmail-6.2.5.54.1.ebuild</c>.
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils versionator rpm
+EAPI="6"
-MY_PV=$(replace_version_separator 3 '-')
+inherit eapi7-ver rpm
+
+MY_PV=$(ver_rs 3 '-')
MY_P=fetchmail-${MY_PV}
SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm"
@@ -80,13 +82,17 @@ RESTRICT="mirror"
#USE_RPMOFFSET_ONLY=1
-S=${WORKDIR}/fetchmail-$(get_version_component_range 1-3)
+S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
src_unpack () {
- rpm_src_unpack ${A}
- cd "${S}"
- EPATCH_SOURCE="${WORKDIR}" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
+ rpm_src_unpack ${A}
+}
+
+src_prepare () {
+ for i in "${WORKDIR}"/*.patch ; do
+ eapply "${i}"
+ done
+ eapply_user
}
</codesample>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
@ 2021-03-12 19:32 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2021-03-12 19:32 UTC (permalink / raw
To: gentoo-commits
commit: d240b5e69b87c1ab35bd714634eb47b78d98f8d8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 18:20:04 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 19:32:21 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d240b5e6
ebuild-writing/functions/src_unpack/rpm-sources: update phase definition
We don't normally write 'phase_name ()', but instead 'phase_name()'.
Reflect that in our example.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 4341944..ba78d4c 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -24,7 +24,7 @@ manner such as:
</p>
<codesample lang="ebuild">
-src_unpack () {
+src_unpack() {
rpm_src_unpack ${A}
cd "${S}"
@@ -84,11 +84,11 @@ RESTRICT="mirror"
S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
-src_unpack () {
+src_unpack() {
rpm_src_unpack ${A}
}
-src_prepare () {
+src_prepare() {
for i in "${WORKDIR}"/*.patch ; do
eapply "${i}"
done
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
@ 2021-12-09 4:24 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-12-09 4:24 UTC (permalink / raw
To: gentoo-commits
commit: 9899125938fb558df2dbb0d7c225fd90098f53d3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 04:23:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 04:24:31 2021 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=98991259
ebuild-writing/functions/src_unpack/rpm-sources: use EAPI 8 in example
Signed-off-by: Sam James <sam <AT> gentoo.org>
ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index ba78d4c..d29f592 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -28,7 +28,7 @@ src_unpack() {
rpm_src_unpack ${A}
cd "${S}"
- use ssl && epatch "${FILESDIR}/${PV}/${P}-ssl.patch"
+ use ssl && eapply "${FILESDIR}/${PV}/${P}-ssl.patch"
}
</codesample>
@@ -55,16 +55,17 @@ patches. The filename should be <c>suse-fetchmail-6.2.5.54.1.ebuild</c>.
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
-inherit eapi7-ver rpm
+inherit rpm
MY_PV=$(ver_rs 3 '-')
MY_P=fetchmail-${MY_PV}
-SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm"
DESCRIPTION="SuSE 9.2 Fetchmail Source Package"
HOMEPAGE="https://www.suse.com"
+SRC_URI="https://suse.osuosl.org/suse/i386/9.2/suse/src/${MY_P}.src.rpm"
+S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
LICENSE="GPL-2 public-domain"
SLOT="0"
@@ -75,15 +76,13 @@ RESTRICT="mirror"
# Need to test if the file can be unpacked with rpmoffset and cpio
# If it can't then set:
-#DEPEND="app-arch/rpm"
+#BDEPEND="app-arch/rpm"
# To force the use of rpmoffset and cpio instead of rpm2cpio from
# app-arch/rpm, then set the following:
#USE_RPMOFFSET_ONLY=1
-S=${WORKDIR}/fetchmail-$(ver_cut 1-3)
-
src_unpack() {
rpm_src_unpack ${A}
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/
@ 2024-09-14 19:11 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2024-09-14 19:11 UTC (permalink / raw
To: gentoo-commits
commit: a166928ab188ff3b108d9a2651217dd96828b282
Author: Sebastian Engel <sighunter <AT> gmx <DOT> de>
AuthorDate: Wed Aug 28 11:13:20 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:10:58 2024 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=a166928a
src_unpack/rpm-sources: Replace src_unpack override example code
This replaces the code example with a snippet of how it is currently used in
::gentoo/dev-util/intel-ocl-sdk/intel-ocl-sdk-18.1.0.015.ebuild
because the old example code had multiple issues.
Signed-off-by: Sebastian Engel <sighunter <AT> gmx.de>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
ebuild-writing/functions/src_unpack/rpm-sources/text.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
index 0029c53..99c932e 100644
--- a/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
+++ b/ebuild-writing/functions/src_unpack/rpm-sources/text.xml
@@ -25,10 +25,8 @@ manner such as:
<codesample lang="ebuild">
src_unpack() {
- rpm_src_unpack ${A}
- cd "${S}"
-
- use ssl && eapply "${FILESDIR}/${PV}/${P}-ssl.patch"
+ unpack ${A}
+ rpm_unpack "${S}/rpm/intel-openclrt-${PV}-${ALT_PV}.x86_64.rpm"
}
</codesample>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-14 19:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-12 19:32 [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/functions/src_unpack/rpm-sources/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2024-09-14 19:11 Ulrich Müller
2021-12-09 4:24 Sam James
2018-09-14 16:55 Brian Evans
2013-02-16 0:08 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox