libzypp: remove the desktop icon

PATCH Applied Saul Wold 3 participants 6 messages Sep 13, 2011 – Sep 14, 2011

lore

Share & tools

lore

Saul Wold

author

2011-09-13 23:47 UTC #0 lore raw

cover libzypp: remove the desktop icon

Richard

This removes the add/remove icon by packaging stuff in an uninstalled rpm

Sau!

The following changes since commit c7af358ec427487ccc053316d2f68f6121b97181:

dpkg: fix pkg_postinst_dpkg, don't supply {bindir}/update-alternatives (2011-09-13 17:11:01 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-fix
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-fix

Saul Wold (1):
libzypp: move package-manger to it own package

 meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Signature · 1 line

1.7.6

Saul Wold

author

2011-09-13 23:47 UTC #1 lore raw

PATCH 1/1 libzypp: move package-manger to it own package

[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 <[email protected]>

---
 meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

meta/recipes-extended/libzypp/libzypp_git.bb +8 -1

index 1fc6809..aeae7df 100644
@@ -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}"

Signature · 1 line

1.7.6

Richard Purdie

Applied

2011-09-13 23:59 UTC #2 lore raw

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

Quoted 10 lines · Saul Wold

[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 <[email protected]>
---
 meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Joshua Lock

2011-09-14 00:01 UTC #3 lore raw

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

In reply to Saul Wold

Quoted 1 line · Saul Wold

[YOCTO #1234]

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

Quoted 6 lines

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 <[email protected]>

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

Signed-off-by Joshua Lock <[email protected]>

Quoted 34 lines

---
 meta/recipes-extended/libzypp/libzypp_git.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

meta/recipes-extended/libzypp/libzypp_git.bb +8 -1

index 1fc6809..aeae7df 100644
@@ -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}"

Signature · 3 lines

Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre

Richard Purdie

2011-09-14 00:06 UTC #4 lore raw

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

Quoted 4 lines · Joshua Lock

Quoted 1 line · Saul Wold
[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

2011-09-14 00:11 UTC #5 lore raw

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

Quoted 9 lines · Richard Purdie

Quoted 4 lines · Joshua Lock
Quoted 1 line · Saul Wold
[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

Signature · 3 lines

Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre