From 13e31066facf3a28a3458407513e79d2e15aadcc Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 13 Apr 2020 19:48:42 +0300 Subject: backports: fix pre- and post- scripts Deploying depmod.conf file makes almost all manipulations in postinst and postrm scripts useless. Clean up these scripts. Related-to: ELB-2687 Signed-off-by: Oleksandr Suvorov --- recipes-kernel/backports/backports_5.4.bb | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/recipes-kernel/backports/backports_5.4.bb b/recipes-kernel/backports/backports_5.4.bb index 0e96e48..5da78be 100644 --- a/recipes-kernel/backports/backports_5.4.bb +++ b/recipes-kernel/backports/backports_5.4.bb @@ -62,30 +62,19 @@ do_install() { } pkg_postinst_${PN} () { -#!/bin/sh -set -e -if [ -z "$D" ]; then - CPWD=`pwd` - depmod -a ${KERNEL_VERSION} - cd /lib/modules/${KERNEL_VERSION}/ - cp modules.order modules.order.save - ls -d backports/*.ko >modules.order - cat modules.order.save >> modules.order - cd $CPWD -else + if [ -z "$D" ]; then + depmod -a ${KERNEL_VERSION} + else # image.bbclass will call depmodwrapper after everything is installed, # no need to do it here as well : -fi + fi } pkg_postrm_${PN} () { -#!/bin/sh -set -e -if [ -z "$D" ]; then - mv /lib/modules/${KERNEL_VERSION}/modules.order.save /lib/modules/${KERNEL_VERSION}/modules.order - depmod -a ${KERNEL_VERSION} -fi + if [ -z "$D" ]; then + depmod -a ${KERNEL_VERSION} + fi } FILES_${PN} = " \ -- cgit v1.2.3