Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/1] dpkg: put start-stop-daemon in its own package
@ 2015-09-01 22:14 Joe Slater
  0 siblings, 0 replies; 5+ messages in thread
From: Joe Slater @ 2015-09-01 22:14 UTC (permalink / raw)
  To: openembedded-core

Also make it update-alternatives compatible and move
it to where busybox puts its version.

Make dpkg RDEPEND on dpkg-start-stop.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 6eec2cd..2d7cad0 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -11,7 +11,7 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte
 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl"
 RDEPENDS_${PN}_class-native = "xz-native"
 
-inherit autotools gettext perlnative pkgconfig systemd
+inherit autotools gettext perlnative pkgconfig systemd update-alternatives
 
 python () {
     if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
@@ -43,6 +43,12 @@ do_configure () {
 }
 
 do_install_append () {
+	if [ -e ${D}${sbindir}/start-stop-daemon ]; then
+		mkdir -p ${D}${base_sbindir}
+		mv ${D}${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon
+		rmdir --ignore-fail-on-non-empty ${D}${sbindir}
+	fi
+
 	if [ "${PN}" = "dpkg-native" ]; then
 		# update-alternatives doesn't have an offline mode
 		rm ${D}${bindir}/update-alternatives
@@ -67,6 +73,18 @@ PROV_class-native = ""
 
 PROVIDES += "${PROV}"
 
+# split out start-stop-daemon to its own package
+#
+PACKAGES =+ "${PN}-start-stop"
+FILES_${PN}-start-stop = "${base_sbindir}/start-stop-daemon.dpkg"
+
+ALTERNATIVE_PRIORITY="100"
+ALTERNATIVE_${PN}-start-stop = "start-stop-daemon"
+ALTERNATIVE_LINK_NAME[start-stop-daemon]="${base_sbindir}/start-stop-daemon"
+
+RDEPENDS_${PN} += "${PN}-start-stop"
+#
+
 PACKAGES =+ "update-alternatives-dpkg"
 FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
 RPROVIDES_update-alternatives-dpkg += "update-alternatives"
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 0/1] dpkg: put start-stop-daemon in its own package
@ 2015-09-08 16:20 Joe Slater
  2015-09-08 16:20 ` [PATCH 1/1] " Joe Slater
  0 siblings, 1 reply; 5+ messages in thread
From: Joe Slater @ 2015-09-08 16:20 UTC (permalink / raw)
  To: openembedded-core

I thought I sent this a week or two ago, but maybe I didn't.

Joe Slater (1):
  dpkg: put start-stop-daemon in its own package

 meta/recipes-devtools/dpkg/dpkg.inc |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

-- 
1.7.9.5



^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/1] dpkg: put start-stop-daemon in its own package
  2015-09-08 16:20 [PATCH 0/1] dpkg: put start-stop-daemon in its own package Joe Slater
@ 2015-09-08 16:20 ` Joe Slater
  2015-09-08 18:21   ` Andreas Oberritter
  0 siblings, 1 reply; 5+ messages in thread
From: Joe Slater @ 2015-09-08 16:20 UTC (permalink / raw)
  To: openembedded-core

Also make it update-alternatives compatible and move
it to where busybox puts its version.

Make dpkg RDEPEND on dpkg-start-stop.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 6eec2cd..2d7cad0 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -11,7 +11,7 @@ DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alte
 RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl"
 RDEPENDS_${PN}_class-native = "xz-native"
 
-inherit autotools gettext perlnative pkgconfig systemd
+inherit autotools gettext perlnative pkgconfig systemd update-alternatives
 
 python () {
     if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
@@ -43,6 +43,12 @@ do_configure () {
 }
 
 do_install_append () {
+	if [ -e ${D}${sbindir}/start-stop-daemon ]; then
+		mkdir -p ${D}${base_sbindir}
+		mv ${D}${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon
+		rmdir --ignore-fail-on-non-empty ${D}${sbindir}
+	fi
+
 	if [ "${PN}" = "dpkg-native" ]; then
 		# update-alternatives doesn't have an offline mode
 		rm ${D}${bindir}/update-alternatives
@@ -67,6 +73,18 @@ PROV_class-native = ""
 
 PROVIDES += "${PROV}"
 
+# split out start-stop-daemon to its own package
+#
+PACKAGES =+ "${PN}-start-stop"
+FILES_${PN}-start-stop = "${base_sbindir}/start-stop-daemon.dpkg"
+
+ALTERNATIVE_PRIORITY="100"
+ALTERNATIVE_${PN}-start-stop = "start-stop-daemon"
+ALTERNATIVE_LINK_NAME[start-stop-daemon]="${base_sbindir}/start-stop-daemon"
+
+RDEPENDS_${PN} += "${PN}-start-stop"
+#
+
 PACKAGES =+ "update-alternatives-dpkg"
 FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
 RPROVIDES_update-alternatives-dpkg += "update-alternatives"
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] dpkg: put start-stop-daemon in its own package
  2015-09-08 16:20 ` [PATCH 1/1] " Joe Slater
@ 2015-09-08 18:21   ` Andreas Oberritter
  2015-09-09  0:14     ` Slater, Joseph
  0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2015-09-08 18:21 UTC (permalink / raw)
  To: openembedded-core

Hello Joe,

On 08.09.2015 18:20, Joe Slater wrote:
> @@ -67,6 +73,18 @@ PROV_class-native = ""
>  
>  PROVIDES += "${PROV}"
>  
> +# split out start-stop-daemon to its own package
> +#
> +PACKAGES =+ "${PN}-start-stop"
> +FILES_${PN}-start-stop = "${base_sbindir}/start-stop-daemon.dpkg"
> +
> +ALTERNATIVE_PRIORITY="100"
> +ALTERNATIVE_${PN}-start-stop = "start-stop-daemon"
> +ALTERNATIVE_LINK_NAME[start-stop-daemon]="${base_sbindir}/start-stop-daemon"
> +
> +RDEPENDS_${PN} += "${PN}-start-stop"
> +#
> +

I think you should omit the comment, because it only describes the obvious.

How about using ${PN}-start-stop-daemon?

Regards,
Andreas


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] dpkg: put start-stop-daemon in its own package
  2015-09-08 18:21   ` Andreas Oberritter
@ 2015-09-09  0:14     ` Slater, Joseph
  0 siblings, 0 replies; 5+ messages in thread
From: Slater, Joseph @ 2015-09-09  0:14 UTC (permalink / raw)
  To: Andreas Oberritter, openembedded-core@lists.openembedded.org

That's fine with me.  I'll rename the package and eliminate the comment.   Joe

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-
> bounces@lists.openembedded.org] On Behalf Of Andreas Oberritter
> Sent: Tuesday, September 08, 2015 11:21 AM
> To: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [oe-core][PATCH 1/1] dpkg: put start-stop-daemon in its own package
> 
> Hello Joe,
> 
> On 08.09.2015 18:20, Joe Slater wrote:
> > @@ -67,6 +73,18 @@ PROV_class-native = ""
> >
> >  PROVIDES += "${PROV}"
> >
> > +# split out start-stop-daemon to its own package
> > +#
> > +PACKAGES =+ "${PN}-start-stop"
> > +FILES_${PN}-start-stop = "${base_sbindir}/start-stop-daemon.dpkg"
> > +
> > +ALTERNATIVE_PRIORITY="100"
> > +ALTERNATIVE_${PN}-start-stop = "start-stop-daemon"
> > +ALTERNATIVE_LINK_NAME[start-stop-daemon]="${base_sbindir}/start-stop-daemon"
> > +
> > +RDEPENDS_${PN} += "${PN}-start-stop"
> > +#
> > +
> 
> I think you should omit the comment, because it only describes the obvious.
> 
> How about using ${PN}-start-stop-daemon?
> 
> Regards,
> Andreas
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-09-09  0:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-08 16:20 [PATCH 0/1] dpkg: put start-stop-daemon in its own package Joe Slater
2015-09-08 16:20 ` [PATCH 1/1] " Joe Slater
2015-09-08 18:21   ` Andreas Oberritter
2015-09-09  0:14     ` Slater, Joseph
  -- strict thread matches above, loose matches on Subject: below --
2015-09-01 22:14 Joe Slater

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox