Skip to contentSkip to conversation

serialcheck: Fix build with musl and mark BROKENCLEAN

PATCH New Khem Raj 1 participant 2 messages Mar 31, 2016

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 serialcheck: Fix build with musl and mark BROKENCLEAN

---
 .../0001-Makefile-Change-order-of-link-flags.patch | 34 ++++++++++++++++++++++
 .../serialcheck/serialcheck_1.0.0.bb               |  9 ++++--
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch
meta-oe/recipes-devtools/serialcheck/serialcheck/0001-Makefile-Change-order-of-link-flags.patch new file +34 -0
new file mode 100644
index 0000000..2ab4834
@@ -0,0 +1,34 @@
+From efc8a4e717ba919c869c2da1c7de2d08bc976926 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 24 Feb 2016 18:48:07 +0000
+Subject: [PATCH] Makefile: Change order of link flags
+
+This helps in injectcting LDFLAGS from env to take effect
+as it appears last on cmdline now
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ Makefile | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ba2bfbb..6d13e68 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,3 +1,9 @@
+-CFLAGS=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
+-CC=gcc
++CFLAGS?=-O2 -Wall -Wextra -g -Wno-sign-compare -Wno-pointer-sign
++CC?=gcc
+ all: serialcheck
++serialcheck : serialcheck.o
++	$(CC) -o serialcheck serialcheck.o $(CFLAGS) $(LDFLAGS)
++
++%.o : %.c
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
++
+-- 
+1.9.1
+
meta-oe/recipes-devtools/serialcheck/serialcheck_1.0.0.bb +7 -2
index d2de523..cd5e0a4 100644
@@ -4,16 +4,20 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://git.breakpoint.cc/bigeasy/serialcheck.git \
-            file://0001-Add-option-to-enable-internal-loopback.patch \
-            file://0002-Restore-original-loopback-config.patch"
+           file://0001-Add-option-to-enable-internal-loopback.patch \
+           file://0002-Restore-original-loopback-config.patch \
+           file://0001-Makefile-Change-order-of-link-flags.patch \
+           "
 
 SRCREV = "63854a2d0c0129efab132ec328a75279e013fb84"
 
 S = "${WORKDIR}/git"
 
+DEPENDS_append_libc-musl = " argp-standalone"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
+LDFLAGS_append_libc-musl = " -largp"
 
 do_install() {
     install -d ${D}${bindir}
@@ -21,5 +25,6 @@ do_install() {
     install -d ${D}${docdir}/${BP}
     install ${S}/Readme.txt ${D}${docdir}/${BP}
 }
+CLEANBROKEN = "1"
 
 BBCLASSEXTEND = "nativesdk"
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 rng-tools: Delete

its moved to OE-Core

---
 meta-oe/recipes-support/rng-tools/files/default  |  3 --
 meta-oe/recipes-support/rng-tools/files/init     | 49 ------------------------
 meta-oe/recipes-support/rng-tools/rng-tools_4.bb | 36 -----------------
 3 files changed, 88 deletions(-)
 delete mode 100644 meta-oe/recipes-support/rng-tools/files/default
 delete mode 100644 meta-oe/recipes-support/rng-tools/files/init
 delete mode 100644 meta-oe/recipes-support/rng-tools/rng-tools_4.bb
meta-oe/recipes-support/rng-tools/files/default deleted +0 -3
deleted file mode 100644
index 7aede9b..0000000
@@ -1,3 +0,0 @@
-# Specify rng device
-#RNG_DEVICE=/dev/hwrng
-RNG_DEVICE=/dev/urandom
meta-oe/recipes-support/rng-tools/files/init deleted +0 -49

49 lines not on this page · raw message

meta-oe/recipes-support/rng-tools/rng-tools_4.bb deleted +0 -36
deleted file mode 100644
index 34a3f95..0000000
@@ -1,36 +0,0 @@
-SUMMARY = "Random number generator daemon"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS_append_libc-uclibc = " argp-standalone"
-
-SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/gkernel/${BP}.tar.gz \
-           file://init \
-           file://default"
-
-SRC_URI[md5sum] = "ae89dbfcf08bdfbea19066cfbf599127"
-SRC_URI[sha256sum] = "b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195"
-
-# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
-# manually to avoid unnecessary postinst/preinst generated.
-python () {
-    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
-inherit autotools update-rc.d
-
-do_install_append() {
-    # Only install the init script when 'sysvinit' is in DISTRO_FEATURES.
-    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
-        install -d "${D}${sysconfdir}/init.d"
-        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools
-        sed -i -e 's,/etc/,${sysconfdir}/,' -e 's,/usr/sbin/,${sbindir}/,' \
-            ${D}${sysconfdir}/init.d/rng-tools
-
-        install -d "${D}${sysconfdir}/default"
-        install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools
-    fi
-}
-
-INITSCRIPT_NAME = "rng-tools"
-INITSCRIPT_PARAMS = "start 30 S . stop 30 0 6 1 ."
Signature · 1 line
1.9.1