diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-02 23:12:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-02 23:12:07 +0200 |
| commit | 231c256c60513e21ccbdf59490ab9ccec1cf4cfc (patch) | |
| tree | 12c88dc409d9ea9e6188d18b261890ef33388451 /package/util-linux | |
| parent | 797d8166b79d3f2dc06922222aa36d0e39aae8f2 (diff) | |
| parent | a8428de05cd6ad86dba8444de78a64294d4ddb5e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 6 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-sys-utils_setarch_c | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 68f196009..09251de35 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.26.1 -PKG_RELEASE:= 2 +PKG_VERSION:= 2.26.2 +PKG_RELEASE:= 1 PKG_EXTRAVER:= v2.26 -PKG_HASH:= 22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e +PKG_HASH:= 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses diff --git a/package/util-linux/patches/patch-sys-utils_setarch_c b/package/util-linux/patches/patch-sys-utils_setarch_c deleted file mode 100644 index 16558fa24..000000000 --- a/package/util-linux/patches/patch-sys-utils_setarch_c +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-2.26.1.orig/sys-utils/setarch.c 2015-02-19 10:55:10.000000000 +0100 -+++ util-linux-2.26.1/sys-utils/setarch.c 2015-03-29 11:46:25.000000000 +0200 -@@ -309,7 +309,7 @@ int main(int argc, char *argv[]) - #if defined(__sparc64__) || defined(__sparc__) - if (archwrapper && strcmp(arch, "sparc32bash") == 0) { - if (set_arch(arch, 0L, 0)) -- err(EXIT_FAILURE, _("Failed to set personality to %s"), p); -+ err(EXIT_FAILURE, _("Failed to set personality to %s"), arch); - execl("/bin/bash", NULL); - err(EXIT_FAILURE, _("failed to execute %s"), "/bin/bash"); - } |