* [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list
@ 2012-09-18 0:17 Saul Wold
2012-09-18 0:17 ` [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
2012-09-18 4:18 ` [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
0 siblings, 2 replies; 5+ messages in thread
From: Saul Wold @ 2012-09-18 0:17 UTC (permalink / raw)
To: openembedded-core
RPM does not name it's packages with the Multilib prefix, but the rootfs_rpm class
keeps track of the Multilib prefixs in a list. Use that list to re-attach the prefix
for use with the license bbclass, buildhistory bbclass will also use this and make
it more accurate between multilib and non-multilib.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/rootfs_rpm.bbclass | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index c0207d8..ad83ffb 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -142,11 +142,18 @@ RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}" \
list_installed_packages() {
if [ "$1" = "arch" ] ; then
- ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]"
+ GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]")
elif [ "$1" = "file" ] ; then
- ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{PACKAGEORIGIN}\n]"
+ GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{PACKAGEORIGIN}\n]")
else
- ${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]"
+ GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]")
+ fi
+ if [ "x${MULTILIB_PREFIX_LIST}" = "x"]; then
+ echo "$GET_LIST"
+ else
+ for prefix in `echo ${MULTILIB_PREFIX_LIST}`; do
+ echo "$GET_LIST" | sed -e "s/^/$prefix\-/"
+ done
fi
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-18 0:17 [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
@ 2012-09-18 0:17 ` Saul Wold
2012-09-18 2:40 ` Otavio Salvador
2012-09-18 4:18 ` [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
1 sibling, 1 reply; 5+ messages in thread
From: Saul Wold @ 2012-09-18 0:17 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +-
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index c71896a..35cb33a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r7"
+PR = "r8"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 210abad..643ca70 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RREPLACES_${PN}-module-exa = "${PN}"
+RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-18 0:17 ` [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
@ 2012-09-18 2:40 ` Otavio Salvador
2012-09-18 4:17 ` Saul Wold
0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2012-09-18 2:40 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
Hello Saul,
On Mon, Sep 17, 2012 at 9:17 PM, Saul Wold <sgw@linux.intel.com> wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
I understand the patch but from the description it is not clear why it
is need. Please clarify it in the commit log.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS
2012-09-18 2:40 ` Otavio Salvador
@ 2012-09-18 4:17 ` Saul Wold
0 siblings, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-09-18 4:17 UTC (permalink / raw)
To: Otavio Salvador, Burton, Ross; +Cc: openembedded-core
On 09/17/2012 07:40 PM, Otavio Salvador wrote:
> Hello Saul,
>
> On Mon, Sep 17, 2012 at 9:17 PM, Saul Wold <sgw@linux.intel.com> wrote:
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
> I understand the patch but from the description it is not clear why it
> is need. Please clarify it in the commit log.
>
I might need Ross or Paul to help with that, I was just implementing and
posting the solution based on other emails.
Sau!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list
2012-09-18 0:17 [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
2012-09-18 0:17 ` [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
@ 2012-09-18 4:18 ` Saul Wold
1 sibling, 0 replies; 5+ messages in thread
From: Saul Wold @ 2012-09-18 4:18 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 09/17/2012 05:17 PM, Saul Wold wrote:
> RPM does not name it's packages with the Multilib prefix, but the rootfs_rpm class
> keeps track of the Multilib prefixs in a list. Use that list to re-attach the prefix
> for use with the license bbclass, buildhistory bbclass will also use this and make
> it more accurate between multilib and non-multilib.
>
Further testing showed my partial lack of understanding around multilib,
this is now too aggressive in adding the prefix. It looks like I need
to use the information in the rpm query result to correctly decode the
multilib prefix and append that, expect a V2 tomorrow.
Sau!
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/classes/rootfs_rpm.bbclass | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
> index c0207d8..ad83ffb 100644
> --- a/meta/classes/rootfs_rpm.bbclass
> +++ b/meta/classes/rootfs_rpm.bbclass
> @@ -142,11 +142,18 @@ RPM_QUERY_CMD = '${RPM} --root $INSTALL_ROOTFS_RPM -D "_dbpath ${rpmlibdir}" \
>
> list_installed_packages() {
> if [ "$1" = "arch" ] ; then
> - ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]"
> + GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{ARCH}\n]")
> elif [ "$1" = "file" ] ; then
> - ${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{PACKAGEORIGIN}\n]"
> + GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME} %{PACKAGEORIGIN}\n]")
> else
> - ${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]"
> + GET_LIST=$(${RPM_QUERY_CMD} -qa --qf "[%{NAME}\n]")
> + fi
> + if [ "x${MULTILIB_PREFIX_LIST}" = "x"]; then
> + echo "$GET_LIST"
> + else
> + for prefix in `echo ${MULTILIB_PREFIX_LIST}`; do
> + echo "$GET_LIST" | sed -e "s/^/$prefix\-/"
> + done
> fi
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-18 4:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-18 0:17 [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
2012-09-18 0:17 ` [PATCH v2] xserver-xorg: Modify RREPLACES for RCONFLICTS Saul Wold
2012-09-18 2:40 ` Otavio Salvador
2012-09-18 4:17 ` Saul Wold
2012-09-18 4:18 ` [PATCH] rootfs_rpm: add multilib prefix to rpm installed package list Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox