Patchwork kernel: remove unused 'etc' directory

login
register
mail settings
Submitter Mark Asselstine
Date Sept. 12, 2012, 1:41 p.m.
Message ID <1347457260-25574-1-git-send-email-mark.asselstine@windriver.com>
Download mbox | patch
Permalink /patch/36427/
State New
Headers show

Comments

Mark Asselstine - Sept. 12, 2012, 1:41 p.m.
Along with checks to remove empty modprobe.d and modules-load.d
directories we can add a similar check and removal of the etc
directory. This will avoid warnings by the sanity checker.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
---

There is some concern that removing this directory could cause issues
if folks are adding to etc in a bbappend and not checking for and
creating this directory. I don't believe this is an issue as if you
want to add something to etc it should be done as part of a
populate_packages_prepend or earlier since there are sanity checks run
as part of populate_packages, so the removal here is being done at the
latest possible point in the process (populate_packages_prepend in a
bbappend will run before the populate_packages_prepend in
kernel.bbclass).

 meta/classes/kernel.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Sept. 12, 2012, 6:20 p.m.
I assume this patch is for Denzil?  It seems that the current OE-Core 
master has etc in that list.

Please confirm

Sau!

On 09/12/2012 06:41 AM, Mark Asselstine wrote:
> Along with checks to remove empty modprobe.d and modules-load.d
> directories we can add a similar check and removal of the etc
> directory. This will avoid warnings by the sanity checker.
>
> Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>
> There is some concern that removing this directory could cause issues
> if folks are adding to etc in a bbappend and not checking for and
> creating this directory. I don't believe this is an issue as if you
> want to add something to etc it should be done as part of a
> populate_packages_prepend or earlier since there are sanity checks run
> as part of populate_packages, so the removal here is being done at the
> latest possible point in the process (populate_packages_prepend in a
> bbappend will run before the populate_packages_prepend in
> kernel.bbclass).
>
>   meta/classes/kernel.bbclass |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 5e04fda..decf6f5 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -468,7 +468,7 @@ python populate_packages_prepend () {
>       # avoid warnings. removedirs only raises an OSError if an empty
>       # directory cannot be removed.
>       dvar = d.getVar('PKGD', True)
> -    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
> +    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc/" % (dvar)]:
>           if len(os.listdir(dir)) == 0:
>               os.rmdir(dir)
>
>
Mark Asselstine - Sept. 12, 2012, 7:35 p.m.
On September 12, 2012 11:20:05 Saul Wold wrote:
> I assume this patch is for Denzil?  It seems that the current OE-Core
> master has etc in that list.
> 
> Please confirm
> 
> Sau!

Saul,

Sorry I got mixed up on my branches there and didn't notice your change, 
thanks for straightening me out. Scott any chance we can get Saul's commit 
963742f5a9bc [kernel: Fix packaging issue] cherry-picked to Denzil?

Mark

> 
> On 09/12/2012 06:41 AM, Mark Asselstine wrote:
> > Along with checks to remove empty modprobe.d and modules-load.d
> > directories we can add a similar check and removal of the etc
> > directory. This will avoid warnings by the sanity checker.
> > 
> > Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
> > CC: Bruce Ashfield <bruce.ashfield@windriver.com>
> > ---
> > 
> > There is some concern that removing this directory could cause issues
> > if folks are adding to etc in a bbappend and not checking for and
> > creating this directory. I don't believe this is an issue as if you
> > want to add something to etc it should be done as part of a
> > populate_packages_prepend or earlier since there are sanity checks run
> > as part of populate_packages, so the removal here is being done at the
> > latest possible point in the process (populate_packages_prepend in a
> > bbappend will run before the populate_packages_prepend in
> > kernel.bbclass).
> > 
> >   meta/classes/kernel.bbclass |    2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > index 5e04fda..decf6f5 100644
> > --- a/meta/classes/kernel.bbclass
> > +++ b/meta/classes/kernel.bbclass
> > @@ -468,7 +468,7 @@ python populate_packages_prepend () {
> > 
> >       # avoid warnings. removedirs only raises an OSError if an empty
> >       # directory cannot be removed.
> >       dvar = d.getVar('PKGD', True)
> > 
> > -    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" %
> > (dvar)]:> 
> > +    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % 
(dvar), "%s/etc/" % (dvar)]:
> >           if len(os.listdir(dir)) == 0:
> >               os.rmdir(dir)
Scott Garman - Sept. 18, 2012, 4:39 p.m.
On 09/12/2012 12:35 PM, Mark Asselstine wrote:
> On September 12, 2012 11:20:05 Saul Wold wrote:
>> I assume this patch is for Denzil?  It seems that the current OE-Core
>> master has etc in that list.
>>
>> Please confirm
>>
>> Sau!
>
> Saul,
>
> Sorry I got mixed up on my branches there and didn't notice your change,
> thanks for straightening me out. Scott any chance we can get Saul's commit
> 963742f5a9bc [kernel: Fix packaging issue] cherry-picked to Denzil?
>
> Mark

Hi Mark,

Yes, I have just pulled that into my sgarman/denzil-next branches, to be 
queued up for Autobuilder testing ASAP.

Scott
Mark Asselstine - Sept. 18, 2012, 6:04 p.m.
On September 18, 2012 09:39:46 Scott Garman wrote:
> On 09/12/2012 12:35 PM, Mark Asselstine wrote:
> > On September 12, 2012 11:20:05 Saul Wold wrote:
> >> I assume this patch is for Denzil?  It seems that the current OE-Core
> >> master has etc in that list.
> >> 
> >> Please confirm
> >> 
> >> Sau!
> > 
> > Saul,
> > 
> > Sorry I got mixed up on my branches there and didn't notice your change,
> > thanks for straightening me out. Scott any chance we can get Saul's commit
> > 963742f5a9bc [kernel: Fix packaging issue] cherry-picked to Denzil?
> > 
> > Mark
> 
> Hi Mark,
> 
> Yes, I have just pulled that into my sgarman/denzil-next branches, to be
> queued up for Autobuilder testing ASAP.

Thanks Scott and Saul. Sorry for the initial confusion. I will be sure to look 
closer at the tree/branches next time around.

Mark

> 
> Scott
> 
> --
> Scott Garman
> Embedded Linux Engineer - Yocto Project
> Intel Open Source Technology Center

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5e04fda..decf6f5 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -468,7 +468,7 @@  python populate_packages_prepend () {
     # avoid warnings. removedirs only raises an OSError if an empty
     # directory cannot be removed.
     dvar = d.getVar('PKGD', True)
-    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar)]:
+    for dir in ["%s/etc/modprobe.d" % (dvar), "%s/etc/modules-load.d" % (dvar), "%s/etc/" % (dvar)]:
         if len(os.listdir(dir)) == 0:
             os.rmdir(dir)