kernelpanic/iglunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update toybox

Browse source
This commit is contained in:
Ella Stanforth 2022-08-01 10:04:29 +00:00
parent 812ac0b356
commit 5b3143c78a
5 changed files with 99 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
base/toybox/build.sh
View file

@ -1,21 +1,23 @@
pkgver=0.8.6
pkgver=0.8.7
pkgname=toybox
pkgrel=1
deps="musl"
fetch() {
curl "http://www.landley.net/toybox/downloads/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
curl -O "https://landley.net/toybox/downloads/toybox-$pkgver.tar.gz"
tar -xf $pkgname-$pkgver.tar.gz
curl "https://pci-ids.ucw.cz/v2.2/pci.ids" -o pci.ids
cd $pkgname-$pkgver
patch -p1 < ../../ls-colour.patch
patch -p1 < ../../mksh-make.patch
patch -p1 < ../../mksh.patch
patch -p1 < ../../xxd-i.patch
}
build() {
cd $pkgname-$pkgver
CPUS=1 bad --gmake gmake defconfig
sed 's|# CONFIG_SH is not set|CONFIG_SH=y|' .config > /tmp/_
mv /tmp/_ .config
CPUS=1 bad --gmake gmake
}
@ -28,13 +30,6 @@ package() {
install -Dm 644 pci.ids $pkgdir/usr/share/misc
cd $pkgname-$pkgver
# install -d $pkgdir/bin
# install -Dm755 ./toybox $pkgdir/bin/
# ln -sr $pkgdir/bin/toybox $pkgdir/bin/ln
# ln -sr $pkgdir/bin/toybox $pkgdir/bin/uname
# install -d $pkgdir/usr/bin
# ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/install
# ln -sr $pkgdir/bin/toybox $pkgdir/usr/bin/lspci
bad --gmake gmake PREFIX=$pkgdir install
# Provided by NetBSD Curses
@ -44,6 +39,10 @@ package() {
# LLVM Provides this
rm $pkgdir/usr/bin/readelf
# rm $pkgdir/usr/bin/tar
# MKSH provides this
rm $pkgdir/bin/sh
rm $pkgdir/bin/bash
}
license() {

55
base/toybox/lspci-fix-ids.patch Normal file
View file

@ -0,0 +1,55 @@
--- a/toys/other/lspci.c
+++ b/toys/other/lspci.c
@@ -78,18 +78,45 @@
fseek(TT.db, 0, SEEK_SET);
while (!vbig || !dbig) {
+ int tc = 0; // tab count
s = p;
if (!fgets(s, sizeof(toybuf)-(p-toybuf)-1, TT.db)) break;
- while (isspace(*s)) s++;
+ while (*s == ' ') s++;
if (*s == '#') continue;
- if (vbig && s == p) break;
- if (strstart(&s, vbig ? device : vendor)) {
- if (vbig) dbig = s+2;
- else vbig = s+2;
- s += strlen(s);
- s[-1] = 0; // trim ending newline
- p = s + 1;
+ while (*s == '\t') { s++; tc++; }
+ switch (tc) {
+ case 0:
+ if (strstart(&s, vendor)) {
+ vbig = s + 2;
+ s += strlen(s);
+ s[-1] = 0;
+ p = s + 1;
+ }
+ break;
+ case 1:
+ if (vbig && strstart(&s, device)) {
+ dbig = s + 2;
+ s += strlen(s);
+ s[-1] = 0;
+ p = s + 1;
+ }
+ break;
+ case 2:
+ if (strstart(&s, vendor)) {
+ s+=5;
+ if (strstart(&s, device))
+ printf("subven: %s\n", s);
+ }
+ break;
}
+
+ // if (strstart(&s, vbig ? device : vendor)) {
+ // if (vbig) dbig = s+2;
+ // else vbig = s+2;
+ // s += strlen(s);
+ // s[-1] = 0; // trim ending newline
+ // p = s + 1;
+ // }
}
}

34
base/toybox/mksh-make.patch
View file

@ -1,34 +0,0 @@
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -106,8 +106,7 @@ genbuildsh()
echo '$BUILD $FILES $LINK'
}
-if ! cmp -s <(genbuildsh 2>/dev/null | head -n 6 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS) \
- <(head -n 7 generated/build.sh 2>/dev/null | $SED '7s/ -o .*//')
+if [ "$(genbuildsh 2>/dev/null | head -n 6 ; echo LINK="'"$LDOPTIMIZE $LDFLAGS)" != "$(head -n 7 generated/build.sh 2>/dev/null | $SED '7s/ -o .*//')" ]
then
echo -n "Library probe"
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -16,7 +16,7 @@ probecc()
# Symbol name is first argument, flags second, feed C file to stdin
probesymbol()
{
- probecc "${@:2}" 2>/dev/null && DEFAULT=y || DEFAULT=n
+ probecc $2 2>/dev/null && DEFAULT=y || DEFAULT=n
rm a.out 2>/dev/null
echo -e "config $1\n\tbool" || exit 1
echo -e "\tdefault $DEFAULT\n" || exit 1
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -15,7 +15,7 @@ if [ ! -z "$ASAN" ]; then
fi
# Centos 7 bug workaround, EOL June 30 2024.
-DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
+unset DASHN
export LANG=c
export LC_ALL=C

35
base/toybox/mksh.patch Normal file
View file

@ -0,0 +1,35 @@
--- a/scripts/genconfig.sh
+++ b/scripts/genconfig.sh
@@ -16,7 +16,7 @@
# Symbol name is first argument, flags second, feed C file to stdin
probesymbol()
{
- probecc "${@:2}" 2>/dev/null && DEFAULT=y || DEFAULT=n
+ probecc "$2" 2>/dev/null && DEFAULT=y || DEFAULT=n
rm a.out 2>/dev/null
echo -e "config $1\n\tbool\n\tdefault $DEFAULT\n" || exit 1
}
--- a/scripts/portability.sh
+++ b/scripts/portability.sh
@@ -35,7 +35,7 @@
fi
# Centos 7 bug workaround, EOL June 30 2024. TODO
-DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
+# DASHN=-n; wait -n 2>/dev/null; [ $? -eq 2 ] && unset DASHN
# If the build is using gnu tools, make them behave less randomly.
export LANG=c
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -76,8 +76,8 @@
echo -e "\$BUILD lib/*.c $TOYFILES \$LINK -o $OUTNAME"
}
-if ! cmp -s <(genbuildsh 2>/dev/null | head -n 5) \
- <(head -n 5 "$GENDIR"/build.sh 2>/dev/null | $SED '5s/ -o .*//')
+if [ "$(genbuildsh 2>/dev/null | head -n 5)" != \
+ "$(head -n 5 "$GENDIR"/build.sh 2>/dev/null | $SED '5s/ -o .*//')" ]
then
echo -n "Library probe"

188
base/toybox/xxd.c
View file

@ -1,188 +0,0 @@
/* xxd.c - hexdump.
*
* Copyright 2015 The Android Open Source Project
*
* No obvious standard.
* Regular output:
* "00000000: 4c69 6e75 7820 7665 7273 696f 6e20 342e Linux version 4."
* xxd -i "include" or "initializer" output:
* " 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,"
* xxd -p "plain" output:
* "4c696e75782076657273696f6e20342e392e302d342d616d643634202864"
USE_XXD(NEWTOY(xxd, ">1c#l#o#g#<1=2iprs#[!rs]", TOYFLAG_USR|TOYFLAG_BIN))
config XXD
bool "xxd"
default y
help
usage: xxd [-c n] [-g n] [-i] [-l n] [-o n] [-p] [-r] [-s n] [file]
Hexdump a file to stdout. If no file is listed, copy from stdin.
Filename "-" is a synonym for stdin.
-c n Show n bytes per line (default 16)
-g n Group bytes by adding a ' ' every n bytes (default 2)
-i Include file output format (comma-separated hex byte literals)
-l n Limit of n bytes before stopping (default is no limit)
-o n Add n to display offset
-p Plain hexdump (30 bytes/line, no grouping)
-r Reverse operation: turn a hexdump into a binary file
-s n Skip to offset n
*/
#define FOR_xxd
#include "toys.h"
GLOBALS(
long s, g, o, l, c;
)
static void do_xxd(int fd, char *name)
{
long long pos = 0;
long long limit = TT.l;
int i, len, space;
if (toys.optflags&FLAG_s) {
xlseek(fd, TT.s, SEEK_SET);
pos = TT.s;
if (limit) limit += TT.s;
}
while (0<(len = readall(fd, toybuf,
(limit && limit-pos<TT.c)?limit-pos:TT.c))) {
if (!(toys.optflags&FLAG_p)) printf("%08llx: ", TT.o + pos);
pos += len;
space = 2*TT.c+TT.c/TT.g+1;
for (i=0; i<len;) {
space -= printf("%02x", toybuf[i]);
if (!(++i%TT.g)) {
putchar(' ');
space--;
}
}
if (!(toys.optflags&FLAG_p)) {
printf("%*s", space, "");
for (i=0; i<len; i++)
putchar((toybuf[i]>=' ' && toybuf[i]<='~') ? toybuf[i] : '.');
}
putchar('\n');
}
if (len<0) perror_exit("read");
}
static void do_xxd_include(int fd, char *name)
{
long long total = 0;
int c = 1, i, len;
// The original xxd outputs a header/footer if given a filename (not stdin).
// We don't, which means that unlike the original we can implement -ri
printf("unsigned char %s", isdigit(name[0]) ? "__": "");
for (char *n = name; *n; n++)
putc(*n == '.' ? '_' : *n);
puts("[] {");
while ((len = read(fd, toybuf, sizeof(toybuf))) > 0) {
total += len;
for (i = 0; i < len; ++i) {
printf("%s%#.02x", c > 1 ? ", " : " ", toybuf[i]);
if (c++ == TT.c) {
xprintf(",\n");
c = 1;
}
}
}
puts("};");
printf("unsigned int %s", isdigit(name[0]) ? "__": "");
for (char *n = name; *n; n++)
putc(*n == '.' ? '_' : *n);
printf(" = %d;\n", len);
if (len < 0) perror_msg_raw(name);
if (c > 1) xputc('\n');
}
static int dehex(char ch)
{
if (ch >= '0' && ch <= '9') return ch - '0';
if (ch >= 'a' && ch <= 'f') return ch - 'a' + 10;
if (ch >= 'A' && ch <= 'F') return ch - 'A' + 10;
return (ch == '\n') ? -2 : -1;
}
static void do_xxd_reverse(int fd, char *name)
{
FILE *fp = xfdopen(fd, "r");
int tmp;
if (toys.optflags&FLAG_i) {
// -ri is a very easy special case.
while (fscanf(fp, " 0x%02x,", &tmp) == 1) {
fputc(tmp & 0xff, stdout);
}
} else {
while (!feof(fp)) {
int col = 0;
// Each line of a regular hexdump starts with an offset/address.
// Each line of a plain hexdump just goes straight into the bytes.
if (!(toys.optflags&FLAG_p)) {
long long pos;
if (fscanf(fp, "%llx: ", &pos) == 1) {
if (fseek(stdout, pos, SEEK_SET) != 0) {
// TODO: just write out zeros if non-seekable?
perror_exit("%s: seek failed", name);
}
}
}
// A plain hexdump can have as many bytes per line as you like,
// but a non-plain hexdump assumes garbage after it's seen the
// specified number of bytes.
while (toys.optflags&FLAG_p || col < TT.c) {
int n1, n2;
// If we're at EOF or EOL or we read some non-hex...
if ((n1 = n2 = dehex(fgetc(fp))) < 0 || (n2 = dehex(fgetc(fp))) < 0) {
// If we're at EOL, start on that line.
if (n1 == -2 || n2 == -2) continue;
// Otherwise, skip to the next line.
break;
}
fputc((n1 << 4) | (n2 & 0xf), stdout);
col++;
// Is there any grouping going on? Ignore a single space.
tmp = fgetc(fp);
if (tmp != ' ') ungetc(tmp, fp);
}
// Skip anything else on this line (such as the ASCII dump).
while ((tmp = fgetc(fp)) != EOF && tmp != '\n')
;
}
}
if (ferror(fp)) perror_msg_raw(name);
fclose(fp);
}
void xxd_main(void)
{
if (TT.c < 0 || TT.c > 256) error_exit("invalid -c: %ld", TT.c);
if (TT.c == 0) TT.c = (toys.optflags&FLAG_i)?12:16;
// Plain style is 30 bytes/line, no grouping.
if (toys.optflags&FLAG_p) TT.c = TT.g = 30;
loopfiles(toys.optargs,
toys.optflags&FLAG_r ? do_xxd_reverse
: (toys.optflags&FLAG_i ? do_xxd_include : do_xxd));
}