No, no... I did not mean in the makefile to change m to y.

Please, maybe you can try to set your makefile to lookalike as these ones:
https://github.com/ZoranStojsavljevic/mikrobus/blob/mikrobusv2/Makefile
https://github.com/ZoranStojsavljevic/mikrobus/blob/mikrobusv2-debug/Makefile

Zoran
_______

On Thu, Jan 7, 2021 at 4:17 PM Zoltan Kerenyi Nagy
<kerenyi.nagy.zoltan@...> wrote:

Hi Zoran,

Thanks, I modified the Makefile:

obj-m := huawei_cdc_ncm.o
Kconfig (obj-y := huawei_cdc_ncm.o)
SRC := $(shell pwd)
all:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC)
modules_install:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install
clean:
rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
rm -f Module.markers Module.symvers modules.order
rm -rf .tmp_versions Modules.symvers

but this is the error:

ERROR: huawei-1.1-r0 do_configure: oe_runmake failed
ERROR: huawei-1.1-r0 do_configure: Function failed: do_configure (log file is located at /home/kerenyiz/oe-core/build/tmp-glibc/work/barix_ipam400-oe-linux-gnueabi/huawei/1.1-r0/temp/log.do_configure.4488)
ERROR: Logfile of failure stored in: /home/kerenyiz/oe-core/build/tmp-glibc/work/barix_ipam400-oe-linux-gnueabi/huawei/1.1-r0/temp/log.do_configure.4488
Log data follows:
| DEBUG: Executing shell function do_configure
| NOTE: make KERNEL_SRC=/home/kerenyiz/oe-core/build/tmp-glibc/work-shared/barix-ipam400/kernel-source clean
| ERROR: oe_runmake failed
| Makefile:2: *** empty variable name. Stop.
| ERROR: Function failed: do_configure (log file is located at /home/kerenyiz/oe-core/build/tmp-glibc/work/barix_ipam400-oe-linux-gnueabi/huawei/1.1-r0/temp/log.do_configure.4488)
ERROR: Task (/home/kerenyiz/oe-core/build/../stuff/meta-barix-sdk/recipes-z/kernel-modules/huawei/huawei_1.1.bb:do_configure) failed with exit code '1'
NOTE: Tasks Summary: Attempted 3880 tasks of which 3873 didn't need to be rerun and 1 failed.

On Thu, 7 Jan 2021 at 16:03, Zoran Stojsavljevic <zoran.stojsavljevic@...> wrote:

Hello Zoltan,

root@barix-ipam400:~# insmod /lib/modules/4.10.0/extra/huawei_cdc_ncm.ko
insmod: can't insert '/lib/modules/4.10.0/extra/huawei_cdc_ncm.ko': unknown symbol in module, or unknown parameter

Please, try to set Kconfig (obj-y := huawei_cdc_ncm.o) to y, I guess
99.9% that the kernel compilation (actually, driver compilation) will
pass.

I think YOCTO (recipe) behaves perfectly correctly.

Other approach: try to compile the same module with Makefile above on
the target.

(my two cent thoughts)

Zoran
_______

On Thu, Jan 7, 2021 at 2:46 PM Zoltan Kerenyi Nagy
<kerenyi.nagy.zoltan@...> wrote:

Hi Folks,

I bitbaked a Huawei E3372h driver into the distro with this recipe file:

SUMMARY = "Huawei Stick kernel module"
LICENSE = "CLOSED"

inherit module

SRC_URI = "file://Makefile \
file://huawei_cdc_ncm.c \
"

S = "${WORKDIR}"

The makefile looks like this:

obj-m := huawei_cdc_ncm.o

SRC := $(shell pwd)

all:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC)

modules_install:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install

clean:
rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
rm -f Module.markers Module.symvers modules.order
rm -rf .tmp_versions Modules.symvers

The source file is the one that matches the kernel:

https://elixir.bootlin.com/linux/v4.0/source/drivers/net/usb/huawei_cdc_ncm.c

I included this into the conf file:
KERNEL_MODULE_AUTOLOAD += "lte"KERNEL_MODULE_PROBECONF += "lte"huawei_cdc_ncm = "options lte iProduct=E3372h iManufacturer=Huawei"

Bitbake runs without error, however when I insert the SD card into the hardware ( barix ipam 400)
and boot the hardware this is the error message:

root@barix-ipam400:~# insmod /lib/modules/4.10.0/extra/huawei_cdc_ncm.ko
insmod: can't insert '/lib/modules/4.10.0/extra/huawei_cdc_ncm.ko': unknown symbol in module, or unknown parameter

To me it looks like that there was an error during the bitbake, or the header files included in the driver doesn't match the kernel.

Do you have any idea how to procede?

Thanks,



--
Zolee

--
Zolee

Hello Zoltan,

root@barix-ipam400:~# insmod /lib/modules/4.10.0/extra/huawei_cdc_ncm.ko
insmod: can't insert '/lib/modules/4.10.0/extra/huawei_cdc_ncm.ko': unknown symbol in module, or unknown parameter

Please, try to set Kconfig (obj-y := huawei_cdc_ncm.o) to y, I guess
99.9% that the kernel compilation (actually, driver compilation) will
pass.

I think YOCTO (recipe) behaves perfectly correctly.

Other approach: try to compile the same module with Makefile above on
the target.

(my two cent thoughts)

Zoran
_______

On Thu, Jan 7, 2021 at 2:46 PM Zoltan Kerenyi Nagy
<kerenyi.nagy.zoltan@...> wrote:

Hi Folks,

I bitbaked a Huawei E3372h driver into the distro with this recipe file:

SUMMARY = "Huawei Stick kernel module"
LICENSE = "CLOSED"

inherit module

SRC_URI = "file://Makefile \
file://huawei_cdc_ncm.c \
"

S = "${WORKDIR}"

The makefile looks like this:

obj-m := huawei_cdc_ncm.o

SRC := $(shell pwd)

all:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC)

modules_install:
$(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install

clean:
rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
rm -f Module.markers Module.symvers modules.order
rm -rf .tmp_versions Modules.symvers

The source file is the one that matches the kernel:

https://elixir.bootlin.com/linux/v4.0/source/drivers/net/usb/huawei_cdc_ncm.c

I included this into the conf file:
KERNEL_MODULE_AUTOLOAD += "lte"KERNEL_MODULE_PROBECONF += "lte"huawei_cdc_ncm = "options lte iProduct=E3372h iManufacturer=Huawei"

Bitbake runs without error, however when I insert the SD card into the hardware ( barix ipam 400)
and boot the hardware this is the error message:

root@barix-ipam400:~# insmod /lib/modules/4.10.0/extra/huawei_cdc_ncm.ko
insmod: can't insert '/lib/modules/4.10.0/extra/huawei_cdc_ncm.ko': unknown symbol in module, or unknown parameter

To me it looks like that there was an error during the bitbake, or the header files included in the driver doesn't match the kernel.

Do you have any idea how to procede?

Thanks,



--
Zolee

--
Zolee

Hi,

On Thu, Jan 07, 2021 at 09:07:58PM +1100, JH wrote:

Thanks kapllaj.

On meta-freescale, you find this on
meta-freescale-distro/conf/distro/include/fsl-base.inc:

Yes I use imx6ull, I've looked those config files, nothing set to run 4.19.

Now, go to meta-freescale/recipes-kernel/linux folder, and take a look to
see what kernels are available for your machine. Note that the linux-imx
kernel provides currently on master branch the 5.4 version!
For you to select the 5.10 (assuming you are on master branch) you should
set:

PREFERRED_PROVIDER_virtual/kernel = "linux-fslc"

I setup PREFERRED_PROVIDER_virtual/kernel = "linux-yocto", I have to
say, it has been running for a year for 4.19 kernel.

Yocto will automatically select the highest available version, but if you
would also like to fix the version, provide also that information:
PREFERRED_VERSION_linux-fslc = "5.%"

I know iit should automatically select the highest available version 5.10.

I set up following in local.conf:

PREFERRED_PROVIDER_virtual/kernel="linux-yocto"
PREFERRED_VERSION_linux-yocto="5.10.%"

So we can stop half guessing and help you can you give us the output of:
bitbake -e virtual/kernel | grep -e "^PREFERRED_PROVIDER_"
bitbake -e virtual/kernel | grep -e "^PREFERRED_VERSION_"
bitbake -e virtual/kernel | grep -e "^OVERRIDES="
bitbake-layers show-recipes linux-yocto linux-fslc

Thanks,
Quentin

Thanks kapllaj.

On meta-freescale, you find this on
meta-freescale-distro/conf/distro/include/fsl-base.inc:

Yes I use imx6ull, I've looked those config files, nothing set to run 4.19.

Now, go to meta-freescale/recipes-kernel/linux folder, and take a look to
see what kernels are available for your machine. Note that the linux-imx
kernel provides currently on master branch the 5.4 version!
For you to select the 5.10 (assuming you are on master branch) you should
set:

PREFERRED_PROVIDER_virtual/kernel = "linux-fslc"

I setup PREFERRED_PROVIDER_virtual/kernel = "linux-yocto", I have to
say, it has been running for a year for 4.19 kernel.

Yocto will automatically select the highest available version, but if you
would also like to fix the version, provide also that information:
PREFERRED_VERSION_linux-fslc = "5.%"

I know iit should automatically select the highest available version 5.10.

I set up following in local.conf:

PREFERRED_PROVIDER_virtual/kernel="linux-yocto"
PREFERRED_VERSION_linux-yocto="5.10.%"

But it was still running 4.19, the question is why didn't the Yocto
ignore the setting?

Thank you.

- j

Hi, it actually shouldn't be that hard to set the kernel.

IMX_DEFAULT_KERNEL is a variable that sets the kernel name (the recipe) and not the version. I don't know on which yocto version you are working, and also on which CPU.

On meta-freescale, you find this on meta-freescale-distro/conf/distro/include/fsl-base.inc:

Hi All,

I'm trying to install the Tokbox library into the build, but the tar file is not getting extracted into the folder. Here is my recipe code, kindly please help me where I went wrong.
Recipe:

DESCRIPTION = "libopentok for arm64"

HOMEPAGE = "https://tokbox.com"

 

 

SRC_URI = "https://s3.amazonaws.com/artifact.tokbox.com/rel/opentok-linux-sdk/libopentok_linux_llvm_arm64-2.18.1.tgz"

SRC_URI[sha256sum] = "7ae2b85940a4e16299a4ec5f4341b6b92c71abdb5ef6949508873bd8a2f53abc"

 

S= "${WORKDIR}/tokbox"

 

inherit cmake

Error: 

CMake Error: The source directory "/home/test/target/bsp/tmp/work/aarch64-poky-linux/tokbox/1.0-r0/tokbox" does not appear to contain CMakeLists.txt.

Thanks & Regards,
Vijay Rakesh

Thanks kapllaj,

It also may be overridden by some conf file. For example, if you are using a
i.MX cpus, you may have some conf file on meta-freescale that override this
variable with something like: PREFERRED_PROVIDER_virtual/kernel_imx = "some
kernel"

It has linux-imx and ${IMX_DEFAULT_KERNEL}, but I could not find what
is defined for ${IMX_DEFAULT_KERNEL}

I defined IMX_DEFAULT_KERNEL = "5.10.%" in local.conf, still download 4.19,

I had a situation like this on a imx6 xpu, and had to specify the "_imx"
override in order to make it work.

"bitbake - e virtual/kernel | grep PREFERRED_PROVIDER_virtual/kernel" is
your friend.
It will show you the current variable selected, and also the different
overrides available.

Yes, I've done many times, there is no decisive definition for it, a
little bit weird.

Did not know it is that hard to just define a kernel version in Yocto ??


Thank you.

Kind regards,

- j

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/semodule-utils_3.0.bb | 7 -------
recipes-security/selinux/semodule-utils_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/semodule-utils_3.0.bb
create mode 100644 recipes-security/selinux/semodule-utils_3.1.bb

diff --git a/recipes-security/selinux/semodule-utils_3.0.bb b/recipes-security/selinux/semodule-utils_3.0.bb
deleted file mode 100644
index bccc707..0000000
--- a/recipes-security/selinux/semodule-utils_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "58b0e4b85695dad6aff70c69f7a417fd"
-SRC_URI[sha256sum] = "14ee2db21f36766ffbbb65770f8e7236d21675db9f0f5d40f50974711da598cf"
diff --git a/recipes-security/selinux/semodule-utils_3.1.bb b/recipes-security/selinux/semodule-utils_3.1.bb
new file mode 100644
index 0000000..02a63f8
--- /dev/null
+++ b/recipes-security/selinux/semodule-utils_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "d9520d0cdef3d1be412155dc72ec2936"
+SRC_URI[sha256sum] = "0cc37f9cec751d9c2abb5f2b228b060567e973cb47c19b53b8a4a7378baaa853"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/selinux-gui_3.0.bb | 7 -------
recipes-security/selinux/selinux-gui_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/selinux-gui_3.0.bb
create mode 100644 recipes-security/selinux/selinux-gui_3.1.bb

diff --git a/recipes-security/selinux/selinux-gui_3.0.bb b/recipes-security/selinux/selinux-gui_3.0.bb
deleted file mode 100644
index e937836..0000000
--- a/recipes-security/selinux/selinux-gui_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "988a564eccc01feb8cc6fa49630efc6d"
-SRC_URI[sha256sum] = "e9e9b599950a30857b0954bf10853ea50efb7de68a5ae756a27b8d03ccc44348"
diff --git a/recipes-security/selinux/selinux-gui_3.1.bb b/recipes-security/selinux/selinux-gui_3.1.bb
new file mode 100644
index 0000000..3038ebc
--- /dev/null
+++ b/recipes-security/selinux/selinux-gui_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "1e0ea65dfb2b5408969bbe55f6f9d04e"
+SRC_URI[sha256sum] = "40775eaef965259ca2f8ad49c23b03ff2c8f70808a9e0587b1075970b2509c3d"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/selinux-sandbox_3.0.bb | 7 -------
recipes-security/selinux/selinux-sandbox_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/selinux-sandbox_3.0.bb
create mode 100644 recipes-security/selinux/selinux-sandbox_3.1.bb

diff --git a/recipes-security/selinux/selinux-sandbox_3.0.bb b/recipes-security/selinux/selinux-sandbox_3.0.bb
deleted file mode 100644
index a60f52c..0000000
--- a/recipes-security/selinux/selinux-sandbox_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "81447c46bf4cae9a5fa38c5fb8dc923e"
-SRC_URI[sha256sum] = "66fb4ea3a9e3d1e6004f13666b8390be751dd226a8496b995ed0332788758d0a"
diff --git a/recipes-security/selinux/selinux-sandbox_3.1.bb b/recipes-security/selinux/selinux-sandbox_3.1.bb
new file mode 100644
index 0000000..8a95044
--- /dev/null
+++ b/recipes-security/selinux/selinux-sandbox_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "d38fda12b028c06f751be9c25e309c6b"
+SRC_URI[sha256sum] = "c79b958e2f64570a59e60638fd13c15fd77c7c2bbac31c7ad4afb03718432b84"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/selinux-dbus_3.0.bb | 7 -------
recipes-security/selinux/selinux-dbus_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/selinux-dbus_3.0.bb
create mode 100644 recipes-security/selinux/selinux-dbus_3.1.bb

diff --git a/recipes-security/selinux/selinux-dbus_3.0.bb b/recipes-security/selinux/selinux-dbus_3.0.bb
deleted file mode 100644
index afae77b..0000000
--- a/recipes-security/selinux/selinux-dbus_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "775f058ea19f424d99ce3bd13297234c"
-SRC_URI[sha256sum] = "95d75603444c3eeaebf25da3de6febb6e1567d5f5d93cde5a4b73c88ef6c4f28"
diff --git a/recipes-security/selinux/selinux-dbus_3.1.bb b/recipes-security/selinux/selinux-dbus_3.1.bb
new file mode 100644
index 0000000..04e7565
--- /dev/null
+++ b/recipes-security/selinux/selinux-dbus_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "b6ad8b3d8497782c6ed480514dfc8ee8"
+SRC_URI[sha256sum] = "61f936d200ff8302c513883c67bb7c4c496513e78122954cbd33db62086a06f2"
--
2.25.1

Refresh patch:
fix-sepolicy-install-path.patch

Signed-off-by: Yi Zhao <yi.zhao@...>
---
.../selinux-python/fix-sepolicy-install-path.patch | 12 ++++++------
recipes-security/selinux/selinux-python_3.0.bb | 7 -------
recipes-security/selinux/selinux-python_3.1.bb | 7 +++++++
3 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 recipes-security/selinux/selinux-python_3.0.bb
create mode 100644 recipes-security/selinux/selinux-python_3.1.bb

diff --git a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
index 527e02c..4e91df7 100644
--- a/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
+++ b/recipes-security/selinux/selinux-python/fix-sepolicy-install-path.patch
@@ -1,7 +1,7 @@
-From e8fdfdf96a84209118deff7782cf82f8187af6c5 Mon Sep 17 00:00:00 2001
+From df40fadfb251cc2aebdbd2e216f99a8ae7da7763 Mon Sep 17 00:00:00 2001
From: Xin Ouyang <Xin.Ouyang@...>
Date: Mon, 23 Sep 2013 21:17:59 +0800
-Subject: [PATCH] policycoreutils: fix install path for new pymodule sepolicy
+Subject: [PATCH] sepolicy: fix install path for new pymodule sepolicy

Upstream-Status: Inappropriate [embedded specific]

@@ -13,18 +13,18 @@ Signed-off-by: Yi Zhao <yi.zhao@...>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sepolicy/Makefile b/sepolicy/Makefile
-index 69f29fa..b474d80 100644
+index 3361be4..5842321 100644
--- a/sepolicy/Makefile
+++ b/sepolicy/Makefile
@@ -27,7 +27,7 @@ test:
@$(PYTHON) test_sepolicy.py -v

install:
-- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+ $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile
+- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` $(PYTHON_SETUP_ARGS)
++ $(PYTHON) setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) --install-lib=$(PYTHONLIBDIR) --no-compile $(PYTHON_SETUP_ARGS)
[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
install -m 755 sepolicy.py $(DESTDIR)$(BINDIR)/sepolicy
(cd $(DESTDIR)$(BINDIR); ln -sf sepolicy sepolgen)
--
-2.7.4
+2.17.1

diff --git a/recipes-security/selinux/selinux-python_3.0.bb b/recipes-security/selinux/selinux-python_3.0.bb
deleted file mode 100644
index 8222d28..0000000
--- a/recipes-security/selinux/selinux-python_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "aa018c9b1b26034f84f3f427adac08be"
-SRC_URI[sha256sum] = "43c08fa881ccc64251d396b1ac6c56b354bf98421b4ec937d54a8db190135494"
diff --git a/recipes-security/selinux/selinux-python_3.1.bb b/recipes-security/selinux/selinux-python_3.1.bb
new file mode 100644
index 0000000..a0555d2
--- /dev/null
+++ b/recipes-security/selinux/selinux-python_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "ec75687b680e0dd63e3ded05bd41cb5a"
+SRC_URI[sha256sum] = "f4d0a1a030bc291a6af498b26e0676b745075dd289a8ba16cdec86c3ea8f2f02"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/restorecond.inc | 14 +++++++++++++-
recipes-security/selinux/restorecond_3.0.bb | 7 -------
recipes-security/selinux/restorecond_3.1.bb | 7 +++++++
3 files changed, 20 insertions(+), 8 deletions(-)
delete mode 100644 recipes-security/selinux/restorecond_3.0.bb
create mode 100644 recipes-security/selinux/restorecond_3.1.bb

diff --git a/recipes-security/selinux/restorecond.inc b/recipes-security/selinux/restorecond.inc
index d168303..a5b1635 100644
--- a/recipes-security/selinux/restorecond.inc
+++ b/recipes-security/selinux/restorecond.inc
@@ -15,10 +15,22 @@ inherit systemd update-rc.d

DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native"

+EXTRA_OEMAKE += "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \
+ SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \
+ "
+
FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \
-"
+ ${systemd_user_unitdir}/* \
+ "

SYSTEMD_SERVICE_restorecond = "restorecond.service"
INITSCRIPT_PACKAGES = "restorecond"
INITSCRIPT_NAME_restorecond = "restorecond"
INITSCRIPT_PARAMS_restorecond = "defaults"
+
+do_install_append() {
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then
+ # remove /usr/lib/systemd/user
+ rm -rf ${D}${nonarch_libdir}
+ fi
+}
diff --git a/recipes-security/selinux/restorecond_3.0.bb b/recipes-security/selinux/restorecond_3.0.bb
deleted file mode 100644
index 8c840c9..0000000
--- a/recipes-security/selinux/restorecond_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "f32edbd8a1f724ef1e4fa70bf9e22685"
-SRC_URI[sha256sum] = "32a92c9f4bf48c613f9f467ced58d8c369eec8892239cd44d5d0e139b41926dc"
diff --git a/recipes-security/selinux/restorecond_3.1.bb b/recipes-security/selinux/restorecond_3.1.bb
new file mode 100644
index 0000000..d4e0d06
--- /dev/null
+++ b/recipes-security/selinux/restorecond_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "8daf761739a150a7a29bb491726a6cd9"
+SRC_URI[sha256sum] = "82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/mcstrans.inc | 6 ++++--
recipes-security/selinux/mcstrans_3.0.bb | 7 -------
recipes-security/selinux/mcstrans_3.1.bb | 7 +++++++
3 files changed, 11 insertions(+), 9 deletions(-)
delete mode 100644 recipes-security/selinux/mcstrans_3.0.bb
create mode 100644 recipes-security/selinux/mcstrans_3.1.bb

diff --git a/recipes-security/selinux/mcstrans.inc b/recipes-security/selinux/mcstrans.inc
index b9c670b..52b95c6 100644
--- a/recipes-security/selinux/mcstrans.inc
+++ b/recipes-security/selinux/mcstrans.inc
@@ -14,8 +14,10 @@ inherit systemd update-rc.d

DEPENDS += "libsepol libselinux libcap"

-# We do not need "${D}/" as a prefix anymore.
-EXTRA_OEMAKE += "SBINDIR=${base_sbindir} INITDIR=${sysconfdir}/init.d"
+EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
+ INITDIR=${sysconfdir}/init.d \
+ SYSTEMDDIR=${systemd_unitdir} \
+ "

do_install_append() {
install -d ${D}${sbindir}
diff --git a/recipes-security/selinux/mcstrans_3.0.bb b/recipes-security/selinux/mcstrans_3.0.bb
deleted file mode 100644
index 27ddfce..0000000
--- a/recipes-security/selinux/mcstrans_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI[md5sum] = "0edc58a4d65425ffa5d58d32bf412352"
-SRC_URI[sha256sum] = "0992b8e7c4de1ba5f98a82547b02418370be5a5f588fc6d5f1cd2c7824bda87e"
diff --git a/recipes-security/selinux/mcstrans_3.1.bb b/recipes-security/selinux/mcstrans_3.1.bb
new file mode 100644
index 0000000..26bb299
--- /dev/null
+++ b/recipes-security/selinux/mcstrans_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI[md5sum] = "18b7bf8193dd2360bc60f0e2639009ab"
+SRC_URI[sha256sum] = "cc918576c17340fc944849d785e2a7400b269ef079a36b871c140504164d6a45"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/policycoreutils_3.0.bb | 7 -------
recipes-security/selinux/policycoreutils_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/policycoreutils_3.0.bb
create mode 100644 recipes-security/selinux/policycoreutils_3.1.bb

diff --git a/recipes-security/selinux/policycoreutils_3.0.bb b/recipes-security/selinux/policycoreutils_3.0.bb
deleted file mode 100644
index a4e0287..0000000
--- a/recipes-security/selinux/policycoreutils_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "7e95941f1ac00b25b69c7157d49a375f"
-SRC_URI[sha256sum] = "3379c9bd722e36be9bf8856c6fa373bfa9b33305ac9da5fc807cfe7fa605f489"
diff --git a/recipes-security/selinux/policycoreutils_3.1.bb b/recipes-security/selinux/policycoreutils_3.1.bb
new file mode 100644
index 0000000..f56d1c3
--- /dev/null
+++ b/recipes-security/selinux/policycoreutils_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "3097ac2c83e47af130452f10399282cb"
+SRC_URI[sha256sum] = "c889f62ee80f8b6a369469a9b8af51f5b797975aeaa291f5c5960cc12eed1934"
--
2.25.1

Signed-off-by: Yi Zhao <yi.zhao@...>
---
recipes-security/selinux/secilc_3.0.bb | 7 -------
recipes-security/selinux/secilc_3.1.bb | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 recipes-security/selinux/secilc_3.0.bb
create mode 100644 recipes-security/selinux/secilc_3.1.bb

diff --git a/recipes-security/selinux/secilc_3.0.bb b/recipes-security/selinux/secilc_3.0.bb
deleted file mode 100644
index 71b6cff..0000000
--- a/recipes-security/selinux/secilc_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=c7e802b9a3b0c2c852669864c08b9138"
-
-SRC_URI[md5sum] = "be7ec221b874053a843ef90e49daa5cf"
-SRC_URI[sha256sum] = "78fafc4a8a8a212663d3d1e181047f5605430f0a0577ff772a4bb7fecd2b42b0"
diff --git a/recipes-security/selinux/secilc_3.1.bb b/recipes-security/selinux/secilc_3.1.bb
new file mode 100644
index 0000000..c1fb36b
--- /dev/null
+++ b/recipes-security/selinux/secilc_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=c7e802b9a3b0c2c852669864c08b9138"
+
+SRC_URI[md5sum] = "f9743e405a8de331c249b723c09c6c3f"
+SRC_URI[sha256sum] = "86117246fec3017af710a9ff7c1dae3ed1cd571e232a86cff3e2a3de2d6aa65c"
--
2.25.1

Drop backported patch:
0001-checkpolicy-remove-unused-te_assertions.patch

Signed-off-by: Yi Zhao <yi.zhao@...>
---
...ckpolicy-remove-unused-te_assertions.patch | 45 -------------------
recipes-security/selinux/checkpolicy_3.0.bb | 11 -----
recipes-security/selinux/checkpolicy_3.1.bb | 7 +++
3 files changed, 7 insertions(+), 56 deletions(-)
delete mode 100644 recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
delete mode 100644 recipes-security/selinux/checkpolicy_3.0.bb
create mode 100644 recipes-security/selinux/checkpolicy_3.1.bb

diff --git a/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch b/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
deleted file mode 100644
index 61c301e..0000000
--- a/recipes-security/selinux/checkpolicy/0001-checkpolicy-remove-unused-te_assertions.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 95d8f16ece96829109eb75a605b1459a25b5a6be Mon Sep 17 00:00:00 2001
-From: Ondrej Mosnacek <omosnace@...>
-Date: Thu, 23 Jan 2020 13:57:15 +0100
-Subject: [PATCH] checkpolicy: remove unused te_assertions
-
-This variable is declared in a header file, but never defined or used.
-The te_assert structure definition is only used in this declaration, so
-remove both.
-
-Upstream-Status: Backport [https://github.com/SELinuxProject/selinux/commit/4d330d0d3155211f119b3082f728ae42dcc01e96]
-
-Signed-off-by: Ondrej Mosnacek <omosnace@...>
-Signed-off-by: Mingli Yu <mingli.yu@...>
----
- checkpolicy/checkpolicy.h | 14 --------------
- 1 file changed, 14 deletions(-)
-
-diff --git a/checkpolicy.h b/checkpolicy.h
-index 3868f1fa023b..f127687e72a6 100644
---- a/checkpolicy.h
-+++ b/checkpolicy.h
-@@ -1,20 +1,6 @@
- #ifndef _CHECKPOLICY_H_
- #define _CHECKPOLICY_H_
-
--#include <sepol/policydb/ebitmap.h>
--
--typedef struct te_assert {
-- ebitmap_t stypes;
-- ebitmap_t ttypes;
-- ebitmap_t tclasses;
-- int self;
-- sepol_access_vector_t *avp;
-- unsigned long line;
-- struct te_assert *next;
--} te_assert_t;
--
--te_assert_t *te_assertions;
--
- extern unsigned int policyvers;
-
- #endif
---
-2.24.1
-
diff --git a/recipes-security/selinux/checkpolicy_3.0.bb b/recipes-security/selinux/checkpolicy_3.0.bb
deleted file mode 100644
index 50d6217..0000000
--- a/recipes-security/selinux/checkpolicy_3.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI[md5sum] = "b7c5547b95ce855bcdc10cb8adba8223"
-SRC_URI[sha256sum] = "c88c719a141dd5c1202d49c378c7f063349d630522d5e04dc6e0c53da81aa4f8"
-
-SRC_URI += "\
- file://0001-checkpolicy-remove-unused-te_assertions.patch \
-"
diff --git a/recipes-security/selinux/checkpolicy_3.1.bb b/recipes-security/selinux/checkpolicy_3.1.bb
new file mode 100644
index 0000000..71045b8
--- /dev/null
+++ b/recipes-security/selinux/checkpolicy_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
+
+SRC_URI[md5sum] = "1302676cd8853f740a963fd6d5bb4172"
+SRC_URI[sha256sum] = "dfc7707070520c93b14fbbdfdbe081364d806bf28e3e79e10318c2594c77bbb2"
--
2.25.1