diff options
Diffstat (limited to 'meta-oe/recipes-core/usleep')
-rw-r--r-- | meta-oe/recipes-core/usleep/files/usleep.c | 4 | ||||
-rw-r--r-- | meta-oe/recipes-core/usleep/usleep_1.2.bb | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/meta-oe/recipes-core/usleep/files/usleep.c b/meta-oe/recipes-core/usleep/files/usleep.c index a5e7d9d715..dfa52ec19a 100644 --- a/meta-oe/recipes-core/usleep/files/usleep.c +++ b/meta-oe/recipes-core/usleep/files/usleep.c | |||
@@ -34,7 +34,7 @@ int main(int argc, char **argv) { | |||
34 | int showVersion = 0; | 34 | int showVersion = 0; |
35 | int showOot = 0; | 35 | int showOot = 0; |
36 | int rc; | 36 | int rc; |
37 | char * countStr = NULL; | 37 | const char * countStr = NULL; |
38 | struct poptOption options[] = { | 38 | struct poptOption options[] = { |
39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, | 39 | { "version", 'v', POPT_ARG_NONE, &showVersion, 0, |
40 | "Display the version of this program, and exit" }, | 40 | "Display the version of this program, and exit" }, |
@@ -44,7 +44,7 @@ int main(int argc, char **argv) { | |||
44 | { 0, 0, 0, 0, 0 } | 44 | { 0, 0, 0, 0, 0 } |
45 | }; | 45 | }; |
46 | 46 | ||
47 | optCon = poptGetContext("usleep", argc, argv, options,0); | 47 | optCon = poptGetContext("usleep", argc, (const char **)argv, options,0); |
48 | /*poptReadDefaultConfig(optCon, 1);*/ | 48 | /*poptReadDefaultConfig(optCon, 1);*/ |
49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); | 49 | poptSetOtherOptionHelp(optCon, "[microseconds]"); |
50 | 50 | ||
diff --git a/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-oe/recipes-core/usleep/usleep_1.2.bb index a529032aad..530104e964 100644 --- a/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-oe/recipes-core/usleep/usleep_1.2.bb | |||
@@ -3,7 +3,7 @@ SECTION = "base" | |||
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "GPL-2.0-only" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
5 | 5 | ||
6 | S = "${WORKDIR}" | 6 | S = "${UNPACKDIR}" |
7 | DEPENDS = "popt" | 7 | DEPENDS = "popt" |
8 | 8 | ||
9 | SRC_URI = "file://usleep.c \ | 9 | SRC_URI = "file://usleep.c \ |
@@ -19,8 +19,8 @@ do_install() { | |||
19 | install -d ${D}${base_bindir} | 19 | install -d ${D}${base_bindir} |
20 | install -d ${D}${mandir}/man1 | 20 | install -d ${D}${mandir}/man1 |
21 | 21 | ||
22 | install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} | 22 | install -m 0755 ${UNPACKDIR}/usleep ${D}${base_bindir} |
23 | install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 | 23 | install -m 0644 ${UNPACKDIR}/usleep.1 ${D}${mandir}/man1 |
24 | } | 24 | } |
25 | 25 | ||
26 | inherit update-alternatives | 26 | inherit update-alternatives |
@@ -31,3 +31,7 @@ ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep" | |||
31 | 31 | ||
32 | ALTERNATIVE:${PN}-doc = "usleep.1" | 32 | ALTERNATIVE:${PN}-doc = "usleep.1" |
33 | ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" | 33 | ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" |
34 | |||
35 | # http://errors.yoctoproject.org/Errors/Details/766900/ | ||
36 | # usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types] | ||
37 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||