Patchwork [1/1] libzypp: move package-manger to it own package

login
register
mail settings
Submitter Saul Wold
Date Sept. 13, 2011, 11:41 p.m.
Message ID <3be290aac4da885fe5bc31797c4a689196c63b7a.1315956050.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/11335/
State New, archived
Headers show

Comments

Saul Wold - Sept. 13, 2011, 11:41 p.m.
[YOCTO #1234]

This moves a couple of files to a pkgmgt package so that
they will not be installed by default. This removes the
Add/Remove Software Icon from rpm based rootfs.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Richard Purdie - Sept. 13, 2011, 11:54 p.m.
On Tue, 2011-09-13 at 16:41 -0700, Saul Wold wrote:
> [YOCTO #1234]
> 
> This moves a couple of files to a pkgmgt package so that
> they will not be installed by default. This removes the
> Add/Remove Software Icon from rpm based rootfs.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard
Joshua Lock - Sept. 13, 2011, 11:56 p.m.
On Tue, 2011-09-13 at 16:41 -0700, Saul Wold wrote:
> [YOCTO #1234]

Aside/nitpick: I really hate this being the first line.

> 
> This moves a couple of files to a pkgmgt package so that
> they will not be installed by default. This removes the
> Add/Remove Software Icon from rpm based rootfs.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

We should ensure that we document how to hook up and enable this
functionality too.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

> ---
>  meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
>  1 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
> index 1fc6809..aeae7df 100644
> --- a/meta/recipes-extended/libzypp/libzypp_git.bb
> +++ b/meta/recipes-extended/libzypp/libzypp_git.bb
> @@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
>  S = "${WORKDIR}/git"
>  SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
>  PV = "0.0-git${SRCPV}"
> -PR = "r13"
> +PR = "r14"
>  
>  SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
>             file://no-doc.patch \
> @@ -32,9 +32,16 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
>  # ARM specific global constructor workaround
>  SRC_URI_append_arm  = " file://arm-workaround-global-constructor.patch"
>  
> +PACKAGES =+ "${PN}-pkgmgt"
> +
>  FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
>  FILES_${PN}-dev += "${datadir}/cmake"
>  
> +FILES_${PN}-pkgmgt = "${bindir}/package-manager \
> +                      ${bindir}/package-manager-su \
> +                      ${datadir}/applications/package-manager.desktop \
> +                     "
> +
>  EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
Richard Purdie - Sept. 14, 2011, 12:01 a.m.
On Tue, 2011-09-13 at 16:56 -0700, Joshua Lock wrote:
> On Tue, 2011-09-13 at 16:41 -0700, Saul Wold wrote:
> > [YOCTO #1234]
> 
> Aside/nitpick: I really hate this being the first line.

I have to admit I don't like it either but it is what the commit
guidelines suggest. I have wondered about proposing to change them but
haven't had time...

Cheers,

Richard
Joshua Lock - Sept. 14, 2011, 12:06 a.m.
On Wed, 2011-09-14 at 01:01 +0100, Richard Purdie wrote:
> On Tue, 2011-09-13 at 16:56 -0700, Joshua Lock wrote:
> > On Tue, 2011-09-13 at 16:41 -0700, Saul Wold wrote:
> > > [YOCTO #1234]
> > 
> > Aside/nitpick: I really hate this being the first line.
> 
> I have to admit I don't like it either but it is what the commit
> guidelines suggest. I have wondered about proposing to change them but
> haven't had time...

Oh! I seem to have read/remembered that it should be at the bottom - as
I always do. Particularly as for the wider oe-core userbase the
information is not especially relevant.

I will write a formal proposal for the change.

Joshua

Patch

diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 1fc6809..aeae7df 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -14,7 +14,7 @@  RDEPENDS_${PN} = "sat-solver"
 S = "${WORKDIR}/git"
 SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
 PV = "0.0-git${SRCPV}"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://no-doc.patch \
@@ -32,9 +32,16 @@  SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"
 # ARM specific global constructor workaround
 SRC_URI_append_arm  = " file://arm-workaround-global-constructor.patch"
 
+PACKAGES =+ "${PN}-pkgmgt"
+
 FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons"
 FILES_${PN}-dev += "${datadir}/cmake"
 
+FILES_${PN}-pkgmgt = "${bindir}/package-manager \
+                      ${bindir}/package-manager-su \
+                      ${datadir}/applications/package-manager.desktop \
+                     "
+
 EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"