diff options
| author | Armin Kuster <akuster808@gmail.com> | 2018-02-24 09:36:50 -0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-03-01 16:10:37 -0800 |
| commit | eaff8c24ab1b88efc9340d90c268f4aea3795992 (patch) | |
| tree | 0e76a4fdaf4c658e8b812f0e496aadf82786fee5 /meta-oe/recipes-extended | |
| parent | aaf6d267143e11dabe78faa06ab913b4f203ad69 (diff) | |
| download | meta-openembedded-eaff8c24ab1b88efc9340d90c268f4aea3795992.tar.gz | |
dash: move dash to recipes-shell
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch | 28 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/dash/dash_0.5.9.1.bb | 29 |
2 files changed, 0 insertions, 57 deletions
diff --git a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch b/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch deleted file mode 100644 index b3991faa88..0000000000 --- a/meta-oe/recipes-extended/dash/dash/0001-Fix-printf-format-errors-with-clang.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 3ddf397febf47f8de9ca2805e92355ecb3ba0e9f Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 8 Apr 2017 12:37:54 -0700 | ||
| 4 | Subject: [PATCH] Fix printf format errors with clang | ||
| 5 | |||
| 6 | error: format string is not a string literal (potentially insecure) | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | --- | ||
| 10 | src/jobs.c | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/jobs.c b/src/jobs.c | ||
| 14 | index c2c2332..dcb81c1 100644 | ||
| 15 | --- a/src/jobs.c | ||
| 16 | +++ b/src/jobs.c | ||
| 17 | @@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) | ||
| 18 | goto out; | ||
| 19 | #endif | ||
| 20 | } | ||
| 21 | - col = fmtstr(s, 32, strsignal(st)); | ||
| 22 | + col = fmtstr(s, 32, "%s", strsignal(st)); | ||
| 23 | #ifdef WCOREDUMP | ||
| 24 | if (WCOREDUMP(status)) { | ||
| 25 | col += fmtstr(s + col, 16, " (core dumped)"); | ||
| 26 | -- | ||
| 27 | 2.12.2 | ||
| 28 | |||
diff --git a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb b/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb deleted file mode 100644 index 6dee66f691..0000000000 --- a/meta-oe/recipes-extended/dash/dash_0.5.9.1.bb +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | SUMMARY = "Small and fast POSIX-compliant shell" | ||
| 2 | HOMEPAGE = "http://gondor.apana.org.au/~herbert/dash/" | ||
| 3 | SECTION = "System Environment/Shells" | ||
| 4 | |||
| 5 | LICENSE = "BSD & GPLv2+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b5262b4a1a1bff72b48e935531976d2e" | ||
| 7 | |||
| 8 | inherit autotools update-alternatives | ||
| 9 | |||
| 10 | SRC_URI = "http://gondor.apana.org.au/~herbert/${BPN}/files/${BP}.tar.gz \ | ||
| 11 | file://0001-Fix-printf-format-errors-with-clang.patch \ | ||
| 12 | " | ||
| 13 | SRC_URI[md5sum] = "6472702a8d9760d166ef8333dcb527a6" | ||
| 14 | SRC_URI[sha256sum] = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659" | ||
| 15 | |||
| 16 | EXTRA_OECONF += "--bindir=${base_bindir}" | ||
| 17 | |||
| 18 | ALTERNATIVE_${PN} = "sh" | ||
| 19 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | ||
| 20 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/dash" | ||
| 21 | ALTERNATIVE_PRIORITY = "10" | ||
| 22 | |||
| 23 | pkg_postinst_${PN} () { | ||
| 24 | grep -q "^${base_bindir}/dash$" $D${sysconfdir}/shells || echo ${base_bindir}/dash >> $D${sysconfdir}/shells | ||
| 25 | } | ||
| 26 | |||
| 27 | pkg_postrm_${PN} () { | ||
| 28 | printf "$(grep -v "^${base_bindir}/dash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells | ||
| 29 | } | ||
