diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-08-22 14:56:12 +0100 |
| commit | ce9af1cc5ea23f754587448cf35b5120c77bfeef (patch) | |
| tree | 69e5eaba5e75ab909ed92d5045393471b8ff3c13 /scripts | |
| parent | c170026700eabb10147dd848c45c06995b43a32e (diff) | |
| parent | e837a0dbbebf4229306df98fe9ee3b9bb30630c4 (diff) | |
| download | busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.gz busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.tar.bz2 busybox-w32-ce9af1cc5ea23f754587448cf35b5120c77bfeef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.IMA | 3 | ||||
| -rw-r--r-- | scripts/echo.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Makefile.IMA b/scripts/Makefile.IMA index 0eced2982..f155108d7 100644 --- a/scripts/Makefile.IMA +++ b/scripts/Makefile.IMA | |||
| @@ -115,6 +115,9 @@ lib-y:= | |||
| 115 | include debianutils/Kbuild | 115 | include debianutils/Kbuild |
| 116 | lib-all-y += $(patsubst %,debianutils/%,$(sort $(lib-y))) | 116 | lib-all-y += $(patsubst %,debianutils/%,$(sort $(lib-y))) |
| 117 | lib-y:= | 117 | lib-y:= |
| 118 | include klibc-utils/Kbuild | ||
| 119 | lib-all-y += $(patsubst %,klibc-utils/%,$(sort $(lib-y))) | ||
| 120 | lib-y:= | ||
| 118 | include runit/Kbuild | 121 | include runit/Kbuild |
| 119 | lib-all-y += $(patsubst %,runit/%,$(sort $(lib-y))) | 122 | lib-all-y += $(patsubst %,runit/%,$(sort $(lib-y))) |
| 120 | lib-y:= | 123 | lib-y:= |
diff --git a/scripts/echo.c b/scripts/echo.c index cb207ae05..8c6b409d3 100644 --- a/scripts/echo.c +++ b/scripts/echo.c | |||
| @@ -214,7 +214,7 @@ int main(int argc, char **argv) | |||
| 214 | * may be used to endorse or promote products derived from this software | 214 | * may be used to endorse or promote products derived from this software |
| 215 | * without specific prior written permission. | 215 | * without specific prior written permission. |
| 216 | * | 216 | * |
| 217 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | 217 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ''AS IS'' AND |
| 218 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 218 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 219 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 219 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| 220 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | 220 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE |