All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Paris <eparis@redhat.com>
To: Dave Airlie <airlied@gmail.com>
Cc: James Morris <jmorris@namei.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	sds@tycho.nsa.gov
Subject: Re: [GIT] Security subsystem changes for 2.6.33
Date: Mon, 15 Feb 2010 16:29:22 -0500	[thread overview]
Message-ID: <1266269362.24665.8.camel@localhost> (raw)
In-Reply-To: <21d7e9971002142046p2a3af2bak1a01bb7117db7841@mail.gmail.com>

On Mon, 2010-02-15 at 14:46 +1000, Dave Airlie wrote: 
> > Eric Paris (5):
> 
> >      SELinux: add .gitignore files for dynamic classes
> 
> This isn't such a good idea I've discovered after wasting half my day
> wondering why 2.6.33-rc8 oops in selinux
> code when vbetool runs.
> 
> The problem (not sure what we or git can do, hence Linus cc'ed) is:
> 
> a) git tree contains 2.6.32 + with old non-generated versions of
> flash.h and av_permissions.h
> b) git pull 2.6.33-rc8, nothing removes these old files, git status
> doesn't show them as they are now in .gitignore
> c) build 2.6.33, it picks up the include files from the old location
> not from the generated ones in the new tree.
> d) bad juju.
> 
> I'm also doing out of tree builds btw.

I'm not sure I understand why the old ones didn't get cleaned up.  They
did for me.

$ git checkout -b testing v2.6.32
$ find security/selinux/ -name flask\*
security/selinux/include/flask.h
[here I made a commit on MAINTAINERS just to make sure pull did
something]
$ git pull linus master
$ find security/selinux/ -name flask\*
[nothing]
$

I don't have those two old header files laying around.  I understand why
your old ones are still there.

I build selinux which generates the new files (in slightly new places)

$ make security/selinux/
$ find security/selinux/ -name flask\*
security/selinux/flask.h

They moved from
security/selinux/include
  to
security/selinux

I have a security/selinux/.gitignore which lists

$ cat security/selinux/.gitignore 
av_permissions.h
flask.h

Which I believe means they match the old locations as well.  Is there
some better way to ignore the new autogenereated files such that they
won't match include/flask.h?  I don't understand why the old files
weren't cleaned up?  Am I doing something wrong in my testing?  Should I
be doing something better in the code?

-Eric


      parent reply	other threads:[~2010-02-15 21:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-03 13:32 [GIT] Security subsystem changes for 2.6.33 James Morris
2010-02-15  4:46 ` Dave Airlie
2010-02-15  4:50   ` Dave Airlie
2010-02-15 21:29   ` Eric Paris [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266269362.24665.8.camel@localhost \
    --to=eparis@redhat.com \
    --cc=airlied@gmail.com \
    --cc=jmorris@namei.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sds@tycho.nsa.gov \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.