From 0222530fbe0a72942fd469f358510fad81847101 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 21 Jun 2026 15:28:18 -0500 Subject: [PATCH] Update prereq/generated and move recreate-prereq.sh into scripts/prereq --- scripts/prereq/generated/config.h | 3 --- scripts/prereq/generated/newtoys.h | 2 +- scripts/{recreate-prereq.sh => prereq/recreate.sh} | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename scripts/{recreate-prereq.sh => prereq/recreate.sh} (100%) diff --git a/scripts/prereq/generated/config.h b/scripts/prereq/generated/config.h index 2235b919..a4ae9828 100644 --- a/scripts/prereq/generated/config.h +++ b/scripts/prereq/generated/config.h @@ -961,9 +961,6 @@ #define CFG_DEMO_SCANKEY 0 #define USE_DEMO_SCANKEY(...) #define SKIP_DEMO_SCANKEY(...) __VA_ARGS__ -#define CFG_DEMO_SCANLINE 0 -#define USE_DEMO_SCANLINE(...) -#define SKIP_DEMO_SCANLINE(...) __VA_ARGS__ #define CFG_DEMO_UTF8TOWC 0 #define USE_DEMO_UTF8TOWC(...) #define SKIP_DEMO_UTF8TOWC(...) __VA_ARGS__ diff --git a/scripts/prereq/generated/newtoys.h b/scripts/prereq/generated/newtoys.h index d1137719..e9f2f9e0 100644 --- a/scripts/prereq/generated/newtoys.h +++ b/scripts/prereq/generated/newtoys.h @@ -100,7 +100,7 @@ USE_STRINGS(NEWTOY(strings, "t:an#=4<1fo", TOYFLAG_USR|TOYFLAG_BIN)) USE_SYSLOGD(NEWTOY(syslogd,">0l#<1>8=8R:b#<0>99=1s#<0=200m#<0>71582787=20O:p:f:a:nSKLD", TOYFLAG_SBIN|TOYFLAG_STAYROOT)) USE_TAIL(NEWTOY(tail, "?fFs:c(bytes)-n(lines)-[-cn][-fF]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) USE_TAR(NEWTOY(tar, "&(one-file-system)(no-ignore-case)(ignore-case)(no-anchored)(anchored)(no-wildcards)(wildcards)(no-wildcards-match-slash)(wildcards-match-slash)(show-transformed-names)(selinux)(restrict)(full-time)(no-recursion)(null)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(sort);:(mode):(mtime):(group):(owner):(to-command):~(strip-components)(strip)#~(transform)(xform)*Z(zstd)o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)J(xz)j(bzip2)z(gzip)S(sparse)O(to-stdout)P(absolute-names)m(touch)X(exclude-from)*T(files-from)*I(use-compress-program):C(directory):f(file):as[!txc][!jzJa]", TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_UMASK)) -USE_TASKSET(NEWTOY(taskset, "^pa", TOYFLAG_USR|TOYFLAG_BIN)) +USE_TASKSET(NEWTOY(taskset, "^p(pid)a(all-tasks)c(cpu-list)", TOYFLAG_USR|TOYFLAG_BIN)) USE_TELNET(NEWTOY(telnet, "<1>2", TOYFLAG_BIN)) USE_TELNETD(NEWTOY(telnetd, "w#<0b:p#<0>65535=23f:l:FSKi[!wi]", TOYFLAG_USR|TOYFLAG_BIN)) USE_SH(OLDTOY(toysh, sh, TOYFLAG_BIN)) diff --git a/scripts/recreate-prereq.sh b/scripts/prereq/recreate.sh similarity index 100% rename from scripts/recreate-prereq.sh rename to scripts/prereq/recreate.sh -- 2.39.5