On Thu, Aug 4, 2016 at 3:39 PM, Mike Looijmans <[email protected]> wrote: > Since the recipe only actually produces a package called "kernel-module-mali", > it's logical to just name it "kernel-module-mali.bb". This gets rid of the > empty "mali-modules" package and the "PROVIDES" workaround.
I haven't actually applied the PROVIDES work around, so I just removed the last sentence when applying this. But otherwise, Applied. Thanks, Nathan > > Signed-off-by: Mike Looijmans <[email protected]> > --- > recipes-graphics/mali/kernel-module-mali.bb | 35 ++++++++++++++++++++ > .../mali/kernel-module-mali/Makefile.patch | 36 +++++++++++++++++++++ > recipes-graphics/mali/mali-modules.bb | 37 > ---------------------- > recipes-graphics/mali/mali-modules/Makefile.patch | 36 --------------------- > 4 files changed, 71 insertions(+), 73 deletions(-) > create mode 100644 recipes-graphics/mali/kernel-module-mali.bb > create mode 100644 recipes-graphics/mali/kernel-module-mali/Makefile.patch > delete mode 100644 recipes-graphics/mali/mali-modules.bb > delete mode 100644 recipes-graphics/mali/mali-modules/Makefile.patch > > diff --git a/recipes-graphics/mali/kernel-module-mali.bb > b/recipes-graphics/mali/kernel-module-mali.bb > new file mode 100644 > index 0000000..c809243 > --- /dev/null > +++ b/recipes-graphics/mali/kernel-module-mali.bb > @@ -0,0 +1,35 @@ > +SUMMARY = "A Mali 400 Linux Kernel module" > +SECTION = "kernel/modules" > + > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = " \ > + > file://linux/license/gpl/mali_kernel_license.h;md5=68c66513a9dacef77a52c3d6c5e6afd5 > \ > + " > + > +PV = "r5p1-01rel0" > + > +SRC_URI = " \ > + > http://malideveloper.arm.com/downloads/drivers/DX910/${PV}/DX910-SW-99002-${PV}.tgz > \ > + file://Makefile.patch \ > + " > +SRC_URI[md5sum] = "9c85c113e4d41ae992e45ba27287d1ab" > +SRC_URI[sha256sum] = > "86209c99c36a7622402b016b6f764c212b738ccdec9cdc6d6f16758c013957a0" > + > +inherit module > + > +do_make_scripts[depends] += "virtual/kernel:do_unpack" > + > +S = "${WORKDIR}/driver/src/devicedrv/mali" > + > +COMPATIBLE_MACHINE = "^$" > +COMPATIBLE_MACHINE_zynqmp = "zynqmp" > + > +EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ > + ARCH="${ARCH}" \ > + BUILD=release \ > + MALI_PLATFORM="arm" \ > + USING_DT=1 \ > + MALI_SHARED_INTERRUPTS=1 \ > + CROSS_COMPILE="${TARGET_PREFIX}" \ > + O=${STAGING_KERNEL_BUILDDIR} \ > + ' > diff --git a/recipes-graphics/mali/kernel-module-mali/Makefile.patch > b/recipes-graphics/mali/kernel-module-mali/Makefile.patch > new file mode 100644 > index 0000000..0f05687 > --- /dev/null > +++ b/recipes-graphics/mali/kernel-module-mali/Makefile.patch > @@ -0,0 +1,36 @@ > +Change Makefile to be compatible with Yocto > + > +Signed-off-by: Manjukumar Matha <[email protected]> > +Upstream Status: Pending > +--- driver/src/devicedrv/mali/Makefile 2015-03-29 20:38:45.000000000 -0700 > ++++ b/Makefile 2016-01-26 20:13:56.053436042 -0800 > +@@ -85,7 +85,11 @@ > + # Define host system directory > + KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build > + > +-include $(KDIR)/.config > ++ifeq ($(O),) > ++ include $(KDIR)/.config > ++else > ++ include $(O)/.config > ++endif > + > + ifeq ($(ARCH), arm) > + # when compiling for ARM we're cross compiling > +@@ -170,10 +174,15 @@ > + EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 > + endif > + > ++EXTRA_DEFINES += -Wno-error=date-time > ++ > + all: $(UMP_SYMVERS_FILE) > +- $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) O=$(O) modules > + @rm $(FILES_PREFIX)__malidrv_build_info.c > $(FILES_PREFIX)__malidrv_build_info.o > + > ++modules_install: > ++ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules_install > ++ > + clean: > + $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean > + > diff --git a/recipes-graphics/mali/mali-modules.bb > b/recipes-graphics/mali/mali-modules.bb > deleted file mode 100644 > index 20f9d41..0000000 > --- a/recipes-graphics/mali/mali-modules.bb > +++ /dev/null > @@ -1,37 +0,0 @@ > -SUMMARY = "A Mali 400 Linux Kernel module" > -SECTION = "kernel/modules" > - > -PROVIDES += "kernel-module-mali" > - > -LICENSE = "GPLv2" > -LIC_FILES_CHKSUM = " \ > - > file://linux/license/gpl/mali_kernel_license.h;md5=68c66513a9dacef77a52c3d6c5e6afd5 > \ > - " > - > -PV = "r5p1-01rel0" > - > -SRC_URI = " \ > - > http://malideveloper.arm.com/downloads/drivers/DX910/${PV}/DX910-SW-99002-${PV}.tgz > \ > - file://Makefile.patch \ > - " > -SRC_URI[md5sum] = "9c85c113e4d41ae992e45ba27287d1ab" > -SRC_URI[sha256sum] = > "86209c99c36a7622402b016b6f764c212b738ccdec9cdc6d6f16758c013957a0" > - > -inherit module > - > -do_make_scripts[depends] += "virtual/kernel:do_unpack" > - > -S = "${WORKDIR}/driver/src/devicedrv/mali" > - > -COMPATIBLE_MACHINE = "^$" > -COMPATIBLE_MACHINE_zynqmp = "zynqmp" > - > -EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \ > - ARCH="${ARCH}" \ > - BUILD=release \ > - MALI_PLATFORM="arm" \ > - USING_DT=1 \ > - MALI_SHARED_INTERRUPTS=1 \ > - CROSS_COMPILE="${TARGET_PREFIX}" \ > - O=${STAGING_KERNEL_BUILDDIR} \ > - ' > diff --git a/recipes-graphics/mali/mali-modules/Makefile.patch > b/recipes-graphics/mali/mali-modules/Makefile.patch > deleted file mode 100644 > index 0f05687..0000000 > --- a/recipes-graphics/mali/mali-modules/Makefile.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -Change Makefile to be compatible with Yocto > - > -Signed-off-by: Manjukumar Matha <[email protected]> > -Upstream Status: Pending > ---- driver/src/devicedrv/mali/Makefile 2015-03-29 20:38:45.000000000 -0700 > -+++ b/Makefile 2016-01-26 20:13:56.053436042 -0800 > -@@ -85,7 +85,11 @@ > - # Define host system directory > - KDIR-$(shell uname -m):=/lib/modules/$(shell uname -r)/build > - > --include $(KDIR)/.config > -+ifeq ($(O),) > -+ include $(KDIR)/.config > -+else > -+ include $(O)/.config > -+endif > - > - ifeq ($(ARCH), arm) > - # when compiling for ARM we're cross compiling > -@@ -170,10 +174,15 @@ > - EXTRA_DEFINES += -DPROFILING_SKIP_PP_JOBS=1 -DPROFILING_SKIP_GP_JOBS=1 > - endif > - > -+EXTRA_DEFINES += -Wno-error=date-time > -+ > - all: $(UMP_SYMVERS_FILE) > -- $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules > -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) O=$(O) modules > - @rm $(FILES_PREFIX)__malidrv_build_info.c > $(FILES_PREFIX)__malidrv_build_info.o > - > -+modules_install: > -+ $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) modules_install > -+ > - clean: > - $(MAKE) ARCH=$(ARCH) -C $(KDIR) M=$(CURDIR) clean > - > -- > 1.9.1 > -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
