From 50759d254a16165f070807fb992815319b97dddd Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 26 Oct 2017 14:19:17 -0700 Subject: edac-utils: move to recipes-bsp Signed-off-by: Armin Kuster --- meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb | 47 +++++++++++ .../files/add-restart-to-initscript.patch | 33 ++++++++ meta-oe/recipes-bsp/edac-utils/files/edac.service | 10 +++ ...cript-be-able-to-automatically-load-EDAC-.patch | 98 ++++++++++++++++++++++ .../recipes-support/edac-utils/edac-utils_git.bb | 47 ----------- .../files/add-restart-to-initscript.patch | 33 -------- .../recipes-support/edac-utils/files/edac.service | 10 --- ...cript-be-able-to-automatically-load-EDAC-.patch | 98 ---------------------- 8 files changed, 188 insertions(+), 188 deletions(-) create mode 100644 meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb create mode 100644 meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch create mode 100644 meta-oe/recipes-bsp/edac-utils/files/edac.service create mode 100644 meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch delete mode 100644 meta-oe/recipes-support/edac-utils/edac-utils_git.bb delete mode 100644 meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch delete mode 100644 meta-oe/recipes-support/edac-utils/files/edac.service delete mode 100644 meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch (limited to 'meta-oe') diff --git a/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb new file mode 100644 index 0000000000..2c0914d30a --- /dev/null +++ b/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -0,0 +1,47 @@ +SUMMARY = "Userspace helper for Linux kernel EDAC drivers" +HOMEPAGE = "https://github.com/grondo/edac-utils" +SECTION = "Applications/System" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = " sysfsutils" + +SRCREV = "f9aa96205f610de39a79ff43c7478b7ef02e3138" +PV = "0.18+git${SRCPV}" + +S = "${WORKDIR}/git" + +SRC_URI = "git://github.com/grondo/edac-utils \ + file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ + file://add-restart-to-initscript.patch \ + file://edac.service \ +" + +inherit autotools-brokensep systemd + +do_configure_prepend () { + touch ${S}/ChangeLog + ${S}/bootstrap +} + +RDEPENDS_${PN}_x86 = "dmidecode" +RDEPENDS_${PN}_x86-64 = "dmidecode" +RDEPENDS_${PN}_arm = "dmidecode" +RDEPENDS_${PN}_aarch64 = "dmidecode" +RDEPENDS_${PN}_powerpc = "dmidecode" +RDEPENDS_${PN}_powerpc64 = "dmidecode" +RDEPENDS_${PN}_append = " \ + perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \ + perl-module-overload \ + perl-module-overloading \ + perl-module-file-glob \ +" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service +} + +SYSTEMD_SERVICE_${PN} = "edac.service" +SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch b/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch new file mode 100644 index 0000000000..87051da906 --- /dev/null +++ b/meta-oe/recipes-bsp/edac-utils/files/add-restart-to-initscript.patch @@ -0,0 +1,33 @@ +From 3ade837f64de0cfe2aed5bc52f7919760f350531 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Fri, 7 Mar 2014 00:57:12 -0500 +Subject: [PATCH] edac: add restart to initscript + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan +--- + src/etc/edac.init.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in +index adf76ee..007a519 100644 +--- a/src/etc/edac.init.in ++++ b/src/etc/edac.init.in +@@ -155,8 +155,12 @@ case "$1" in + status) + service_status + ;; ++ restart) ++ service_stop ++ service_start ++ ;; + *) +- COMMANDS="start|stop|status" ++ COMMANDS="start|stop|status|restart" + echo "Usage: $0 {${COMMANDS}}" + exit 2 + ;; +-- +1.7.9.5 + diff --git a/meta-oe/recipes-bsp/edac-utils/files/edac.service b/meta-oe/recipes-bsp/edac-utils/files/edac.service new file mode 100644 index 0000000000..f6b211e91b --- /dev/null +++ b/meta-oe/recipes-bsp/edac-utils/files/edac.service @@ -0,0 +1,10 @@ +[Unit] +Description=Initialize EDAC Drivers For Machine Hardware + +[Service] +Type=oneshot +ExecStart=@SBINDIR@/edac-ctl --register-labels +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch new file mode 100644 index 0000000000..fddc25f601 --- /dev/null +++ b/meta-oe/recipes-bsp/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch @@ -0,0 +1,98 @@ +make init script be able to automatically load EDAC module. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Roy.Li +--- + src/etc/edac.init.in | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 47 insertions(+), 2 deletions(-) + +diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in +index 7a51da9..5b568c4 100644 +--- a/src/etc/edac.init.in ++++ b/src/etc/edac.init.in +@@ -42,7 +42,6 @@ for dir in "$sysconfdir/default" "$sysconfdir/sysconfig"; do + [ -f "$dir/$SERVICE" ] && . "$dir/$SERVICE" + done + +- + ############################################################################### + + service_start () +@@ -52,6 +51,46 @@ service_start () + # Assume that if EDAC_DRIVER is not set, then EDAC is configured + # automatically, thus return successfully, but don't do anything. + # ++ if [ ! -f /etc/edac/edac-driver ]; then ++ [ -d /sys/bus/edac/devices/mc/mc0 ] && \ ++ echo `lsmod | grep _edac | cut -d" " -f1` > /etc/edac/edac-driver ++ fi ++ ++ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` ++ ++ if [ -z "$EDAC_DRIVER" ]; then ++ ++ DRIVER_PATH=/lib/modules/`uname -r`/kernel/drivers/edac ++ oldpath=`pwd` ++ if [ -d $DRIVER_PATH ]; then ++ ++ cd $DRIVER_PATH ++ ++ for i in $(/bin/ls | /usr/bin/cut -d. -f1) ; do ++ /sbin/modprobe $i 2>/dev/null ++ if [ -d /sys/bus/edac/devices/mc/mc0 ]; then ++ echo $i> /etc/edac/edac-driver ++ EDAC_DRIVER=$i ++ break ++ fi ++ /sbin/modprobe -r $i 2>/dev/null ++ done ++ ++ cd "$oldpath" ++ ++ ++ if [ -z "$EDAC_DRIVER" ]; then ++ echo "This board may not support EDAC, or EDAC module may not be compiled in" ++ exit ++ fi ++ ++ else ++ echo "This board may not support EDAC, or EDAC module may not be compiled in" ++ exit ++ fi ++ ++ fi ++ + if [ -n "$EDAC_DRIVER" ]; then + echo -n "Starting ${SERVICE}: " + modprobe $EDAC_DRIVER +@@ -76,12 +115,15 @@ service_start () + service_stop () + { + echo -n "Disabling ${SERVICE}: " ++ ++ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` ++ + if [ -n "$EDAC_DRIVER" ]; then + modprobe -r $EDAC_DRIVER + STATUS=$? + [ $STATUS -eq 0 ] && echo success || echo failure + else +- echo "Not supported for this configuration." ++ echo "Not supported for this configuration, or EDAC Module is not loaded." + STATUS=6 + fi + } +@@ -92,6 +134,9 @@ service_status () + { + # Print the current status of the service. Required by LSB. + # ++ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` ++ [ -z "$EDAC_DRIVER" ] && STATUS=1 && exit ++ + edac-ctl --status + STATUS=0 + } +-- +1.7.10.4 + diff --git a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb b/meta-oe/recipes-support/edac-utils/edac-utils_git.bb deleted file mode 100644 index 2c0914d30a..0000000000 --- a/meta-oe/recipes-support/edac-utils/edac-utils_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "Userspace helper for Linux kernel EDAC drivers" -HOMEPAGE = "https://github.com/grondo/edac-utils" -SECTION = "Applications/System" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = " sysfsutils" - -SRCREV = "f9aa96205f610de39a79ff43c7478b7ef02e3138" -PV = "0.18+git${SRCPV}" - -S = "${WORKDIR}/git" - -SRC_URI = "git://github.com/grondo/edac-utils \ - file://make-init-script-be-able-to-automatically-load-EDAC-.patch \ - file://add-restart-to-initscript.patch \ - file://edac.service \ -" - -inherit autotools-brokensep systemd - -do_configure_prepend () { - touch ${S}/ChangeLog - ${S}/bootstrap -} - -RDEPENDS_${PN}_x86 = "dmidecode" -RDEPENDS_${PN}_x86-64 = "dmidecode" -RDEPENDS_${PN}_arm = "dmidecode" -RDEPENDS_${PN}_aarch64 = "dmidecode" -RDEPENDS_${PN}_powerpc = "dmidecode" -RDEPENDS_${PN}_powerpc64 = "dmidecode" -RDEPENDS_${PN}_append = " \ - perl-module-file-basename perl-module-file-find perl-module-getopt-long perl-module-posix \ - perl-module-overload \ - perl-module-overloading \ - perl-module-file-glob \ -" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service -} - -SYSTEMD_SERVICE_${PN} = "edac.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" diff --git a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch b/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch deleted file mode 100644 index 87051da906..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/add-restart-to-initscript.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3ade837f64de0cfe2aed5bc52f7919760f350531 Mon Sep 17 00:00:00 2001 -From: Wenzong Fan -Date: Fri, 7 Mar 2014 00:57:12 -0500 -Subject: [PATCH] edac: add restart to initscript - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan ---- - src/etc/edac.init.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in -index adf76ee..007a519 100644 ---- a/src/etc/edac.init.in -+++ b/src/etc/edac.init.in -@@ -155,8 +155,12 @@ case "$1" in - status) - service_status - ;; -+ restart) -+ service_stop -+ service_start -+ ;; - *) -- COMMANDS="start|stop|status" -+ COMMANDS="start|stop|status|restart" - echo "Usage: $0 {${COMMANDS}}" - exit 2 - ;; --- -1.7.9.5 - diff --git a/meta-oe/recipes-support/edac-utils/files/edac.service b/meta-oe/recipes-support/edac-utils/files/edac.service deleted file mode 100644 index f6b211e91b..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/edac.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Initialize EDAC Drivers For Machine Hardware - -[Service] -Type=oneshot -ExecStart=@SBINDIR@/edac-ctl --register-labels -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch b/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch deleted file mode 100644 index fddc25f601..0000000000 --- a/meta-oe/recipes-support/edac-utils/files/make-init-script-be-able-to-automatically-load-EDAC-.patch +++ /dev/null @@ -1,98 +0,0 @@ -make init script be able to automatically load EDAC module. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Roy.Li ---- - src/etc/edac.init.in | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 47 insertions(+), 2 deletions(-) - -diff --git a/src/etc/edac.init.in b/src/etc/edac.init.in -index 7a51da9..5b568c4 100644 ---- a/src/etc/edac.init.in -+++ b/src/etc/edac.init.in -@@ -42,7 +42,6 @@ for dir in "$sysconfdir/default" "$sysconfdir/sysconfig"; do - [ -f "$dir/$SERVICE" ] && . "$dir/$SERVICE" - done - -- - ############################################################################### - - service_start () -@@ -52,6 +51,46 @@ service_start () - # Assume that if EDAC_DRIVER is not set, then EDAC is configured - # automatically, thus return successfully, but don't do anything. - # -+ if [ ! -f /etc/edac/edac-driver ]; then -+ [ -d /sys/bus/edac/devices/mc/mc0 ] && \ -+ echo `lsmod | grep _edac | cut -d" " -f1` > /etc/edac/edac-driver -+ fi -+ -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ -+ if [ -z "$EDAC_DRIVER" ]; then -+ -+ DRIVER_PATH=/lib/modules/`uname -r`/kernel/drivers/edac -+ oldpath=`pwd` -+ if [ -d $DRIVER_PATH ]; then -+ -+ cd $DRIVER_PATH -+ -+ for i in $(/bin/ls | /usr/bin/cut -d. -f1) ; do -+ /sbin/modprobe $i 2>/dev/null -+ if [ -d /sys/bus/edac/devices/mc/mc0 ]; then -+ echo $i> /etc/edac/edac-driver -+ EDAC_DRIVER=$i -+ break -+ fi -+ /sbin/modprobe -r $i 2>/dev/null -+ done -+ -+ cd "$oldpath" -+ -+ -+ if [ -z "$EDAC_DRIVER" ]; then -+ echo "This board may not support EDAC, or EDAC module may not be compiled in" -+ exit -+ fi -+ -+ else -+ echo "This board may not support EDAC, or EDAC module may not be compiled in" -+ exit -+ fi -+ -+ fi -+ - if [ -n "$EDAC_DRIVER" ]; then - echo -n "Starting ${SERVICE}: " - modprobe $EDAC_DRIVER -@@ -76,12 +115,15 @@ service_start () - service_stop () - { - echo -n "Disabling ${SERVICE}: " -+ -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ - if [ -n "$EDAC_DRIVER" ]; then - modprobe -r $EDAC_DRIVER - STATUS=$? - [ $STATUS -eq 0 ] && echo success || echo failure - else -- echo "Not supported for this configuration." -+ echo "Not supported for this configuration, or EDAC Module is not loaded." - STATUS=6 - fi - } -@@ -92,6 +134,9 @@ service_status () - { - # Print the current status of the service. Required by LSB. - # -+ [ -f /etc/edac/edac-driver ] && EDAC_DRIVER=`cat /etc/edac/edac-driver` -+ [ -z "$EDAC_DRIVER" ] && STATUS=1 && exit -+ - edac-ctl --status - STATUS=0 - } --- -1.7.10.4 - -- cgit 1.2.3-korg