* [PATCH V2 0/3] fix install package "postinst-intercept oprofileui avahi" to image failed
@ 2014-11-11 10:52 Hongxu Jia
2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Hongxu Jia @ 2014-11-11 10:52 UTC (permalink / raw)
To: openembedded-core, ross.burton
Changed in V2:
- Drop the fix of pointercal-xinput, it didn't generate recipe_name
on purpose.
- Rename package, from avahi-daemon to avahi, and oprofileui-viewer
to oprofileui, add RPROVIDES for compatibility
vim local.conf
...
IMAGE_INSTALL_append = " oprofileui avahi"
...
bitbake core-image-minimal
//Hongxu
The following changes since commit 7bd03ac24114b2c6015144a37e0c3fb4037baea6:
bitbake: toastergui: fix invalid build url usage (2014-11-06 16:45:23 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/fix-nonexist-pkg
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-nonexist-pkg
Hongxu Jia (3):
avahi.inc: rename package to use avahi to instead of avahi-daemon
oprofileui: rename package to use oprofileui to instead of
oprofileui-viewer
postinst-intercept: rename recipe for nativesdk only
meta/recipes-connectivity/avahi/avahi.inc | 29 +++++++++++-----------
..._1.0.bb => nativesdk-postinst-intercept_1.0.bb} | 6 ++---
meta/recipes-kernel/oprofile/oprofileui_git.bb | 8 +++---
3 files changed, 21 insertions(+), 22 deletions(-)
rename meta/recipes-devtools/postinst-intercept/{postinst-intercept_1.0.bb => nativesdk-postinst-intercept_1.0.bb} (83%)
--
1.9.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-11 10:52 [PATCH V2 0/3] fix install package "postinst-intercept oprofileui avahi" to image failed Hongxu Jia @ 2014-11-11 10:52 ` Hongxu Jia 2014-11-12 6:51 ` Hongxu Jia 2014-11-12 10:27 ` Koen Kooi 2014-11-11 10:52 ` [PATCH 2/3] oprofileui: rename package to use oprofileui to instead of oprofileui-viewer Hongxu Jia 2014-11-11 10:52 ` [PATCH 3/3] postinst-intercept: rename recipe for nativesdk only Hongxu Jia 2 siblings, 2 replies; 10+ messages in thread From: Hongxu Jia @ 2014-11-11 10:52 UTC (permalink / raw) To: openembedded-core, ross.burton The package avahi does not exist, as SUMMARY said, we should use avahi-daemon to instead. It avoids the do_rootfs failure while IMAGE_INSTALL += "avahi" For compatibility, let avahi to provide avahi-daemon. [YOCTO #6937] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-connectivity/avahi/avahi.inc | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index b060437..581d51b 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -29,8 +29,8 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://reuseport-check.patch \ " -USERADD_PACKAGES = "avahi-daemon avahi-autoipd" -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ +USERADD_PACKAGES = "avahi avahi-autoipd" +USERADD_PARAM_avahi = "--system --home /var/run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" @@ -71,11 +71,10 @@ do_configure_prepend() { } -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" +PACKAGES =+ "libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" -# As avahi doesn't put any files into PN, clear the files list to avoid problems -# if extra libraries appear. -FILES_avahi = "" +# For compatibility, let avahi to provide avahi-daemon +RPROVIDES_${PN} = "${PN}-daemon" FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/avahi/avahi-autoipd.action \ ${sysconfdir}/dhcp/*/avahi-autoipd \ @@ -83,7 +82,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ ${sysconfdir}/udhcpc.d/99avahi-autoipd" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ +FILES_${PN} = "${sbindir}/avahi-daemon \ ${sysconfdir}/avahi/avahi-daemon.conf \ ${sysconfdir}/avahi/hosts \ ${sysconfdir}/avahi/services \ @@ -102,10 +101,10 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" FILES_avahi-utils = "${bindir}/avahi-*" -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" +RDEPENDS_${PN}-dev = "avahi (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" # uclibc has no nss -RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" +RRECOMMENDS_avahi_append_libc-glibc = " libnss-mdns" RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" @@ -113,11 +112,11 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev" RRECOMMENDS_avahi-dev[nodeprrecs] = "1" -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" +CONFFILES_avahi = "${sysconfdir}/avahi/avahi-daemon.conf" -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_PACKAGES = "avahi avahi-dnsconfd" +INITSCRIPT_NAME_avahi = "avahi-daemon" +INITSCRIPT_PARAMS_avahi = "defaults 21 19" INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" @@ -141,13 +140,13 @@ do_install() { # At the time the postinst runs, dbus might not be setup so only restart if running # Don't exit early, because update-rc.d needs to run subsequently. -pkg_postinst_avahi-daemon () { +pkg_postinst_avahi () { if [ -z "$D" ]; then killall -q -HUP dbus-daemon || true fi } -pkg_postrm_avahi-daemon () { +pkg_postrm_avahi () { deluser avahi || true delgroup avahi || true } -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia @ 2014-11-12 6:51 ` Hongxu Jia 2014-11-12 10:27 ` Koen Kooi 1 sibling, 0 replies; 10+ messages in thread From: Hongxu Jia @ 2014-11-12 6:51 UTC (permalink / raw) To: openembedded-core, ross.burton [-- Attachment #1: Type: text/plain, Size: 4816 bytes --] On 11/11/2014 06:52 PM, Hongxu Jia wrote: > The package avahi does not exist, as SUMMARY said, we should > use avahi-daemon to instead. It avoids the do_rootfs failure > while IMAGE_INSTALL += "avahi" > > For compatibility, let avahi to provide avahi-daemon. Fix comments typo, s/let avahi to provide/let avahi provide/ and s/ let oprofileui to provide/let oprofileui provide/ Donot send V3, just updating git repository: git://git.pokylinux.org/poky-contrib hongxu/fix-nonexist-pkg http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-nonexist-pkg //Hongxu > [YOCTO #6937] > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > meta/recipes-connectivity/avahi/avahi.inc | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc > index b060437..581d51b 100644 > --- a/meta/recipes-connectivity/avahi/avahi.inc > +++ b/meta/recipes-connectivity/avahi/avahi.inc > @@ -29,8 +29,8 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ > file://reuseport-check.patch \ > " > > -USERADD_PACKAGES = "avahi-daemon avahi-autoipd" > -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ > +USERADD_PACKAGES = "avahi avahi-autoipd" > +USERADD_PARAM_avahi = "--system --home /var/run/avahi-daemon \ > --no-create-home --shell /bin/false \ > --user-group avahi" > > @@ -71,11 +71,10 @@ do_configure_prepend() { > } > > > -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" > +PACKAGES =+ "libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" > > -# As avahi doesn't put any files into PN, clear the files list to avoid problems > -# if extra libraries appear. > -FILES_avahi = "" > +# For compatibility, let avahi to provide avahi-daemon > +RPROVIDES_${PN} = "${PN}-daemon" > FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ > ${sysconfdir}/avahi/avahi-autoipd.action \ > ${sysconfdir}/dhcp/*/avahi-autoipd \ > @@ -83,7 +82,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ > ${sysconfdir}/udhcpc.d/99avahi-autoipd" > FILES_libavahi-common = "${libdir}/libavahi-common.so.*" > FILES_libavahi-core = "${libdir}/libavahi-core.so.*" > -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ > +FILES_${PN} = "${sbindir}/avahi-daemon \ > ${sysconfdir}/avahi/avahi-daemon.conf \ > ${sysconfdir}/avahi/hosts \ > ${sysconfdir}/avahi/services \ > @@ -102,10 +101,10 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" > FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" > FILES_avahi-utils = "${bindir}/avahi-*" > > -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" > +RDEPENDS_${PN}-dev = "avahi (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" > > # uclibc has no nss > -RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" > +RRECOMMENDS_avahi_append_libc-glibc = " libnss-mdns" > RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" > > RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" > @@ -113,11 +112,11 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev" > > RRECOMMENDS_avahi-dev[nodeprrecs] = "1" > > -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" > +CONFFILES_avahi = "${sysconfdir}/avahi/avahi-daemon.conf" > > -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" > -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" > -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" > +INITSCRIPT_PACKAGES = "avahi avahi-dnsconfd" > +INITSCRIPT_NAME_avahi = "avahi-daemon" > +INITSCRIPT_PARAMS_avahi = "defaults 21 19" > INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" > INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" > > @@ -141,13 +140,13 @@ do_install() { > # At the time the postinst runs, dbus might not be setup so only restart if running > # Don't exit early, because update-rc.d needs to run subsequently. > > -pkg_postinst_avahi-daemon () { > +pkg_postinst_avahi () { > if [ -z "$D" ]; then > killall -q -HUP dbus-daemon || true > fi > } > > -pkg_postrm_avahi-daemon () { > +pkg_postrm_avahi () { > deluser avahi || true > delgroup avahi || true > } [-- Attachment #2: Type: text/html, Size: 5683 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia 2014-11-12 6:51 ` Hongxu Jia @ 2014-11-12 10:27 ` Koen Kooi 2014-11-13 1:28 ` Hongxu Jia 1 sibling, 1 reply; 10+ messages in thread From: Koen Kooi @ 2014-11-12 10:27 UTC (permalink / raw) To: Hongxu Jia; +Cc: openembedded-core > Op 11 nov. 2014, om 11:52 heeft Hongxu Jia <hongxu.jia@windriver.com> het volgende geschreven: > > The package avahi does not exist, as SUMMARY said, we should > use avahi-daemon to instead. It avoids the do_rootfs failure > while IMAGE_INSTALL += "avahi" > > For compatibility, let avahi to provide avahi-daemon. As stated before: 1) Fix your IMAGE_INSTALL 2) This breaks upgrade paths Do you *really* want to break existing installs just so you can pretend that your recipename==package name assumption isn't wrong? > > [YOCTO #6937] > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > meta/recipes-connectivity/avahi/avahi.inc | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc > index b060437..581d51b 100644 > --- a/meta/recipes-connectivity/avahi/avahi.inc > +++ b/meta/recipes-connectivity/avahi/avahi.inc > @@ -29,8 +29,8 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ > file://reuseport-check.patch \ > " > > -USERADD_PACKAGES = "avahi-daemon avahi-autoipd" > -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ > +USERADD_PACKAGES = "avahi avahi-autoipd" > +USERADD_PARAM_avahi = "--system --home /var/run/avahi-daemon \ > --no-create-home --shell /bin/false \ > --user-group avahi" > > @@ -71,11 +71,10 @@ do_configure_prepend() { > } > > > -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" > +PACKAGES =+ "libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" > > -# As avahi doesn't put any files into PN, clear the files list to avoid problems > -# if extra libraries appear. > -FILES_avahi = "" > +# For compatibility, let avahi to provide avahi-daemon > +RPROVIDES_${PN} = "${PN}-daemon" > FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ > ${sysconfdir}/avahi/avahi-autoipd.action \ > ${sysconfdir}/dhcp/*/avahi-autoipd \ > @@ -83,7 +82,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ > ${sysconfdir}/udhcpc.d/99avahi-autoipd" > FILES_libavahi-common = "${libdir}/libavahi-common.so.*" > FILES_libavahi-core = "${libdir}/libavahi-core.so.*" > -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ > +FILES_${PN} = "${sbindir}/avahi-daemon \ > ${sysconfdir}/avahi/avahi-daemon.conf \ > ${sysconfdir}/avahi/hosts \ > ${sysconfdir}/avahi/services \ > @@ -102,10 +101,10 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" > FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" > FILES_avahi-utils = "${bindir}/avahi-*" > > -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" > +RDEPENDS_${PN}-dev = "avahi (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" > > # uclibc has no nss > -RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" > +RRECOMMENDS_avahi_append_libc-glibc = " libnss-mdns" > RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" > > RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" > @@ -113,11 +112,11 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev" > > RRECOMMENDS_avahi-dev[nodeprrecs] = "1" > > -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" > +CONFFILES_avahi = "${sysconfdir}/avahi/avahi-daemon.conf" > > -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" > -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" > -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" > +INITSCRIPT_PACKAGES = "avahi avahi-dnsconfd" > +INITSCRIPT_NAME_avahi = "avahi-daemon" > +INITSCRIPT_PARAMS_avahi = "defaults 21 19" > INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" > INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" > > @@ -141,13 +140,13 @@ do_install() { > # At the time the postinst runs, dbus might not be setup so only restart if running > # Don't exit early, because update-rc.d needs to run subsequently. > > -pkg_postinst_avahi-daemon () { > +pkg_postinst_avahi () { > if [ -z "$D" ]; then > killall -q -HUP dbus-daemon || true > fi > } > > -pkg_postrm_avahi-daemon () { > +pkg_postrm_avahi () { > deluser avahi || true > delgroup avahi || true > } > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-12 10:27 ` Koen Kooi @ 2014-11-13 1:28 ` Hongxu Jia 2014-11-13 1:43 ` Hongxu Jia 0 siblings, 1 reply; 10+ messages in thread From: Hongxu Jia @ 2014-11-13 1:28 UTC (permalink / raw) To: Koen Kooi; +Cc: openembedded-core On 11/12/2014 06:27 PM, Koen Kooi wrote: >> Op 11 nov. 2014, om 11:52 heeft Hongxu Jia <hongxu.jia@windriver.com> het volgende geschreven: >> >> The package avahi does not exist, as SUMMARY said, we should >> use avahi-daemon to instead. It avoids the do_rootfs failure >> while IMAGE_INSTALL += "avahi" >> >> For compatibility, let avahi to provide avahi-daemon. > As stated before: > > 1) Fix your IMAGE_INSTALL Could you describe what's wrong with IMAGE_INSTALL? I have no idea about it. > 2) This breaks upgrade paths > > Do you *really* want to break existing installs just so you can pretend that your recipename==package name assumption isn't wrong? What does *upgrade paths* means? //Hongxu > >> [YOCTO #6937] >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> meta/recipes-connectivity/avahi/avahi.inc | 29 ++++++++++++++--------------- >> 1 file changed, 14 insertions(+), 15 deletions(-) >> >> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc >> index b060437..581d51b 100644 >> --- a/meta/recipes-connectivity/avahi/avahi.inc >> +++ b/meta/recipes-connectivity/avahi/avahi.inc >> @@ -29,8 +29,8 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ >> file://reuseport-check.patch \ >> " >> >> -USERADD_PACKAGES = "avahi-daemon avahi-autoipd" >> -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ >> +USERADD_PACKAGES = "avahi avahi-autoipd" >> +USERADD_PARAM_avahi = "--system --home /var/run/avahi-daemon \ >> --no-create-home --shell /bin/false \ >> --user-group avahi" >> >> @@ -71,11 +71,10 @@ do_configure_prepend() { >> } >> >> >> -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" >> +PACKAGES =+ "libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" >> >> -# As avahi doesn't put any files into PN, clear the files list to avoid problems >> -# if extra libraries appear. >> -FILES_avahi = "" >> +# For compatibility, let avahi to provide avahi-daemon >> +RPROVIDES_${PN} = "${PN}-daemon" >> FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ >> ${sysconfdir}/avahi/avahi-autoipd.action \ >> ${sysconfdir}/dhcp/*/avahi-autoipd \ >> @@ -83,7 +82,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ >> ${sysconfdir}/udhcpc.d/99avahi-autoipd" >> FILES_libavahi-common = "${libdir}/libavahi-common.so.*" >> FILES_libavahi-core = "${libdir}/libavahi-core.so.*" >> -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ >> +FILES_${PN} = "${sbindir}/avahi-daemon \ >> ${sysconfdir}/avahi/avahi-daemon.conf \ >> ${sysconfdir}/avahi/hosts \ >> ${sysconfdir}/avahi/services \ >> @@ -102,10 +101,10 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" >> FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" >> FILES_avahi-utils = "${bindir}/avahi-*" >> >> -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" >> +RDEPENDS_${PN}-dev = "avahi (= ${EXTENDPKGV}) libavahi-core (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" >> >> # uclibc has no nss >> -RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" >> +RRECOMMENDS_avahi_append_libc-glibc = " libnss-mdns" >> RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" >> >> RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev glib-2.0-dev update-rc.d-dev" >> @@ -113,11 +112,11 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev" >> >> RRECOMMENDS_avahi-dev[nodeprrecs] = "1" >> >> -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" >> +CONFFILES_avahi = "${sysconfdir}/avahi/avahi-daemon.conf" >> >> -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" >> -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" >> -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" >> +INITSCRIPT_PACKAGES = "avahi avahi-dnsconfd" >> +INITSCRIPT_NAME_avahi = "avahi-daemon" >> +INITSCRIPT_PARAMS_avahi = "defaults 21 19" >> INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" >> INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" >> >> @@ -141,13 +140,13 @@ do_install() { >> # At the time the postinst runs, dbus might not be setup so only restart if running >> # Don't exit early, because update-rc.d needs to run subsequently. >> >> -pkg_postinst_avahi-daemon () { >> +pkg_postinst_avahi () { >> if [ -z "$D" ]; then >> killall -q -HUP dbus-daemon || true >> fi >> } >> >> -pkg_postrm_avahi-daemon () { >> +pkg_postrm_avahi () { >> deluser avahi || true >> delgroup avahi || true >> } >> -- >> 1.9.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-13 1:28 ` Hongxu Jia @ 2014-11-13 1:43 ` Hongxu Jia 2014-11-13 8:27 ` Anders Darander 0 siblings, 1 reply; 10+ messages in thread From: Hongxu Jia @ 2014-11-13 1:43 UTC (permalink / raw) To: Koen Kooi; +Cc: openembedded-core On 11/13/2014 09:28 AM, Hongxu Jia wrote: > On 11/12/2014 06:27 PM, Koen Kooi wrote: >>> Op 11 nov. 2014, om 11:52 heeft Hongxu Jia >>> <hongxu.jia@windriver.com> het volgende geschreven: >>> >>> The package avahi does not exist, as SUMMARY said, we should >>> use avahi-daemon to instead. It avoids the do_rootfs failure >>> while IMAGE_INSTALL += "avahi" >>> >>> For compatibility, let avahi to provide avahi-daemon. >> As stated before: >> >> 1) Fix your IMAGE_INSTALL > > Could you describe what's wrong with IMAGE_INSTALL? > I have no idea about it. > >> 2) This breaks upgrade paths >> >> Do you *really* want to break existing installs just so you can >> pretend that your recipename==package name assumption isn't wrong? > > What does *upgrade paths* means? > Do you mean use package management to upgrade the package, such as "smart upgrade". If yes, I think you are right, we could drop patch 1/3 and 2/3. //Hongxu > //Hongxu > >> >>> [YOCTO #6937] >>> >>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >>> --- >>> meta/recipes-connectivity/avahi/avahi.inc | 29 >>> ++++++++++++++--------------- >>> 1 file changed, 14 insertions(+), 15 deletions(-) >>> >>> diff --git a/meta/recipes-connectivity/avahi/avahi.inc >>> b/meta/recipes-connectivity/avahi/avahi.inc >>> index b060437..581d51b 100644 >>> --- a/meta/recipes-connectivity/avahi/avahi.inc >>> +++ b/meta/recipes-connectivity/avahi/avahi.inc >>> @@ -29,8 +29,8 @@ SRC_URI = >>> "http://avahi.org/download/avahi-${PV}.tar.gz \ >>> file://reuseport-check.patch \ >>> " >>> >>> -USERADD_PACKAGES = "avahi-daemon avahi-autoipd" >>> -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ >>> +USERADD_PACKAGES = "avahi avahi-autoipd" >>> +USERADD_PARAM_avahi = "--system --home /var/run/avahi-daemon \ >>> --no-create-home --shell /bin/false \ >>> --user-group avahi" >>> >>> @@ -71,11 +71,10 @@ do_configure_prepend() { >>> } >>> >>> >>> -PACKAGES =+ "avahi-daemon libavahi-common libavahi-core >>> libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui >>> avahi-autoipd avahi-utils" >>> +PACKAGES =+ "libavahi-common libavahi-core libavahi-client >>> avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" >>> >>> -# As avahi doesn't put any files into PN, clear the files list to >>> avoid problems >>> -# if extra libraries appear. >>> -FILES_avahi = "" >>> +# For compatibility, let avahi to provide avahi-daemon >>> +RPROVIDES_${PN} = "${PN}-daemon" >>> FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ >>> ${sysconfdir}/avahi/avahi-autoipd.action \ >>> ${sysconfdir}/dhcp/*/avahi-autoipd \ >>> @@ -83,7 +82,7 @@ FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ >>> ${sysconfdir}/udhcpc.d/99avahi-autoipd" >>> FILES_libavahi-common = "${libdir}/libavahi-common.so.*" >>> FILES_libavahi-core = "${libdir}/libavahi-core.so.*" >>> -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ >>> +FILES_${PN} = "${sbindir}/avahi-daemon \ >>> ${sysconfdir}/avahi/avahi-daemon.conf \ >>> ${sysconfdir}/avahi/hosts \ >>> ${sysconfdir}/avahi/services \ >>> @@ -102,10 +101,10 @@ FILES_libavahi-glib = >>> "${libdir}/libavahi-glib.so.*" >>> FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" >>> FILES_avahi-utils = "${bindir}/avahi-*" >>> >>> -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core >>> (= ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" >>> +RDEPENDS_${PN}-dev = "avahi (= ${EXTENDPKGV}) libavahi-core (= >>> ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})" >>> >>> # uclibc has no nss >>> -RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns" >>> +RRECOMMENDS_avahi_append_libc-glibc = " libnss-mdns" >>> RRECOMMENDS_${PN}_append_libc-glibc = " libnss-mdns" >>> >>> RRECOMMENDS_avahi-dev = "expat-dev libcap-dev libdaemon-dev dbus-dev >>> glib-2.0-dev update-rc.d-dev" >>> @@ -113,11 +112,11 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " >>> gettext-dev" >>> >>> RRECOMMENDS_avahi-dev[nodeprrecs] = "1" >>> >>> -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" >>> +CONFFILES_avahi = "${sysconfdir}/avahi/avahi-daemon.conf" >>> >>> -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" >>> -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" >>> -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" >>> +INITSCRIPT_PACKAGES = "avahi avahi-dnsconfd" >>> +INITSCRIPT_NAME_avahi = "avahi-daemon" >>> +INITSCRIPT_PARAMS_avahi = "defaults 21 19" >>> INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" >>> INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" >>> >>> @@ -141,13 +140,13 @@ do_install() { >>> # At the time the postinst runs, dbus might not be setup so only >>> restart if running >>> # Don't exit early, because update-rc.d needs to run subsequently. >>> >>> -pkg_postinst_avahi-daemon () { >>> +pkg_postinst_avahi () { >>> if [ -z "$D" ]; then >>> killall -q -HUP dbus-daemon || true >>> fi >>> } >>> >>> -pkg_postrm_avahi-daemon () { >>> +pkg_postrm_avahi () { >>> deluser avahi || true >>> delgroup avahi || true >>> } >>> -- >>> 1.9.1 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-13 1:43 ` Hongxu Jia @ 2014-11-13 8:27 ` Anders Darander 2014-11-13 10:04 ` Hongxu Jia 0 siblings, 1 reply; 10+ messages in thread From: Anders Darander @ 2014-11-13 8:27 UTC (permalink / raw) To: Hongxu Jia; +Cc: Koen Kooi, openembedded-core@lists.openembedded.org * Hongxu Jia <hongxu.jia@windriver.com> [141113 02:44]: > On 11/13/2014 09:28 AM, Hongxu Jia wrote: > > On 11/12/2014 06:27 PM, Koen Kooi wrote: > >>> Op 11 nov. 2014, om 11:52 heeft Hongxu Jia > >>> <hongxu.jia@windriver.com> het volgende geschreven: > >>> The package avahi does not exist, as SUMMARY said, we should > >>> use avahi-daemon to instead. It avoids the do_rootfs failure > >>> while IMAGE_INSTALL += "avahi" > >>> For compatibility, let avahi to provide avahi-daemon. > >> As stated before: > >> 1) Fix your IMAGE_INSTALL > > Could you describe what's wrong with IMAGE_INSTALL? > > I have no idea about it. Koen means that you should use IMAGE_INSTALL_append += "avahi-daemon" and not avahi... (I.e. package name, not recipe name). If you still insist on creating a package named avahi, you might as well create avahi as an empty package, RDEPEND'ing on all sub-packages. > >> 2) This breaks upgrade paths > >> Do you *really* want to break existing installs just so you can > >> pretend that your recipename==package name assumption isn't wrong? > > What does *upgrade paths* means? > Do you mean use package management to upgrade the > package, such as "smart upgrade". If yes, I think you are right, > we could drop patch 1/3 and 2/3. Yes, that's exactly what Koen talks about when it comes to ugrade paths. Cheers, Anders -- Anders Darander ChargeStorm AB / eStorm AB ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon 2014-11-13 8:27 ` Anders Darander @ 2014-11-13 10:04 ` Hongxu Jia 0 siblings, 0 replies; 10+ messages in thread From: Hongxu Jia @ 2014-11-13 10:04 UTC (permalink / raw) To: Koen Kooi, openembedded-core@lists.openembedded.org On 11/13/2014 04:27 PM, Anders Darander wrote: > Koen means that you should use > IMAGE_INSTALL_append += "avahi-daemon" > and not avahi... (I.e. package name, not recipe name). > > If you still insist on creating a package named avahi, you might as well > create avahi as an empty package, RDEPEND'ing on all sub-packages. > Oh, thanks, I know what you mean, please drop these patches //Hongxu ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] oprofileui: rename package to use oprofileui to instead of oprofileui-viewer 2014-11-11 10:52 [PATCH V2 0/3] fix install package "postinst-intercept oprofileui avahi" to image failed Hongxu Jia 2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia @ 2014-11-11 10:52 ` Hongxu Jia 2014-11-11 10:52 ` [PATCH 3/3] postinst-intercept: rename recipe for nativesdk only Hongxu Jia 2 siblings, 0 replies; 10+ messages in thread From: Hongxu Jia @ 2014-11-11 10:52 UTC (permalink / raw) To: openembedded-core, ross.burton The package oprofileui does not exist, so we use oprofileui-viewer to instead. It avoids the do_rootfs failure while IMAGE_INSTALL += "oprofileui" For compatibility, let oprofileui to provide oprofileui-viewer and use ${PN} to instead of the hardcode oprofileui. [YOCTO #6937] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-kernel/oprofile/oprofileui_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/oprofile/oprofileui_git.bb b/meta/recipes-kernel/oprofile/oprofileui_git.bb index bb69d54..8448ba3 100644 --- a/meta/recipes-kernel/oprofile/oprofileui_git.bb +++ b/meta/recipes-kernel/oprofile/oprofileui_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://git.yoctoproject.org/oprofileui" EXTRA_OECONF += "--enable-client --disable-server" -PACKAGES =+ "oprofileui-viewer" - -FILES_oprofileui-viewer = "${bindir}/oparchconv ${bindir}/oprofile-viewer ${datadir}/applications/ ${datadir}/oprofileui/ ${datadir}/icons" -RDEPENDS_oprofileui-viewer = "oprofile" +# For compatibility, let oprofileui to provide oprofileui-viewer +RPROVIDES_${PN} = "${PN}-viewer" +FILES_${PN} += "${datadir}/icons" +RDEPENDS_${PN} = "oprofile" -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] postinst-intercept: rename recipe for nativesdk only 2014-11-11 10:52 [PATCH V2 0/3] fix install package "postinst-intercept oprofileui avahi" to image failed Hongxu Jia 2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia 2014-11-11 10:52 ` [PATCH 2/3] oprofileui: rename package to use oprofileui to instead of oprofileui-viewer Hongxu Jia @ 2014-11-11 10:52 ` Hongxu Jia 2 siblings, 0 replies; 10+ messages in thread From: Hongxu Jia @ 2014-11-11 10:52 UTC (permalink / raw) To: openembedded-core, ross.burton The recipe postinst-intercept is only used for nativesdk, so we rename it from postinst-intercept to nativesdk-postinst-intercept. It avoids unnecessary build of postinst-intercept. [YOCTO #6937] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- ...ostinst-intercept_1.0.bb => nativesdk-postinst-intercept_1.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/postinst-intercept/{postinst-intercept_1.0.bb => nativesdk-postinst-intercept_1.0.bb} (83%) diff --git a/meta/recipes-devtools/postinst-intercept/postinst-intercept_1.0.bb b/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb similarity index 83% rename from meta/recipes-devtools/postinst-intercept/postinst-intercept_1.0.bb rename to meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb index 41b9a6e..7dc45c6 100644 --- a/meta/recipes-devtools/postinst-intercept/postinst-intercept_1.0.bb +++ b/meta/recipes-devtools/postinst-intercept/nativesdk-postinst-intercept_1.0.bb @@ -2,12 +2,12 @@ SUMMARY = "Postinstall scriptlets" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -FILES_${PN}_append_class-nativesdk = " ${datadir}/postinst-intercepts/*" +FILES_${PN}_append = " ${datadir}/postinst-intercepts/*" do_configure[noexec] = "1" do_compile[noexec] = "1" -do_install_append_class-nativesdk() { +do_install() { install -d ${D}${datadir}/postinst-intercepts install -m 755 ${COREBASE}/scripts/postinst-intercepts/postinst_intercept ${D}${datadir}/postinst-intercepts/ install -m 755 ${COREBASE}/scripts/postinst-intercepts/update_font_cache ${D}${datadir}/postinst-intercepts/ @@ -15,5 +15,5 @@ do_install_append_class-nativesdk() { install -m 755 ${COREBASE}/scripts/postinst-intercepts/update_pixbuf_cache ${D}${datadir}/postinst-intercepts/ } -BBCLASSEXTEND = "nativesdk" +inherit nativesdk INHIBIT_DEFAULT_DEPS = "1" -- 1.9.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-11-13 10:04 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-11 10:52 [PATCH V2 0/3] fix install package "postinst-intercept oprofileui avahi" to image failed Hongxu Jia 2014-11-11 10:52 ` [PATCH 1/3] avahi.inc: rename package to use avahi to instead of avahi-daemon Hongxu Jia 2014-11-12 6:51 ` Hongxu Jia 2014-11-12 10:27 ` Koen Kooi 2014-11-13 1:28 ` Hongxu Jia 2014-11-13 1:43 ` Hongxu Jia 2014-11-13 8:27 ` Anders Darander 2014-11-13 10:04 ` Hongxu Jia 2014-11-11 10:52 ` [PATCH 2/3] oprofileui: rename package to use oprofileui to instead of oprofileui-viewer Hongxu Jia 2014-11-11 10:52 ` [PATCH 3/3] postinst-intercept: rename recipe for nativesdk only Hongxu Jia
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.