| Message ID | 20240130205042.2641514-1-denis@denix.org |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-selinux] rpm: update PACKAGECONFIG for CMake | expand |
On 1/31/24 04:50, Denys Dmytriyenko wrote: > Version 4.19 has migrated from autoconf to CMake, update PACKAGECONFIG > accordingly. > > https://git.openembedded.org/openembedded-core/commit/?id=38549d462b399e3a63335f60a44c8bbced98639a > > Signed-off-by: Denys Dmytriyenko<denis@denix.org> > --- > recipes-devtools/rpm/rpm_selinux.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc > index b6e0e7c..29eefbf 100644 > --- a/recipes-devtools/rpm/rpm_selinux.inc > +++ b/recipes-devtools/rpm/rpm_selinux.inc > @@ -1,2 +1,2 @@ > inherit enable-selinux > -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" > +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF,libselinux" I see that PACKAGECONFIG[selinux] has been added to rpm recipe in oe-core. We can just remove this line. //Yi > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#62340):https://lists.yoctoproject.org/g/yocto/message/62340 > Mute This Topic:https://lists.yoctoproject.org/mt/104062620/7283133 > Group Owner:yocto+owner@lists.yoctoproject.org > Unsubscribe:https://lists.yoctoproject.org/g/yocto/unsub [yi.zhao@eng.windriver.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Wed, Jan 31, 2024 at 10:18:19AM +0800, Yi Zhao wrote: > > On 1/31/24 04:50, Denys Dmytriyenko wrote: > >Version 4.19 has migrated from autoconf to CMake, update PACKAGECONFIG > >accordingly. > > > >https://git.openembedded.org/openembedded-core/commit/?id=38549d462b399e3a63335f60a44c8bbced98639a > > > >Signed-off-by: Denys Dmytriyenko<denis@denix.org> > >--- > > recipes-devtools/rpm/rpm_selinux.inc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc > >index b6e0e7c..29eefbf 100644 > >--- a/recipes-devtools/rpm/rpm_selinux.inc > >+++ b/recipes-devtools/rpm/rpm_selinux.inc > >@@ -1,2 +1,2 @@ > > inherit enable-selinux > >-PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" > >+PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF,libselinux" > > I see that PACKAGECONFIG[selinux] has been added to rpm recipe in > oe-core. We can just remove this line. Unfortunately, it doesn't have the required "libselinux" dependency in oe-core.
On 1/31/24 10:43, Denys Dmytriyenko wrote: > On Wed, Jan 31, 2024 at 10:18:19AM +0800, Yi Zhao wrote: >> On 1/31/24 04:50, Denys Dmytriyenko wrote: >>> Version 4.19 has migrated from autoconf to CMake, update PACKAGECONFIG >>> accordingly. >>> >>> https://git.openembedded.org/openembedded-core/commit/?id=38549d462b399e3a63335f60a44c8bbced98639a >>> >>> Signed-off-by: Denys Dmytriyenko<denis@denix.org> >>> --- >>> recipes-devtools/rpm/rpm_selinux.inc | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc >>> index b6e0e7c..29eefbf 100644 >>> --- a/recipes-devtools/rpm/rpm_selinux.inc >>> +++ b/recipes-devtools/rpm/rpm_selinux.inc >>> @@ -1,2 +1,2 @@ >>> inherit enable-selinux >>> -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" >>> +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF,libselinux" >> I see that PACKAGECONFIG[selinux] has been added to rpm recipe in >> oe-core. We can just remove this line. > Unfortunately, it doesn't have the required "libselinux" dependency in > oe-core. We can send a patch to fix it :-) //Yi >
On Wed, Jan 31, 2024 at 10:49:25AM +0800, Yi Zhao wrote: > > On 1/31/24 10:43, Denys Dmytriyenko wrote: > >On Wed, Jan 31, 2024 at 10:18:19AM +0800, Yi Zhao wrote: > >>On 1/31/24 04:50, Denys Dmytriyenko wrote: > >>>Version 4.19 has migrated from autoconf to CMake, update PACKAGECONFIG > >>>accordingly. > >>> > >>>https://git.openembedded.org/openembedded-core/commit/?id=38549d462b399e3a63335f60a44c8bbced98639a > >>> > >>>Signed-off-by: Denys Dmytriyenko<denis@denix.org> > >>>--- > >>> recipes-devtools/rpm/rpm_selinux.inc | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>>diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc > >>>index b6e0e7c..29eefbf 100644 > >>>--- a/recipes-devtools/rpm/rpm_selinux.inc > >>>+++ b/recipes-devtools/rpm/rpm_selinux.inc > >>>@@ -1,2 +1,2 @@ > >>> inherit enable-selinux > >>>-PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" > >>>+PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF,libselinux" > >>I see that PACKAGECONFIG[selinux] has been added to rpm recipe in > >>oe-core. We can just remove this line. > >Unfortunately, it doesn't have the required "libselinux" dependency in > >oe-core. > > We can send a patch to fix it :-) Well, libselinux is not provided by oe-core, only by meta-selinux... On the other hand, non-default external inter-layer PACKAGECONFIG dependencies is a grey area and can be tolerated these days. Anyone has any preferences?
diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc index b6e0e7c..29eefbf 100644 --- a/recipes-devtools/rpm/rpm_selinux.inc +++ b/recipes-devtools/rpm/rpm_selinux.inc @@ -1,2 +1,2 @@ inherit enable-selinux -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[selinux] = "-DWITH_SELINUX=ON,-DWITH_SELINUX=OFF,libselinux"
Version 4.19 has migrated from autoconf to CMake, update PACKAGECONFIG accordingly. https://git.openembedded.org/openembedded-core/commit/?id=38549d462b399e3a63335f60a44c8bbced98639a Signed-off-by: Denys Dmytriyenko <denis@denix.org> --- recipes-devtools/rpm/rpm_selinux.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)