Patchwork [v3,5/5] makedevs: Make count actually behave as a count for device blocks

login
register
mail settings
Submitter Peter Kjellerstedt
Date May 30, 2013, 12:18 p.m.
Message ID <d3bc55086bd5ab4f56dbad4d302beafc49fe0a84.1369916015.git.pkj@axis.com>
Download mbox | patch
Permalink /patch/50821/
State Accepted
Commit 59bb8e17c7361f54c6c0857a1fd7570142ed0721
Headers show

Comments

Peter Kjellerstedt - May 30, 2013, 12:18 p.m.
Previously count actually behaved as end, and did not take start into
account.
---
 meta/files/device_table-minimal.txt                      | 2 +-
 meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - May 30, 2013, 7:58 p.m.
On Thu, 2013-05-30 at 14:18 +0200, Peter Kjellerstedt wrote:
> Previously count actually behaved as end, and did not take start into
> account.
> ---
>  meta/files/device_table-minimal.txt                      | 2 +-
>  meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

No signed-off-by line :(

I merged the others.

Cheers,

Richard
Peter Kjellerstedt - May 31, 2013, 11:38 a.m.
> -----Original Message-----
> From: Richard Purdie [mailto:richard.purdie@linuxfoundation.org]
> Sent: den 30 maj 2013 21:58
> To: Peter Kjellerstedt
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH v3 5/5] makedevs: Make count actually
> behave as a count for device blocks
> 
> On Thu, 2013-05-30 at 14:18 +0200, Peter Kjellerstedt wrote:
> > Previously count actually behaved as end, and did not take start into
> > account.
> > ---
> >  meta/files/device_table-minimal.txt                      | 2 +-
> >  meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> No signed-off-by line :(
> 
> I merged the others.
> 
> Cheers,
> 
> Richard

Argh. The fact that we are not using Signed-off-by lines internally 
is not helping me...

I have sent an updated version of the fifth patch.

//Peter

Patch

diff --git a/meta/files/device_table-minimal.txt b/meta/files/device_table-minimal.txt
index c6e5463..02ed534 100644
--- a/meta/files/device_table-minimal.txt
+++ b/meta/files/device_table-minimal.txt
@@ -13,7 +13,7 @@ 
 /dev/apm_bios	c	660	0	46	10	134	-	-	-
 /dev/fb0	c	600	0	0	29	0	-	-	-
 /dev/hda	b	660	0	6	3	0	-	-	-
-/dev/hda	b	660	0	6	3	1	1	1	20
+/dev/hda	b	660	0	6	3	1	1	1	19
 /dev/kmem	c	640	0	15	1	2	-	-	-
 /dev/kmsg	c	600	0	0	1	11	-	-	-
 /dev/mem	c	640	0	15	1	1	-	-	-
diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
index 4bb316b..6c1f2fb 100644
--- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/makedevs.c
@@ -219,7 +219,7 @@  static int interpret_table_entry(char *line)
 			dev_t rdev;
 			char buf[80];
 
-			for (i = start; i < count; i++) {
+			for (i = start; i < start + count; i++) {
 				sprintf(buf, "%s%d", name, i);
 				sprintf(path, "%s/%s%d", rootdir, name, i);
 				/* FIXME:  MKDEV uses illicit insider knowledge of kernel