[gentoo-embedded] crossdev-wrappers openrc patch

[gentoo-embedded] crossdev-wrappers openrc patch

[Ahmed Ammar]

[-- Attachment #1: Type: text/plain, Size: 133 bytes --]

Hello,

I have attached a small patch for the wrappers to fix compatibility with
openrc.

-- 
Ahmed Ammar (b33fc0d3 [at] gentoo.org)

[-- Attachment #2: crossdev-wrappers-20080622.ebuild.patch --]
[-- Type: text/x-patch, Size: 330 bytes --]

--- crossdev-wrappers-20080622.ebuild.orig	2008-06-22 23:21:58.000000000 +0300
+++ crossdev-wrappers-20080622.ebuild	2008-08-04 09:25:00.000000000 +0300
@@ -20,6 +20,10 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	if has_version 'sys-apps/openrc' ; then
+		epatch "$FILESDIR"/${PN}-openrc-fix.patch
+	fi
 }
 
 src_compile() {

[-- Attachment #3: crossdev-wrappers-openrc-fix.patch --]
[-- Type: text/x-patch, Size: 471 bytes --]

--- /var/tmp/portage/sys-devel/crossdev-wrappers-20080622/work/crossdev-wrappers/cross-fix-root	2008-06-19 07:56:02.000000000 +0300
+++ /usr/bin/cross-fix-root	2008-08-04 09:18:17.000000000 +0300
@@ -45,4 +45,4 @@
 fix_pc_files ${CROSS_ROOT}
 pc_count=$?
 :
-( . /sbin/functions.sh ; einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" )
+( . /lib/rc/sh/functions.sh ; /lib/rc/bin/einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" )

Re: [gentoo-embedded] crossdev-wrappers openrc patch

[Roy Marples]

On Mon, 2008-08-04 at 09:29 +0300, Ahmed Ammar wrote:
> I have attached a small patch for the wrappers to fix compatibility with
> openrc.

/etc/init.d/functions.sh always exists and points correctly for
baselayout-1 and OpenRC. You should not have to reference einfo by full
path either.

Thanks

Roy

Re: [gentoo-embedded] crossdev-wrappers openrc patch

[Ahmed Ammar]

On Mon, 2008-08-04 at 07:51 +0100, Roy Marples wrote:
> On Mon, 2008-08-04 at 09:29 +0300, Ahmed Ammar wrote:
> > I have attached a small patch for the wrappers to fix compatibility with
> > openrc.
> 
> /etc/init.d/functions.sh always exists and points correctly for
> baselayout-1 and OpenRC. You should not have to reference einfo by full
> path either.

for openrc einfo isn't in the user path so it must be called
explicitly. /etc/init.d/functions.sh might be a good shout though.

Regards,

-- 
Ahmed Ammar (b33fc0d3 [at] gentoo.org)

Re: [gentoo-embedded] crossdev-wrappers openrc patch

[Roy Marples]

On Mon, 2008-08-04 at 10:49 +0300, Ahmed Ammar wrote:
> On Mon, 2008-08-04 at 07:51 +0100, Roy Marples wrote:
> > On Mon, 2008-08-04 at 09:29 +0300, Ahmed Ammar wrote:
> > > I have attached a small patch for the wrappers to fix compatibility with
> > > openrc.
> > 
> > /etc/init.d/functions.sh always exists and points correctly for
> > baselayout-1 and OpenRC. You should not have to reference einfo by full
> > path either.
> 
> for openrc einfo isn't in the user path so it must be called
> explicitly. /etc/init.d/functions.sh might be a good shout though.

The act of sourcing /etc/init.d/functions.sh puts einfo into $PATH :)

Thanks

Roy

Re: [gentoo-embedded] crossdev-wrappers openrc patch

[Ahmed Ammar]

[-- Attachment #1: Type: text/plain, Size: 790 bytes --]

On Mon, 2008-08-04 at 09:00 +0100, Roy Marples wrote:
> On Mon, 2008-08-04 at 10:49 +0300, Ahmed Ammar wrote:
> > On Mon, 2008-08-04 at 07:51 +0100, Roy Marples wrote:
> > > On Mon, 2008-08-04 at 09:29 +0300, Ahmed Ammar wrote:
> > > > I have attached a small patch for the wrappers to fix compatibility with
> > > > openrc.
> > > 
> > > /etc/init.d/functions.sh always exists and points correctly for
> > > baselayout-1 and OpenRC. You should not have to reference einfo by full
> > > path either.
> > 
> > for openrc einfo isn't in the user path so it must be called
> > explicitly. /etc/init.d/functions.sh might be a good shout though.
> 
> The act of sourcing /etc/init.d/functions.sh puts einfo into $PATH :)

Indeed, slow day =)

Regards,

-- 
Ahmed Ammar (b33fc0d3 [at] gentoo.org)

[-- Attachment #2: crossdev-wrappers-openrc-fix.patch --]
[-- Type: text/x-patch, Size: 379 bytes --]

--- cross-fix-root.orig	2008-06-19 07:56:02.000000000 +0300
+++ cross-fix-root	2008-08-04 11:17:25.000000000 +0300
@@ -45,4 +45,4 @@
 fix_pc_files ${CROSS_ROOT}
 pc_count=$?
 :
-( . /sbin/functions.sh ; einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" )
+( . /etc/init.d/functions.sh ; einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" )