mkosi: allow Clear to use test modules
diff mbox series

Message ID 20181010205016.3462-1-lucas.demarchi@intel.com
State New
Headers show
Series
  • mkosi: allow Clear to use test modules
Related show

Commit Message

Lucas De Marchi Oct. 10, 2018, 8:50 p.m. UTC
Now Clear has a bundle for the kernel headers, let's use it.
---
 testsuite/mkosi/mkosi.build | 9 ++-------
 testsuite/mkosi/mkosi.clear | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

Comments

Caio Marcelo de Oliveira Filho Oct. 10, 2018, 9:50 p.m. UTC | #1
On Wed, Oct 10, 2018 at 01:50:16PM -0700, Lucas De Marchi wrote:
> Now Clear has a bundle for the kernel headers, let's use it.
> ---
>  testsuite/mkosi/mkosi.build | 9 ++-------
>  testsuite/mkosi/mkosi.clear | 1 +
>  2 files changed, 3 insertions(+), 7 deletions(-)

Tested the patch with 'sudo make mkosi DISTRO=clear' and all tests
passed.

LGTM.


Caio
Lucas De Marchi Oct. 10, 2018, 9:58 p.m. UTC | #2
On Wed, Oct 10, 2018 at 2:51 PM Caio Marcelo de Oliveira Filho
<caio.oliveira@intel.com> wrote:
>
> On Wed, Oct 10, 2018 at 01:50:16PM -0700, Lucas De Marchi wrote:
> > Now Clear has a bundle for the kernel headers, let's use it.
> > ---
> >  testsuite/mkosi/mkosi.build | 9 ++-------
> >  testsuite/mkosi/mkosi.clear | 1 +
> >  2 files changed, 3 insertions(+), 7 deletions(-)
>
> Tested the patch with 'sudo make mkosi DISTRO=clear' and all tests
> passed.
>
> LGTM.
>

applied, thanks.

Lucas De Marchi

>
> Caio
>
>

Patch
diff mbox series

diff --git a/testsuite/mkosi/mkosi.build b/testsuite/mkosi/mkosi.build
index 8ed54bb..53fc797 100755
--- a/testsuite/mkosi/mkosi.build
+++ b/testsuite/mkosi/mkosi.build
@@ -29,13 +29,8 @@  rm -rf build
 mkdir build
 cd build
 
-if grep clear-linux-os /usr/lib/os-release; then
-    # Clear Linux doesn't have the dependencies for those yet.
-    echo "--disable-test-modules" > ../../.config.args
-else
-    kdir=$(find_kdir)
-    IFS=/ read _ _ _ kver _ <<<"$kdir"
-fi
+kdir=$(find_kdir)
+IFS=/ read _ _ _ kver _ <<<"$kdir"
 
 ../autogen.sh c
 make -j
diff --git a/testsuite/mkosi/mkosi.clear b/testsuite/mkosi/mkosi.clear
index 6d87514..03ba2f0 100644
--- a/testsuite/mkosi/mkosi.clear
+++ b/testsuite/mkosi/mkosi.clear
@@ -10,6 +10,7 @@  Packages=
 	os-core-update
 BuildPackages=
 	os-core-dev
+	linux-dev
 
 [Partitions]
 RootSize = 5G