| Message ID | 20200319194853.15709-1-william.c.roberts@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | cil: drop remaining dso.h include | expand |
On Thu, Mar 19, 2020 at 8:49 PM <bill.c.roberts@gmail.com> wrote: > From: William Roberts <william.c.roberts@intel.com> > > Signed-off-by: William Roberts <william.c.roberts@intel.com> > --- > libsepol/cil/src/cil.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c > index c010ca2aeaf4..12cc28eff389 100644 > --- a/libsepol/cil/src/cil.c > +++ b/libsepol/cil/src/cil.c > @@ -50,7 +50,6 @@ > #include "cil_binary.h" > #include "cil_policy.h" > #include "cil_strpool.h" > -#include "dso.h" > > #ifndef DISABLE_SYMVER > asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0"); > -- > 2.17.1 > Acked-by: Ondrej Mosnacek <omosnace@redhat.com>
On Fri, Mar 20, 2020 at 3:08 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > On Thu, Mar 19, 2020 at 8:49 PM <bill.c.roberts@gmail.com> wrote: > > From: William Roberts <william.c.roberts@intel.com> > > > > Signed-off-by: William Roberts <william.c.roberts@intel.com> > > --- > > libsepol/cil/src/cil.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c > > index c010ca2aeaf4..12cc28eff389 100644 > > --- a/libsepol/cil/src/cil.c > > +++ b/libsepol/cil/src/cil.c > > @@ -50,7 +50,6 @@ > > #include "cil_binary.h" > > #include "cil_policy.h" > > #include "cil_strpool.h" > > -#include "dso.h" > > > > #ifndef DISABLE_SYMVER > > asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0"); > > -- > > 2.17.1 > > > > Acked-by: Ondrej Mosnacek <omosnace@redhat.com> > Merged: https://github.com/SELinuxProject/selinux/pull/210 Thanks
On Mon, Mar 23, 2020 at 11:35 AM William Roberts <bill.c.roberts@gmail.com> wrote: > > On Fri, Mar 20, 2020 at 3:08 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > On Thu, Mar 19, 2020 at 8:49 PM <bill.c.roberts@gmail.com> wrote: > > > From: William Roberts <william.c.roberts@intel.com> > > > > > > Signed-off-by: William Roberts <william.c.roberts@intel.com> > > > --- > > > libsepol/cil/src/cil.c | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c > > > index c010ca2aeaf4..12cc28eff389 100644 > > > --- a/libsepol/cil/src/cil.c > > > +++ b/libsepol/cil/src/cil.c > > > @@ -50,7 +50,6 @@ > > > #include "cil_binary.h" > > > #include "cil_policy.h" > > > #include "cil_strpool.h" > > > -#include "dso.h" > > > > > > #ifndef DISABLE_SYMVER > > > asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0"); > > > -- > > > 2.17.1 > > > > > > > Acked-by: Ondrej Mosnacek <omosnace@redhat.com> > > > Merged: https://github.com/SELinuxProject/selinux/pull/210 > > Thanks It looks like this change broke building on MacOS: <inline asm>:1:1: error: unknown directive .symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0 ^ (on all of them). Previously dso.h defined DISABLE_SYMVER for Android and Apple, is support for those intended to go away?
On Thu, Mar 26, 2020 at 10:17 AM Joshua Brindle <joshua.brindle@crunchydata.com> wrote: > > On Mon, Mar 23, 2020 at 11:35 AM William Roberts > <bill.c.roberts@gmail.com> wrote: > > > > On Fri, Mar 20, 2020 at 3:08 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > > > > > On Thu, Mar 19, 2020 at 8:49 PM <bill.c.roberts@gmail.com> wrote: > > > > From: William Roberts <william.c.roberts@intel.com> > > > > > > > > Signed-off-by: William Roberts <william.c.roberts@intel.com> > > > > --- > > > > libsepol/cil/src/cil.c | 1 - > > > > 1 file changed, 1 deletion(-) > > > > > > > > diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c > > > > index c010ca2aeaf4..12cc28eff389 100644 > > > > --- a/libsepol/cil/src/cil.c > > > > +++ b/libsepol/cil/src/cil.c > > > > @@ -50,7 +50,6 @@ > > > > #include "cil_binary.h" > > > > #include "cil_policy.h" > > > > #include "cil_strpool.h" > > > > -#include "dso.h" > > > > > > > > #ifndef DISABLE_SYMVER > > > > asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0"); > > > > -- > > > > 2.17.1 > > > > > > > > > > Acked-by: Ondrej Mosnacek <omosnace@redhat.com> > > > > > Merged: https://github.com/SELinuxProject/selinux/pull/210 > > > > Thanks > > It looks like this change broke building on MacOS: > > <inline asm>:1:1: error: unknown directive > .symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0 > ^ > > (on all of them). > > Previously dso.h defined DISABLE_SYMVER for Android and Apple, is > support for those intended to go away? No, patches forthcoming.
I missed a dso.h file in cil code, and broke the DISABLE_SYMVER support. this deletes that file and restores DISABLE_SYMVER support. Sorry... [PATCH 1/2] cil: rm dead dso.h file [PATCH 2/2] cil: re-enable DISABLE_SYMVER define
Josh can you run this on Mac build, I don't have one anymore. On Thu, Mar 26, 2020 at 10:46 AM <bill.c.roberts@gmail.com> wrote: > > I missed a dso.h file in cil code, and broke the DISABLE_SYMVER support. > this deletes that file and restores DISABLE_SYMVER support. > > Sorry... > > [PATCH 1/2] cil: rm dead dso.h file > [PATCH 2/2] cil: re-enable DISABLE_SYMVER define >
On Thu, Mar 26, 2020 at 11:48 AM William Roberts <bill.c.roberts@gmail.com> wrote: > > Josh can you run this on Mac build, I don't have one anymore. > LGTM Acked-by: Joshua Brindle <joshua.brindle@crunchydata.com> > On Thu, Mar 26, 2020 at 10:46 AM <bill.c.roberts@gmail.com> wrote: > > > > I missed a dso.h file in cil code, and broke the DISABLE_SYMVER support. > > this deletes that file and restores DISABLE_SYMVER support. > > > > Sorry... > > > > [PATCH 1/2] cil: rm dead dso.h file > > [PATCH 2/2] cil: re-enable DISABLE_SYMVER define > >
> > Josh can you run this on Mac build, I don't have one anymore. > > > > LGTM > > Acked-by: Joshua Brindle <joshua.brindle@crunchydata.com> Thanks! Staged: https://github.com/SELinuxProject/selinux/pull/214 Will merge tomorrow afternoon unless I hear otherwise.
On Thu, Mar 26, 2020 at 11:17 AM Joshua Brindle <joshua.brindle@crunchydata.com> wrote: > It looks like this change broke building on MacOS: > > <inline asm>:1:1: error: unknown directive > .symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0 > ^ > > (on all of them). > > Previously dso.h defined DISABLE_SYMVER for Android and Apple, is > support for those intended to go away? Maybe we should add an osx build to our .travis.yml file and just test building libsepol/checkpolicy/secilc?
On Thu, Mar 26, 2020 at 11:49 AM Stephen Smalley <stephen.smalley.work@gmail.com> wrote: > > On Thu, Mar 26, 2020 at 11:17 AM Joshua Brindle > <joshua.brindle@crunchydata.com> wrote: > > It looks like this change broke building on MacOS: > > > > <inline asm>:1:1: error: unknown directive > > .symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0 > > ^ > > > > (on all of them). > > > > Previously dso.h defined DISABLE_SYMVER for Android and Apple, is > > support for those intended to go away? > > Maybe we should add an osx build to our .travis.yml file and just test > building libsepol/checkpolicy/secilc? Definitely, I didn't realize travis had osx target. I can try and queue this up for next week.
On Thu, Mar 26, 2020 at 11:18 AM William Roberts <bill.c.roberts@gmail.com> wrote: > > > > Josh can you run this on Mac build, I don't have one anymore. > > > > > > > LGTM > > > > Acked-by: Joshua Brindle <joshua.brindle@crunchydata.com> > Thanks! > > Staged: https://github.com/SELinuxProject/selinux/pull/214 > > Will merge tomorrow afternoon unless I hear otherwise. Merged: https://github.com/SELinuxProject/selinux/pull/214
On Fri, Mar 27, 2020 at 10:27 AM William Roberts <bill.c.roberts@gmail.com> wrote: > > On Thu, Mar 26, 2020 at 11:18 AM William Roberts > <bill.c.roberts@gmail.com> wrote: > > > > > > Josh can you run this on Mac build, I don't have one anymore. > > > > > > > > > > LGTM > > > > > > Acked-by: Joshua Brindle <joshua.brindle@crunchydata.com> > > Thanks! > > > > Staged: https://github.com/SELinuxProject/selinux/pull/214 > > > > Will merge tomorrow afternoon unless I hear otherwise. > Merged: https://github.com/SELinuxProject/selinux/pull/214 Please remember to update patchwork (status -> Accepted) when you merge a patch.
On Fri, Mar 27, 2020 at 9:46 AM Stephen Smalley <stephen.smalley.work@gmail.com> wrote: > > On Fri, Mar 27, 2020 at 10:27 AM William Roberts > <bill.c.roberts@gmail.com> wrote: > > > > On Thu, Mar 26, 2020 at 11:18 AM William Roberts > > <bill.c.roberts@gmail.com> wrote: > > > > > > > > Josh can you run this on Mac build, I don't have one anymore. > > > > > > > > > > > > > LGTM > > > > > > > > Acked-by: Joshua Brindle <joshua.brindle@crunchydata.com> > > > Thanks! > > > > > > Staged: https://github.com/SELinuxProject/selinux/pull/214 > > > > > > Will merge tomorrow afternoon unless I hear otherwise. > > Merged: https://github.com/SELinuxProject/selinux/pull/214 > > Please remember to update patchwork (status -> Accepted) when you merge a patch. I never even used patchwork, will do and done. But I still want to grumble, I wish we moved out of 1960's development.
diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c index c010ca2aeaf4..12cc28eff389 100644 --- a/libsepol/cil/src/cil.c +++ b/libsepol/cil/src/cil.c @@ -50,7 +50,6 @@ #include "cil_binary.h" #include "cil_policy.h" #include "cil_strpool.h" -#include "dso.h" #ifndef DISABLE_SYMVER asm(".symver cil_build_policydb_pdb, cil_build_policydb@LIBSEPOL_1.0");