* [PATCH][meta-oe 1/3] owfs: add init script for owfs
2012-06-11 15:34 [PATCH][meta-oe 0/3] Pending fixes in O.S. Systems' tree Otavio Salvador
@ 2012-06-11 15:34 ` Otavio Salvador
2012-06-11 16:43 ` Koen Kooi
2012-06-11 15:34 ` [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5 Otavio Salvador
2012-06-11 15:34 ` [PATCH][meta-oe 3/3] cpuburn-neon: fix packaging to use a date as version and valid sources Otavio Salvador
2 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2012-06-11 15:34 UTC (permalink / raw)
To: openembedded-devel
owfs has the capability of use an FUSE based service and it seems
logical to init it during system boot; this adds the required init
script for it.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-extended/owfs/owfs/owfs | 59 ++++++++++++++++++++++++++
meta-oe/recipes-extended/owfs/owfs_2.8p15.bb | 9 +++-
2 files changed, 65 insertions(+), 3 deletions(-)
create mode 100755 meta-oe/recipes-extended/owfs/owfs/owfs
diff --git a/meta-oe/recipes-extended/owfs/owfs/owfs b/meta-oe/recipes-extended/owfs/owfs/owfs
new file mode 100755
index 0000000..766bbbb
--- /dev/null
+++ b/meta-oe/recipes-extended/owfs/owfs/owfs
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/bin
+
+DAEMON="owfs"
+
+test -f /usr/bin/${DAEMON} || exit 0
+
+if test -f /etc/default/${DAEMON} ; then
+. /etc/default/${DAEMON}
+else
+:
+fi
+
+if [ "$START_OWFS" != "yes" ]
+then
+ exit 0
+fi
+
+startdaemon(){
+ echo -n "Starting ${DAEMON}: "
+ start-stop-daemon --start -x /usr/bin/${DAEMON} -- ${CMDLINE} --pid_file /var/run/${DAEMON}.pid
+ echo "done"
+}
+
+stopdaemon(){
+ echo -n "Stopping ${DAEMON}: "
+ start-stop-daemon --stop -p /var/run/${DAEMON}.pid
+ echo "done"
+}
+
+
+
+case "$1" in
+ start)
+ startdaemon
+ ;;
+ stop)
+ stopdaemon
+ ;;
+ force-reload)
+ stopdaemon
+ startdaemon
+ ;;
+ restart)
+ stopdaemon
+ startdaemon
+ ;;
+ reload)
+ stopdaemon
+ startdaemon
+ ;;
+ *)
+ echo "Usage: ${DAEMON} { start | stop | restart | reload }" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb b/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb
index d7c5040..2a00276 100644
--- a/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb
+++ b/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb
@@ -8,9 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
DEPENDS = "fuse virtual/libusb0"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \
+ file://owfs \
file://owhttpd \
file://owserver "
SRC_URI[md5sum] = "24ec3d04ded1b199831f03e70d9e2f1f"
@@ -36,6 +37,7 @@ EXTRA_OECONF = " \
do_install_prepend() {
install -d ${D}${sysconfdir}/default/
install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/owfs ${D}${sysconfdir}/init.d/owfs
install -m 0755 ${WORKDIR}/owhttpd ${D}${sysconfdir}/init.d/owhttpd
install -m 0755 ${WORKDIR}/owserver ${D}${sysconfdir}/init.d/owserver
}
@@ -64,9 +66,10 @@ FILES_libowcapi = "${libdir}/libowcapi-*"
FILES_libow = "${libdir}/libow-*"
FILES_libownet = "${libdir}/libownet-*"
-INITSCRIPT_PACKAGES = "owhttpd owserver"
+INITSCRIPT_PACKAGES = "owfs owhttpd owserver"
+INITSCRIPT_NAME_owfs = "owfs"
INITSCRIPT_NAME_owserver = "owserver"
INITSCRIPT_NAME_owhttpd = "owhttpd"
+INITSCRIPT_PARAMS_owfs = "defaults 20"
INITSCRIPT_PARAMS_owserver = "defaults 20"
INITSCRIPT_PARAMS_owhttpd = "defaults 21"
-
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH][meta-oe 1/3] owfs: add init script for owfs
2012-06-11 15:34 ` [PATCH][meta-oe 1/3] owfs: add init script for owfs Otavio Salvador
@ 2012-06-11 16:43 ` Koen Kooi
2012-06-11 16:45 ` Otavio Salvador
0 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2012-06-11 16:43 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 11-06-12 10:34, Otavio Salvador schreef:
> owfs has the capability of use an FUSE based service and it seems logical
> to init it during system boot; this adds the required init script for
> it.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---
> meta-oe/recipes-extended/owfs/owfs/owfs | 59
> ++++++++++++++++++++++++++ meta-oe/recipes-extended/owfs/owfs_2.8p15.bb |
> 9 +++- 2 files changed, 65 insertions(+), 3 deletions(-) create mode
> 100755 meta-oe/recipes-extended/owfs/owfs/owfs
>
> diff --git a/meta-oe/recipes-extended/owfs/owfs/owfs
> b/meta-oe/recipes-extended/owfs/owfs/owfs new file mode 100755 index
> 0000000..766bbbb --- /dev/null +++
> b/meta-oe/recipes-extended/owfs/owfs/owfs
That's missing LSB headers
> @@ -0,0 +1,59 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/bin + +DAEMON="owfs"
> + +test -f /usr/bin/${DAEMON} || exit 0 + +if test -f
> /etc/default/${DAEMON} ; then +. /etc/default/${DAEMON} +else +: +fi +
> +if [ "$START_OWFS" != "yes" ] +then + exit 0 +fi + +startdaemon(){ +
> echo -n "Starting ${DAEMON}: " + start-stop-daemon --start -x
> /usr/bin/${DAEMON} -- ${CMDLINE} --pid_file /var/run/${DAEMON}.pid +
> echo "done" +} + +stopdaemon(){ + echo -n "Stopping ${DAEMON}: " +
> start-stop-daemon --stop -p /var/run/${DAEMON}.pid + echo "done"
> +} + + + +case "$1" in + start) + startdaemon + ;; + stop) +
> stopdaemon + ;; + force-reload) + stopdaemon + startdaemon + ;; +
> restart) + stopdaemon + startdaemon + ;; + reload) + stopdaemon +
> startdaemon + ;; + *) + echo "Usage: ${DAEMON} { start | stop | restart
> | reload }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git
> a/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb
> b/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb index d7c5040..2a00276
> 100644 --- a/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb +++
> b/meta-oe/recipes-extended/owfs/owfs_2.8p15.bb @@ -8,9 +8,10 @@
> LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
> \
>
> DEPENDS = "fuse virtual/libusb0"
>
> -PR = "r1" +PR = "r2"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ +
> file://owfs \ file://owhttpd \ file://owserver " SRC_URI[md5sum] =
> "24ec3d04ded1b199831f03e70d9e2f1f" @@ -36,6 +37,7 @@ EXTRA_OECONF = " \
> do_install_prepend() { install -d ${D}${sysconfdir}/default/ install -d
> ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/owfs
> ${D}${sysconfdir}/init.d/owfs install -m 0755 ${WORKDIR}/owhttpd
> ${D}${sysconfdir}/init.d/owhttpd install -m 0755 ${WORKDIR}/owserver
> ${D}${sysconfdir}/init.d/owserver } @@ -64,9 +66,10 @@ FILES_libowcapi =
> "${libdir}/libowcapi-*" FILES_libow = "${libdir}/libow-*" FILES_libownet
> = "${libdir}/libownet-*"
>
> -INITSCRIPT_PACKAGES = "owhttpd owserver" +INITSCRIPT_PACKAGES = "owfs
> owhttpd owserver" +INITSCRIPT_NAME_owfs = "owfs" INITSCRIPT_NAME_owserver
> = "owserver" INITSCRIPT_NAME_owhttpd = "owhttpd" +INITSCRIPT_PARAMS_owfs
> = "defaults 20" INITSCRIPT_PARAMS_owserver = "defaults 20"
> INITSCRIPT_PARAMS_owhttpd = "defaults 21" -
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQIcBAEBAgAGBQJP1iAZAAoJEHZqAkdh1vT6qXIP/AwH21dzOYgZaJbC2u5QYTXb
1VCPiExoEP/1EriZ9B3O4RCPSBB/J7Ejc/VZzLw3GdN8KC2QxLWJqTHbMRN7R648
sBtCPBhBgKi6M7DCHs4auHzbM/tK7PBq5zlUy9wmDrzt47aOe0i/x7HM7/L3760M
CjGkSYbErkXfRug3VVRs/Z0yK0LYbbnbzaQ759iH5hX1N/bPKbTQpYUloeZRrL1I
BEzWuqxNCbgzIkODyqghT8rH+yFgWA3GjhJsVLraiO3C+WbYYwlr6SR8zVrZuPWX
385+ekY90ZP3YT6V6u+VeRgB93RfhWLYpyIoX+c1DN1nF2nOoDGbGS47TaOpohru
Bc52j6tslpDBxQ91JbUhp/RusdI5AVSnzm/veElo0YSvx+7Rz279lV8aDnrld4u2
8bvQ/O2nTd5VcfwEEn3vr1K+Q358qP0CRpWdP9t7VBpSLuq8CWqO07lEagUuxlez
HdSJ+M98mH+DCGk1OTZew7jZ2oUBiK4Kjk2QFTKP+sKSeHV9e2w8cgRwtiA4tTA6
mVThCL2Pw2qALDCV2h0Mgu7mtypwD9ELTQpKtq6TbvLS1Ne84fdtFF63Uoh9XFIc
khYJ2NIv5v1pcKCN9l9oYXLRVmgDy5Rx6JsuEC19Zmh5TYdCwMyedgnWgHQptO9u
xJdl9/oLrHBzi1cZTzcS
=sfm4
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5
2012-06-11 15:34 [PATCH][meta-oe 0/3] Pending fixes in O.S. Systems' tree Otavio Salvador
2012-06-11 15:34 ` [PATCH][meta-oe 1/3] owfs: add init script for owfs Otavio Salvador
@ 2012-06-11 15:34 ` Otavio Salvador
2012-06-11 16:44 ` Koen Kooi
2012-06-11 15:34 ` [PATCH][meta-oe 3/3] cpuburn-neon: fix packaging to use a date as version and valid sources Otavio Salvador
2 siblings, 1 reply; 10+ messages in thread
From: Otavio Salvador @ 2012-06-11 15:34 UTC (permalink / raw)
To: openembedded-devel
The build system defaults to 'softfp' but this use hardware
instructions that are not available making node to fail to run on
ARMv5 based CPUs. Now we check if TARGET_FPU is 'soft' and change the
default of the build system so it works.
Tested on i.MX233 (ARM926EJ-S)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb
index 7136ffc..972d02a 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.6.18.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=914812f2875eef849b5c509cc25dcb4f"
DEPENDS = "openssl"
+PR = "r1"
+
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
file://fix-hardfloat-detection.patch"
@@ -16,6 +18,9 @@ S = "${WORKDIR}/node-v${PV}"
# v8 errors out if you have set CCACHE
CCACHE = ""
+# Workaround a build to proper use soft FPU for armv5
+FORCE_SOFT_FPU = "${@bb.utils.contains("TUNE_FEATURES", "soft", "yes", "no", d)}"
+
do_configure_virtclass-native () {
sed -i -e s:\'/usr/lib:\'${STAGING_LIBDIR}:g wscript
sed -i -e s:\'/usr/local/lib:\'${STAGING_LIBDIR}:g wscript
@@ -40,6 +45,10 @@ do_configure () {
export CC=gcc
export CXX=g++
+ if [ "${FORCE_SOFT_FPU}" = "yes" ]; then
+ sed -i "s,'default': 'softfp','default': 'soft',g" ${S}/deps/v8/SConstruct
+ fi
+
./configure --prefix=${prefix} --without-snapshot
}
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5
2012-06-11 15:34 ` [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5 Otavio Salvador
@ 2012-06-11 16:44 ` Koen Kooi
2012-06-11 16:52 ` Otavio Salvador
0 siblings, 1 reply; 10+ messages in thread
From: Koen Kooi @ 2012-06-11 16:44 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 11-06-12 10:34, Otavio Salvador schreef:
> The build system defaults to 'softfp' but this use hardware instructions
> that are not available making node to fail to run on ARMv5 based CPUs.
That's not true, you are probably getting a wrong -mfpu setting. This patch
changes the ABI, which is the wrong thing to do, NAK.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iQIcBAEBAgAGBQJP1iCEAAoJEHZqAkdh1vT60rUP/RscVAFvhgbYe5fbkvSM+MI6
M+lWqbjSfMwrk+R4RlNQkJVWIiiWiCnsL3d5DhVa6gonvKpFVkPs73w4qZKfWV6E
fawSkXiOMJIYnnxJ45Gcx9RwRu71lRAM+F/22OZIBdEKWreYJ7NB/ZYM/9Rglvgs
xwaaDix0fGa5OJsgLyRXXiwQGAR8ii+nAnJ6VyvuKXevU5cVmZ42N/NpnhajtB6q
zx1O7hleUeY96AUY09xInXi3x4XY/LxTg361dND7TZN772xHtZh1ovM3RPSaMo8Z
enQqLfc1tOmkTva4Bs1MXVkAPPeKzGEGdeW4f+tjvQmhXOnWez6U3JoKok94mw8G
V6rU1QH57/2hrfl9EEzXbvIBkWm9YIzjEW1EpFF3piqlEMrm1Tbmp831NDKVqfnh
gYRP0l6fMb62GaxXqY2vyvpuYxV/qhJe739FAjmYi9NFFuaShnrDC0EyBHb32luL
cNDHynug716QDVrv3+zsgp/5GgmpDgNfJBjnyxvnBfVrkxn223sadsi83ZWE2vOA
4pjE11IaK3RGer9dsAzxYegZiavad8HU9DZLJR1mlzNmHoYJc/EC3euos9l/tlAE
EJ814hogHhvSfzjgLfI6+Nom9s9I2shl1p+Osy6av3sf25v1fJPBJmd+HdrIovx5
jR8BLzOaWBpNzVFxZgAN
=9VGf
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5
2012-06-11 16:44 ` Koen Kooi
@ 2012-06-11 16:52 ` Otavio Salvador
0 siblings, 0 replies; 10+ messages in thread
From: Otavio Salvador @ 2012-06-11 16:52 UTC (permalink / raw)
To: openembedded-devel
On Mon, Jun 11, 2012 at 1:44 PM, Koen Kooi <koen@dominion.thruhere.net>wrote:
> Op 11-06-12 10:34, Otavio Salvador schreef:
> > The build system defaults to 'softfp' but this use hardware instructions
> > that are not available making node to fail to run on ARMv5 based CPUs.
>
> That's not true, you are probably getting a wrong -mfpu setting. This patch
> changes the ABI, which is the wrong thing to do, NAK.
>
This is indeed the problem but this caused by the build system and the only
way I found to change it was this way. Can you propose another way to fix
it?
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH][meta-oe 3/3] cpuburn-neon: fix packaging to use a date as version and valid sources
2012-06-11 15:34 [PATCH][meta-oe 0/3] Pending fixes in O.S. Systems' tree Otavio Salvador
2012-06-11 15:34 ` [PATCH][meta-oe 1/3] owfs: add init script for owfs Otavio Salvador
2012-06-11 15:34 ` [PATCH][meta-oe 2/3] nodejs: force use of -mfpu-abi=soft for ARMv5 Otavio Salvador
@ 2012-06-11 15:34 ` Otavio Salvador
2012-07-01 21:02 ` Otavio Salvador
2012-07-17 17:20 ` Otavio Salvador
2 siblings, 2 replies; 10+ messages in thread
From: Otavio Salvador @ 2012-06-11 15:34 UTC (permalink / raw)
To: openembedded-devel
* The package were not versioning the sources as the files had no
version on its name. We workaround it mangling the DL_DIR;
* We now dynamically check if the machine has or not neon feature and
set COMPATIBLE_MACHINE.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../{cpuburn-neon.bb => cpuburn-neon_20120610.bb} | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
rename meta-oe/recipes-benchmark/cpuburn/{cpuburn-neon.bb => cpuburn-neon_20120610.bb} (68%)
diff --git a/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon.bb b/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20120610.bb
similarity index 68%
rename from meta-oe/recipes-benchmark/cpuburn/cpuburn-neon.bb
rename to meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20120610.bb
index bb9ca1c..5bc3129 100644
--- a/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon.bb
+++ b/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20120610.bb
@@ -2,19 +2,17 @@ DESCRIPTION = "CPU burn app that loads the NEON coprocessor fully"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://burn.S;md5=823abc72c2cd448e87df9bc5355a4456"
-PR = "r1"
+DL_DIR_append = "/${PN}-${PV}"
-# only for ARM systems infact it should check for MACHINE_FEATURE
-# neon or something. For now we spare non arm arches from picking this up
-
-COMPATIBLE_HOST = "arm.*"
+# Ensure to make this available for machine which has neon
+COMPATIBLE_MACHINE = "(${@bb.utils.contains("TUNE_FEATURES", "neon", "${MACHINE}", "Invalid!", d)})"
SRC_URI = "http://hardwarebug.org/files/burn.S;name=mru \
http://github.com/downloads/ssvb/ssvb.github.com/ssvb-cpuburn-a8.S;name=ssvb"
SRC_URI[mru.md5sum] = "823abc72c2cd448e87df9bc5355a4456"
SRC_URI[mru.sha256sum] = "01d9fc04f83740c513c25401dcc89c11b2a5a6013e70bfca42b7b02129f88cd2"
-SRC_URI[ssvb.md5sum] = "f1af41dcd56e4f0f7e92b67109dc01ed"
-SRC_URI[ssvb.sha256sum] = "95e2267a684be0d848dd6f935e769fa3ed810274ebacddc3fe8ddac4b34838c2"
+SRC_URI[ssvb.md5sum] = "0acc570d943c41c7f8602b9ff6fa111d"
+SRC_URI[ssvb.sha256sum] = "bfddd3226a499ffdf71bb58c05ccdc6dac5bb2c2c3bdb10ac610ee0b60aac087"
S = "${WORKDIR}"
--
1.7.2.5
^ permalink raw reply related [flat|nested] 10+ messages in thread