Hehe dinit go brr
This commit is contained in:
parent
2deb2a1834
commit
d992fa3e60
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'base-system'
|
# Template file for 'base-system'
|
||||||
pkgname=base-system
|
pkgname=base-system
|
||||||
version=0.114
|
version=0.114
|
||||||
revision=5
|
revision=6
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
build_style=meta
|
build_style=meta
|
||||||
short_desc="Evolution Linux base system meta package"
|
short_desc="Evolution Linux base system meta package"
|
||||||
|
@ -10,12 +10,12 @@ license="Public Domain"
|
||||||
homepage="https://evolutionos.codeberg.page"
|
homepage="https://evolutionos.codeberg.page"
|
||||||
|
|
||||||
depends="
|
depends="
|
||||||
base-files ncurses busybox-core libgcc
|
base-files ncurses busybox-evolution libgcc
|
||||||
bash file util-linux man-pages
|
bash file man-pages
|
||||||
mdocml>=1.13.3 shadow e2fsprogs btrfs-progs xfsprogs dosfstools
|
mdocml>=1.13.3 shadow btrfs-progs
|
||||||
procps-ng tzdata iana-etc openssh dhcpcd
|
procps-ng tzdata iana-etc openssh dhcpcd
|
||||||
kbd iproute2 iputils wpa_supplicant xbps wifi-firmware
|
kbd iwd xbps wifi-firmware
|
||||||
ethtool kmod acpid eudev runit-void removed-packages
|
kmod eudev dinit removed-packages
|
||||||
evolution-patches opendoas booster evolution-artwork"
|
evolution-patches opendoas booster evolution-artwork"
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
From bc988b0c48d337d7b3447ad8a634551ca5080178 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
|
|
||||||
Date: Thu, 9 Mar 2023 14:15:21 +0100
|
|
||||||
Subject: [PATCH] generator: Fix creation of target directory
|
|
||||||
|
|
||||||
This attempts to fix a regression introduced in commit
|
|
||||||
e13aa77e49aef93cc1370a269785b471758cb546 since this commit
|
|
||||||
the `usr/lib` target directroy is not created if the host system
|
|
||||||
does not ship any files in `usr/lib` (e.g. Alpine). This causes
|
|
||||||
initramfs images generated on such systems to not be bootable
|
|
||||||
as `lib` is a symlink to the non-existend `usr/lib` then.
|
|
||||||
|
|
||||||
The problem is the current implementation:
|
|
||||||
|
|
||||||
filepath.Dir(filepath.Join(filepath.Dir(l.src), l.target))
|
|
||||||
|
|
||||||
Would return `/usr` for `{"/lib", "usr/lib"}` and hence `/usr/lib`
|
|
||||||
was never created. I believe this was intended to be:
|
|
||||||
|
|
||||||
filepath.Join(filepath.Dir(l.src), l.target)
|
|
||||||
|
|
||||||
This commit changes this accordingly and fixes booting Booster
|
|
||||||
images on Alpine.
|
|
||||||
---
|
|
||||||
generator/generator.go | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/generator/generator.go b/generator/generator.go
|
|
||||||
index 4a030e5..0ab135c 100644
|
|
||||||
--- a/generator/generator.go
|
|
||||||
+++ b/generator/generator.go
|
|
||||||
@@ -263,7 +263,7 @@ func appendCompatibilitySymlinks(img *Image) error {
|
|
||||||
for _, l := range symlinks {
|
|
||||||
// Ensure that target always exist which may not be the
|
|
||||||
// case if we only install files from /lib or /bin.
|
|
||||||
- targetDir := filepath.Dir(filepath.Join(filepath.Dir(l.src), l.target))
|
|
||||||
+ targetDir := filepath.Join(filepath.Dir(l.src), l.target)
|
|
||||||
if err := img.AppendDirEntry(targetDir); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
|
@ -1,85 +0,0 @@
|
||||||
From 7766b079c8fd004fee9d5eba19cb98cac568773b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Anatol Pomozov <anatol.pomozov@gmail.com>
|
|
||||||
Date: Thu, 23 Mar 2023 18:49:14 -0700
|
|
||||||
Subject: [PATCH] generator: Do not rely on user's lookup order for binaries
|
|
||||||
|
|
||||||
Until now we used `exec.LookPath` golang function to lookup binaries.
|
|
||||||
This function depends on user's $PATH envvar and the order directories
|
|
||||||
specified there. This could mess with our image symlink tree.
|
|
||||||
|
|
||||||
What we want is to make sure that we lookup/add files at non-symlinked
|
|
||||||
directories first (i.e. /usr/bin).
|
|
||||||
|
|
||||||
Closes #213
|
|
||||||
---
|
|
||||||
generator/generator.go | 28 ++++++++++++++++++++++++++--
|
|
||||||
generator/generator_test.go | 6 ++++++
|
|
||||||
2 files changed, 32 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/generator/generator.go b/generator/generator.go
|
|
||||||
index 0ab135c..8f0a72f 100644
|
|
||||||
--- a/generator/generator.go
|
|
||||||
+++ b/generator/generator.go
|
|
||||||
@@ -5,7 +5,6 @@ import (
|
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
"os"
|
|
||||||
- "os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
@@ -290,7 +289,7 @@ func (img *Image) appendExtraFiles(binaries ...string) error {
|
|
||||||
// If the given name is not an absolute path, assume that it refers
|
|
||||||
// to an executable and lookup the path to the executable using $PATH.
|
|
||||||
var err error
|
|
||||||
- f, err = exec.LookPath(f)
|
|
||||||
+ f, err = lookupPath(f)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
@@ -303,6 +302,31 @@ func (img *Image) appendExtraFiles(binaries ...string) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
+func lookupPath(binary string) (string, error) {
|
|
||||||
+ paths := []string{
|
|
||||||
+ "/usr/bin",
|
|
||||||
+ "/usr/sbin",
|
|
||||||
+ "/bin",
|
|
||||||
+ "/sbin",
|
|
||||||
+ "/usr/local/bin",
|
|
||||||
+ "/usr/local/sbin",
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for _, p := range paths {
|
|
||||||
+ f := filepath.Join(p, binary)
|
|
||||||
+ _, err := os.Stat(f)
|
|
||||||
+ if os.IsNotExist(err) {
|
|
||||||
+ continue
|
|
||||||
+ }
|
|
||||||
+ if err != nil {
|
|
||||||
+ return "", err
|
|
||||||
+ }
|
|
||||||
+ return f, nil
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return "", os.ErrNotExist
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
func findFwFile(fw string) (string, error) {
|
|
||||||
supportedFwExt := []string{
|
|
||||||
"",
|
|
||||||
diff --git a/generator/generator_test.go b/generator/generator_test.go
|
|
||||||
index 57b7cce..5938cbc 100644
|
|
||||||
--- a/generator/generator_test.go
|
|
||||||
+++ b/generator/generator_test.go
|
|
||||||
@@ -550,3 +550,9 @@ func TestModprobeOptions(t *testing.T) {
|
|
||||||
}
|
|
||||||
require.Equal(t, expect, cfg.ModprobeOptions)
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+func TestLookupFile(t *testing.T) {
|
|
||||||
+ path, err := lookupPath("echo")
|
|
||||||
+ require.NoError(t, err)
|
|
||||||
+ require.Equal(t, "/usr/bin/echo", path)
|
|
||||||
+}
|
|
|
@ -1,17 +1,17 @@
|
||||||
# Template file for 'booster'
|
# Template file for 'booster'
|
||||||
pkgname=booster
|
pkgname=booster
|
||||||
version=0.10
|
version=0.11
|
||||||
revision=1
|
revision=0
|
||||||
build_style=go
|
build_style=go
|
||||||
go_import_path=github.com/anatol/booster
|
go_import_path=github.com/anatol/booster
|
||||||
hostmakedepends="git ruby-ronn"
|
hostmakedepends="git ruby-ronn"
|
||||||
depends="busybox-core"
|
depends="busybox-evolution"
|
||||||
short_desc="Fast and secure initramfs generator"
|
short_desc="Fast and secure initramfs generator"
|
||||||
maintainer="travankor <travankor@tuta.io>"
|
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
homepage="https://github.com/anatol/booster"
|
homepage="https://github.com/anatol/booster"
|
||||||
distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
|
distfiles="https://github.com/anatol/booster/archive/${version}.tar.gz"
|
||||||
checksum=27a7e40135ceb5504438ce0a45108ef955f5ece197932acc7686fd6c0254565c
|
checksum=2f111b1729143c38ec287e5567ae9f57e0fb8118cc11afa22657da8ac9b0105a
|
||||||
conf_files="/etc/booster.yaml"
|
conf_files="/etc/booster.yaml"
|
||||||
alternatives="
|
alternatives="
|
||||||
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst
|
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/booster/kernel-hook-postinst
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
busybox-evolution/
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,11 +1,11 @@
|
||||||
# Template file for 'busybox'
|
# Template file for 'busybox'
|
||||||
pkgname=busybox
|
pkgname=busybox-evolution
|
||||||
version=1.36.1
|
version=1.36.1
|
||||||
revision=1
|
revision=2
|
||||||
hostmakedepends="perl"
|
hostmakedepends="perl pkg-config"
|
||||||
checkdepends="tar which zip"
|
checkdepends="tar which zip"
|
||||||
short_desc="Swiss Army Knife of Embedded Linux"
|
short_desc="Swiss Army Knife of Embedded Linux (evolutionOS edition)"
|
||||||
maintainer="Cameron Nemo <cam@nohom.org>"
|
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="https://www.busybox.net"
|
homepage="https://www.busybox.net"
|
||||||
distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
|
distfiles="${homepage}/downloads/busybox-${version}.tar.bz2"
|
||||||
|
@ -42,8 +42,10 @@ do_configure() {
|
||||||
mkdir -p src
|
mkdir -p src
|
||||||
mv * src || true
|
mv * src || true
|
||||||
|
|
||||||
|
cp ${FILESDIR}/libbb.h src/include/libbb.h
|
||||||
|
|
||||||
local t
|
local t
|
||||||
for t in busybox busybox-static busybox-core busybox-huge; do
|
for t in busybox busybox-static; do
|
||||||
mkdir -p $t
|
mkdir -p $t
|
||||||
cp -f ${FILESDIR}/dotconfig ${t}/.config
|
cp -f ${FILESDIR}/dotconfig ${t}/.config
|
||||||
|
|
||||||
|
@ -59,11 +61,10 @@ do_configure() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
_patch_config busybox udhcpc ntpd
|
_patch_config busybox-static static
|
||||||
_patch_config busybox-static udhcpc ntpd static
|
|
||||||
_patch_config busybox-huge udhcpc ntpd httpd mdev sysklogd huge
|
|
||||||
|
|
||||||
for t in busybox-core busybox busybox-static busybox-huge; do
|
for t in busybox busybox-static; do
|
||||||
|
CONFIG_EXTRA_LDLIBS="pam"
|
||||||
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" oldconfig
|
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" oldconfig
|
||||||
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
|
make -C "${t}" KBUILD_SRC="${wrksrc}/src" -f "${wrksrc}/src/Makefile" prepare "${makejobs}"
|
||||||
done
|
done
|
||||||
|
@ -76,13 +77,13 @@ do_configure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
for t in busybox-core busybox busybox-static busybox-huge; do
|
for t in busybox busybox-static; do
|
||||||
make -C "${t}" SKIP_STRIP=y "${makejobs}"
|
make -C "${t}" SKIP_STRIP=y "${makejobs}"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
do_check() {
|
do_check() {
|
||||||
for t in busybox-core busybox busybox-static busybox-huge; do
|
for t in busybox busybox-static; do
|
||||||
make -C "${t}" "${makejobs}" \
|
make -C "${t}" "${makejobs}" \
|
||||||
SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \
|
SKIP_KNOWN_BUGS=yes SKIP_INTERNET_TESTS=yes \
|
||||||
check
|
check
|
||||||
|
@ -92,18 +93,6 @@ do_check() {
|
||||||
do_install() {
|
do_install() {
|
||||||
vbin busybox/busybox_unstripped busybox
|
vbin busybox/busybox_unstripped busybox
|
||||||
vman busybox/docs/busybox.1
|
vman busybox/docs/busybox.1
|
||||||
vsv busybox-ntpd
|
|
||||||
}
|
|
||||||
|
|
||||||
busybox-core_package() {
|
|
||||||
short_desc+=" (essential applets)"
|
|
||||||
conflicts="busybox>=0 busybox-huge>=0"
|
|
||||||
alternatives="${_alternatives_core}"
|
|
||||||
register_shell="/usr/bin/ash"
|
|
||||||
pkg_install() {
|
|
||||||
vbin busybox-core/busybox_unstripped busybox
|
|
||||||
vman busybox-core/docs/busybox.1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
busybox-static_package() {
|
busybox-static_package() {
|
||||||
|
@ -112,17 +101,3 @@ busybox-static_package() {
|
||||||
vbin busybox-static/busybox busybox.static
|
vbin busybox-static/busybox busybox.static
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
busybox-huge_package() {
|
|
||||||
short_desc+=" (extra applets)"
|
|
||||||
conflicts="busybox>=0 busybox-core>=0"
|
|
||||||
alternatives="${_alternatives}"
|
|
||||||
register_shell="/usr/bin/ash"
|
|
||||||
pkg_install() {
|
|
||||||
vbin busybox-huge/busybox_unstripped busybox
|
|
||||||
vman busybox-huge/docs/busybox.1
|
|
||||||
vsv busybox-ntpd
|
|
||||||
vsv busybox-syslogd
|
|
||||||
vsv busybox-klogd
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
exec 2>&1
|
|
||||||
exec busybox klogd -n
|
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
exec 2>&1
|
|
||||||
exec busybox ntpd -nN -p pool.ntp.org
|
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
exec 2>&1
|
|
||||||
exec busybox syslogd -n
|
|
|
@ -1,39 +0,0 @@
|
||||||
@@ -864,22 +864,22 @@
|
|
||||||
# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
|
|
||||||
CONFIG_HOSTNAME=y
|
|
||||||
CONFIG_DNSDOMAINNAME=y
|
|
||||||
-# CONFIG_HTTPD is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_RANGES is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_SETUID is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_CGI is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_PROXY is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_GZIP is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_ETAG is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_DATE is not set
|
|
||||||
-# CONFIG_FEATURE_HTTPD_ACL_IP is not set
|
|
||||||
+CONFIG_HTTPD=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_RANGES=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_SETUID=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_CGI=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_PROXY=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_GZIP=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_ETAG=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_LAST_MODIFIED=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_DATE=y
|
|
||||||
+CONFIG_FEATURE_HTTPD_ACL_IP=y
|
|
||||||
CONFIG_IFCONFIG=y
|
|
||||||
CONFIG_FEATURE_IFCONFIG_STATUS=y
|
|
||||||
CONFIG_FEATURE_IFCONFIG_SLIP=y
|
|
|
@ -1,422 +0,0 @@
|
||||||
@@ -94,7 +94,7 @@
|
|
||||||
CONFIG_PASSWORD_MINLEN=6
|
|
||||||
CONFIG_MD5_SMALL=1
|
|
||||||
CONFIG_SHA3_SMALL=1
|
|
||||||
-# CONFIG_FEATURE_FAST_TOP is not set
|
|
||||||
+CONFIG_FEATURE_FAST_TOP=y
|
|
||||||
# CONFIG_FEATURE_ETC_NETWORKS is not set
|
|
||||||
# CONFIG_FEATURE_ETC_SERVICES is not set
|
|
||||||
CONFIG_FEATURE_EDITING=y
|
|
||||||
@@ -125,7 +125,7 @@
|
|
||||||
CONFIG_FEATURE_USE_SENDFILE=y
|
|
||||||
CONFIG_FEATURE_COPYBUF_KB=4
|
|
||||||
CONFIG_FEATURE_SKIP_ROOTFS=y
|
|
||||||
-# CONFIG_MONOTONIC_SYSCALL is not set
|
|
||||||
+CONFIG_MONOTONIC_SYSCALL=y
|
|
||||||
# CONFIG_IOCTL_HEX2STR_ERROR is not set
|
|
||||||
# CONFIG_FEATURE_HWIB is not set
|
|
||||||
|
|
||||||
@@ -159,9 +159,9 @@
|
|
||||||
CONFIG_BZIP2=y
|
|
||||||
CONFIG_BZIP2_SMALL=8
|
|
||||||
CONFIG_FEATURE_BZIP2_DECOMPRESS=y
|
|
||||||
-# CONFIG_CPIO is not set
|
|
||||||
-# CONFIG_FEATURE_CPIO_O is not set
|
|
||||||
-# CONFIG_FEATURE_CPIO_P is not set
|
|
||||||
+CONFIG_CPIO=y
|
|
||||||
+CONFIG_FEATURE_CPIO_O=y
|
|
||||||
+CONFIG_FEATURE_CPIO_P=y
|
|
||||||
# CONFIG_DPKG is not set
|
|
||||||
# CONFIG_DPKG_DEB is not set
|
|
||||||
CONFIG_GZIP=y
|
|
||||||
@@ -192,7 +192,7 @@
|
|
||||||
CONFIG_FEATURE_UNZIP_BZIP2=y
|
|
||||||
CONFIG_FEATURE_UNZIP_LZMA=y
|
|
||||||
CONFIG_FEATURE_UNZIP_XZ=y
|
|
||||||
-# CONFIG_FEATURE_LZMA_FAST is not set
|
|
||||||
+CONFIG_FEATURE_LZMA_FAST=y
|
|
||||||
|
|
||||||
#
|
|
||||||
# Coreutils
|
|
||||||
@@ -206,7 +206,7 @@
|
|
||||||
CONFIG_CHOWN=y
|
|
||||||
CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
|
|
||||||
CONFIG_CHROOT=y
|
|
||||||
-# CONFIG_CKSUM is not set
|
|
||||||
+CONFIG_CKSUM=y
|
|
||||||
CONFIG_CRC32=y
|
|
||||||
CONFIG_COMM=y
|
|
||||||
CONFIG_CP=y
|
|
||||||
@@ -216,11 +216,11 @@
|
|
||||||
CONFIG_FEATURE_CUT_REGEX=y
|
|
||||||
CONFIG_DATE=y
|
|
||||||
CONFIG_FEATURE_DATE_ISOFMT=y
|
|
||||||
-# CONFIG_FEATURE_DATE_NANO is not set
|
|
||||||
+CONFIG_FEATURE_DATE_NANO=y
|
|
||||||
CONFIG_FEATURE_DATE_COMPAT=y
|
|
||||||
CONFIG_DD=y
|
|
||||||
CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
|
|
||||||
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
|
|
||||||
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
|
|
||||||
CONFIG_FEATURE_DD_IBS_OBS=y
|
|
||||||
CONFIG_FEATURE_DD_STATUS=y
|
|
||||||
CONFIG_DF=y
|
|
||||||
@@ -269,7 +269,7 @@
|
|
||||||
#
|
|
||||||
# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
|
|
||||||
#
|
|
||||||
-# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
|
|
||||||
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
|
|
||||||
CONFIG_MKDIR=y
|
|
||||||
CONFIG_MKFIFO=y
|
|
||||||
CONFIG_MKNOD=y
|
|
||||||
@@ -316,7 +316,7 @@
|
|
||||||
CONFIG_TEST1=y
|
|
||||||
CONFIG_TEST2=y
|
|
||||||
CONFIG_FEATURE_TEST_64=y
|
|
||||||
-# CONFIG_TIMEOUT is not set
|
|
||||||
+CONFIG_TIMEOUT=y
|
|
||||||
CONFIG_TOUCH=y
|
|
||||||
CONFIG_FEATURE_TOUCH_SUSV3=y
|
|
||||||
CONFIG_TR=y
|
|
||||||
@@ -330,7 +330,7 @@
|
|
||||||
CONFIG_BB_ARCH=y
|
|
||||||
CONFIG_UNIQ=y
|
|
||||||
CONFIG_UNLINK=y
|
|
||||||
-# CONFIG_USLEEP is not set
|
|
||||||
+CONFIG_USLEEP=y
|
|
||||||
CONFIG_UUDECODE=y
|
|
||||||
CONFIG_BASE32=y
|
|
||||||
CONFIG_BASE64=y
|
|
||||||
@@ -374,7 +374,7 @@
|
|
||||||
# CONFIG_FEATURE_LOADFONT_PSF2 is not set
|
|
||||||
# CONFIG_FEATURE_LOADFONT_RAW is not set
|
|
||||||
CONFIG_LOADKMAP=y
|
|
||||||
-# CONFIG_OPENVT is not set
|
|
||||||
+CONFIG_OPENVT=y
|
|
||||||
CONFIG_RESET=y
|
|
||||||
# CONFIG_RESIZE is not set
|
|
||||||
# CONFIG_FEATURE_RESIZE_PRINT is not set
|
|
||||||
@@ -549,7 +549,7 @@
|
|
||||||
#
|
|
||||||
CONFIG_CHATTR=y
|
|
||||||
# CONFIG_FSCK is not set
|
|
||||||
-# CONFIG_LSATTR is not set
|
|
||||||
+CONFIG_LSATTR=y
|
|
||||||
# CONFIG_TUNE2FS is not set
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -592,7 +592,7 @@
|
|
||||||
CONFIG_BLKID=y
|
|
||||||
CONFIG_FEATURE_BLKID_TYPE=y
|
|
||||||
# CONFIG_BLOCKDEV is not set
|
|
||||||
-# CONFIG_CAL is not set
|
|
||||||
+CONFIG_CAL=y
|
|
||||||
# CONFIG_CHRT is not set
|
|
||||||
CONFIG_DMESG=y
|
|
||||||
CONFIG_FEATURE_DMESG_PRETTY=y
|
|
||||||
@@ -644,13 +644,13 @@
|
|
||||||
CONFIG_FEATURE_MDEV_DAEMON=y
|
|
||||||
# CONFIG_MESG is not set
|
|
||||||
# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
|
|
||||||
-# CONFIG_MKE2FS is not set
|
|
||||||
-# CONFIG_MKFS_EXT2 is not set
|
|
||||||
+CONFIG_MKE2FS=y
|
|
||||||
+CONFIG_MKFS_EXT2=y
|
|
||||||
# CONFIG_MKFS_MINIX is not set
|
|
||||||
# CONFIG_FEATURE_MINIX2 is not set
|
|
||||||
# CONFIG_MKFS_REISER is not set
|
|
||||||
-# CONFIG_MKDOSFS is not set
|
|
||||||
-# CONFIG_MKFS_VFAT is not set
|
|
||||||
+CONFIG_MKDOSFS=y
|
|
||||||
+CONFIG_MKFS_VFAT=y
|
|
||||||
CONFIG_MKSWAP=y
|
|
||||||
CONFIG_FEATURE_MKSWAP_UUID=y
|
|
||||||
CONFIG_MORE=y
|
|
||||||
@@ -664,19 +664,19 @@
|
|
||||||
CONFIG_FEATURE_MOUNT_FLAGS=y
|
|
||||||
CONFIG_FEATURE_MOUNT_FSTAB=y
|
|
||||||
CONFIG_FEATURE_MOUNT_OTHERTAB=y
|
|
||||||
-# CONFIG_MOUNTPOINT is not set
|
|
||||||
+CONFIG_MOUNTPOINT=y
|
|
||||||
# CONFIG_NOLOGIN is not set
|
|
||||||
# CONFIG_NOLOGIN_DEPENDENCIES is not set
|
|
||||||
CONFIG_NSENTER=y
|
|
||||||
CONFIG_PIVOT_ROOT=y
|
|
||||||
-# CONFIG_RDATE is not set
|
|
||||||
+CONFIG_RDATE=y
|
|
||||||
# CONFIG_RDEV is not set
|
|
||||||
# CONFIG_READPROFILE is not set
|
|
||||||
CONFIG_RENICE=y
|
|
||||||
-# CONFIG_REV is not set
|
|
||||||
-# CONFIG_RTCWAKE is not set
|
|
||||||
-# CONFIG_SCRIPT is not set
|
|
||||||
-# CONFIG_SCRIPTREPLAY is not set
|
|
||||||
+CONFIG_REV=y
|
|
||||||
+CONFIG_RTCWAKE=y
|
|
||||||
+CONFIG_SCRIPT=y
|
|
||||||
+CONFIG_SCRIPTREPLAY=y
|
|
||||||
CONFIG_SETARCH=y
|
|
||||||
CONFIG_LINUX32=y
|
|
||||||
CONFIG_LINUX64=y
|
|
||||||
@@ -691,9 +691,9 @@
|
|
||||||
CONFIG_SWAPOFF=y
|
|
||||||
CONFIG_FEATURE_SWAPONOFF_LABEL=y
|
|
||||||
CONFIG_SWITCH_ROOT=y
|
|
||||||
-# CONFIG_TASKSET is not set
|
|
||||||
-# CONFIG_FEATURE_TASKSET_FANCY is not set
|
|
||||||
-# CONFIG_FEATURE_TASKSET_CPULIST is not set
|
|
||||||
+CONFIG_TASKSET=y
|
|
||||||
+CONFIG_FEATURE_TASKSET_FANCY=y
|
|
||||||
+CONFIG_FEATURE_TASKSET_CPULIST=y
|
|
||||||
CONFIG_UEVENT=y
|
|
||||||
CONFIG_UMOUNT=y
|
|
||||||
CONFIG_FEATURE_UMOUNT_ALL=y
|
|
||||||
@@ -745,12 +745,12 @@
|
|
||||||
CONFIG_ASCII=y
|
|
||||||
# CONFIG_BBCONFIG is not set
|
|
||||||
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
|
|
||||||
-# CONFIG_BC is not set
|
|
||||||
+CONFIG_BC=y
|
|
||||||
CONFIG_DC=y
|
|
||||||
-# CONFIG_FEATURE_DC_BIG is not set
|
|
||||||
-CONFIG_FEATURE_DC_LIBM=y
|
|
||||||
-# CONFIG_FEATURE_BC_INTERACTIVE is not set
|
|
||||||
-# CONFIG_FEATURE_BC_LONG_OPTIONS is not set
|
|
||||||
+CONFIG_FEATURE_DC_BIG=y
|
|
||||||
+# CONFIG_FEATURE_DC_LIBM is not set
|
|
||||||
+CONFIG_FEATURE_BC_INTERACTIVE=y
|
|
||||||
+CONFIG_FEATURE_BC_LONG_OPTIONS=y
|
|
||||||
# CONFIG_BEEP is not set
|
|
||||||
CONFIG_FEATURE_BEEP_FREQ=0
|
|
||||||
CONFIG_FEATURE_BEEP_LENGTH_MS=0
|
|
||||||
@@ -774,7 +774,7 @@
|
|
||||||
# CONFIG_DEVFSD_FG_NP is not set
|
|
||||||
# CONFIG_DEVFSD_VERBOSE is not set
|
|
||||||
# CONFIG_FEATURE_DEVFS is not set
|
|
||||||
-# CONFIG_DEVMEM is not set
|
|
||||||
+CONFIG_DEVMEM=y
|
|
||||||
# CONFIG_FBSPLASH is not set
|
|
||||||
# CONFIG_FLASH_ERASEALL is not set
|
|
||||||
# CONFIG_FLASH_LOCK is not set
|
|
||||||
@@ -812,7 +812,7 @@
|
|
||||||
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
|
|
||||||
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
|
|
||||||
# CONFIG_MAN is not set
|
|
||||||
-# CONFIG_MICROCOM is not set
|
|
||||||
+CONFIG_MICROCOM=y
|
|
||||||
# CONFIG_MIM is not set
|
|
||||||
# CONFIG_MT is not set
|
|
||||||
# CONFIG_NANDWRITE is not set
|
|
||||||
@@ -824,7 +824,7 @@
|
|
||||||
# CONFIG_RUNLEVEL is not set
|
|
||||||
# CONFIG_RX is not set
|
|
||||||
CONFIG_SETFATTR=y
|
|
||||||
-# CONFIG_SETSERIAL is not set
|
|
||||||
+CONFIG_SETSERIAL=y
|
|
||||||
CONFIG_STRINGS=y
|
|
||||||
CONFIG_TIME=y
|
|
||||||
CONFIG_TS=y
|
|
||||||
@@ -848,20 +848,20 @@
|
|
||||||
CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
|
|
||||||
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
|
|
||||||
# CONFIG_FEATURE_TLS_SHA1 is not set
|
|
||||||
-# CONFIG_ARP is not set
|
|
||||||
-# CONFIG_ARPING is not set
|
|
||||||
+CONFIG_ARP=y
|
|
||||||
+CONFIG_ARPING=y
|
|
||||||
CONFIG_BRCTL=y
|
|
||||||
CONFIG_FEATURE_BRCTL_FANCY=y
|
|
||||||
CONFIG_FEATURE_BRCTL_SHOW=y
|
|
||||||
# CONFIG_DNSD is not set
|
|
||||||
-# CONFIG_ETHER_WAKE is not set
|
|
||||||
-# CONFIG_FTPD is not set
|
|
||||||
-# CONFIG_FEATURE_FTPD_WRITE is not set
|
|
||||||
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
|
|
||||||
-# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set
|
|
||||||
-# CONFIG_FTPGET is not set
|
|
||||||
-# CONFIG_FTPPUT is not set
|
|
||||||
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
|
|
||||||
+CONFIG_ETHER_WAKE=y
|
|
||||||
+CONFIG_FTPD=y
|
|
||||||
+CONFIG_FEATURE_FTPD_WRITE=y
|
|
||||||
+CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
|
|
||||||
+CONFIG_FEATURE_FTPD_AUTHENTICATION=y
|
|
||||||
+CONFIG_FTPGET=y
|
|
||||||
+CONFIG_FTPPUT=y
|
|
||||||
+CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
|
|
||||||
CONFIG_HOSTNAME=y
|
|
||||||
CONFIG_DNSDOMAINNAME=y
|
|
||||||
CONFIG_HTTPD=y
|
|
||||||
@@ -896,12 +896,12 @@
|
|
||||||
# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
|
|
||||||
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
|
|
||||||
# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
|
|
||||||
-# CONFIG_INETD is not set
|
|
||||||
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
|
|
||||||
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
|
|
||||||
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
|
|
||||||
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
|
|
||||||
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
|
|
||||||
+CONFIG_INETD=y
|
|
||||||
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
|
|
||||||
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
|
|
||||||
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
|
|
||||||
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
|
|
||||||
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
|
|
||||||
# CONFIG_FEATURE_INETD_RPC is not set
|
|
||||||
CONFIG_IP=y
|
|
||||||
CONFIG_IPADDR=y
|
|
||||||
@@ -922,11 +922,11 @@
|
|
||||||
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
|
|
||||||
# CONFIG_FEATURE_IPCALC_FANCY is not set
|
|
||||||
# CONFIG_FAKEIDENTD is not set
|
|
||||||
-# CONFIG_NAMEIF is not set
|
|
||||||
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
|
|
||||||
-# CONFIG_NBDCLIENT is not set
|
|
||||||
+CONFIG_NAMEIF=y
|
|
||||||
+CONFIG_FEATURE_NAMEIF_EXTENDED=y
|
|
||||||
+CONFIG_NBDCLIENT=y
|
|
||||||
CONFIG_NC=y
|
|
||||||
-# CONFIG_NETCAT is not set
|
|
||||||
+CONFIG_NETCAT=y
|
|
||||||
CONFIG_NC_SERVER=y
|
|
||||||
CONFIG_NC_EXTRA=y
|
|
||||||
# CONFIG_NC_110_COMPAT is not set
|
|
||||||
@@ -944,13 +944,13 @@
|
|
||||||
CONFIG_PING6=y
|
|
||||||
CONFIG_FEATURE_FANCY_PING=y
|
|
||||||
# CONFIG_PSCAN is not set
|
|
||||||
-# CONFIG_ROUTE is not set
|
|
||||||
+CONFIG_ROUTE=y
|
|
||||||
# CONFIG_SLATTACH is not set
|
|
||||||
CONFIG_SSL_CLIENT=y
|
|
||||||
CONFIG_TC=y
|
|
||||||
CONFIG_FEATURE_TC_INGRESS=y
|
|
||||||
-# CONFIG_TCPSVD is not set
|
|
||||||
-# CONFIG_UDPSVD is not set
|
|
||||||
+CONFIG_TCPSVD=y
|
|
||||||
+CONFIG_UDPSVD=y
|
|
||||||
CONFIG_TELNET=y
|
|
||||||
CONFIG_FEATURE_TELNET_TTYPE=y
|
|
||||||
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
|
|
||||||
@@ -958,21 +958,21 @@
|
|
||||||
# CONFIG_TELNETD is not set
|
|
||||||
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
|
|
||||||
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
|
|
||||||
-# CONFIG_TFTP is not set
|
|
||||||
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
|
|
||||||
-# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
|
|
||||||
-# CONFIG_TFTPD is not set
|
|
||||||
-# CONFIG_FEATURE_TFTP_GET is not set
|
|
||||||
-# CONFIG_FEATURE_TFTP_PUT is not set
|
|
||||||
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
|
|
||||||
+CONFIG_TFTP=y
|
|
||||||
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
|
|
||||||
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
|
|
||||||
+CONFIG_TFTPD=y
|
|
||||||
+CONFIG_FEATURE_TFTP_GET=y
|
|
||||||
+CONFIG_FEATURE_TFTP_PUT=y
|
|
||||||
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
|
|
||||||
# CONFIG_TFTP_DEBUG is not set
|
|
||||||
CONFIG_TLS=y
|
|
||||||
-# CONFIG_TRACEROUTE is not set
|
|
||||||
-# CONFIG_TRACEROUTE6 is not set
|
|
||||||
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
|
|
||||||
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
|
|
||||||
-# CONFIG_TUNCTL is not set
|
|
||||||
-# CONFIG_FEATURE_TUNCTL_UG is not set
|
|
||||||
+CONFIG_TRACEROUTE=y
|
|
||||||
+CONFIG_TRACEROUTE6=y
|
|
||||||
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
|
|
||||||
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
|
|
||||||
+CONFIG_TUNCTL=y
|
|
||||||
+CONFIG_FEATURE_TUNCTL_UG=y
|
|
||||||
# CONFIG_VCONFIG is not set
|
|
||||||
CONFIG_WGET=y
|
|
||||||
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
|
|
||||||
@@ -984,21 +984,21 @@
|
|
||||||
CONFIG_FEATURE_WGET_OPENSSL=y
|
|
||||||
CONFIG_WHOIS=y
|
|
||||||
# CONFIG_ZCIP is not set
|
|
||||||
-# CONFIG_UDHCPD is not set
|
|
||||||
+CONFIG_UDHCPD=y
|
|
||||||
# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
|
|
||||||
-CONFIG_DHCPD_LEASES_FILE=""
|
|
||||||
+CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
|
|
||||||
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
|
|
||||||
# CONFIG_DUMPLEASES is not set
|
|
||||||
# CONFIG_DHCPRELAY is not set
|
|
||||||
CONFIG_UDHCPC=y
|
|
||||||
CONFIG_FEATURE_UDHCPC_ARPING=y
|
|
||||||
CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
|
|
||||||
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
|
||||||
-# CONFIG_UDHCPC6 is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
|
|
||||||
+CONFIG_UDHCPC6=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC6_RFC3646=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC6_RFC4704=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC6_RFC4833=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC6_RFC5970=y
|
|
||||||
|
|
||||||
#
|
|
||||||
# Common options for DHCP applets
|
|
||||||
@@ -1021,13 +1021,13 @@
|
|
||||||
#
|
|
||||||
# Mail Utilities
|
|
||||||
#
|
|
||||||
-# CONFIG_MAKEMIME is not set
|
|
||||||
+CONFIG_MAKEMIME=y
|
|
||||||
# CONFIG_POPMAILDIR is not set
|
|
||||||
# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
|
|
||||||
-# CONFIG_REFORMIME is not set
|
|
||||||
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
|
|
||||||
-# CONFIG_SENDMAIL is not set
|
|
||||||
-CONFIG_FEATURE_MIME_CHARSET=""
|
|
||||||
+CONFIG_REFORMIME=y
|
|
||||||
+CONFIG_FEATURE_REFORMIME_COMPAT=y
|
|
||||||
+CONFIG_SENDMAIL=y
|
|
||||||
+CONFIG_FEATURE_MIME_CHARSET="us-ascii"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Process Utilities
|
|
||||||
@@ -1040,7 +1040,7 @@
|
|
||||||
CONFIG_KILLALL5=y
|
|
||||||
CONFIG_LSOF=y
|
|
||||||
CONFIG_MPSTAT=y
|
|
||||||
-# CONFIG_NMETER is not set
|
|
||||||
+CONFIG_NMETER=y
|
|
||||||
CONFIG_PGREP=y
|
|
||||||
CONFIG_PKILL=y
|
|
||||||
CONFIG_PIDOF=y
|
|
||||||
@@ -1056,7 +1056,7 @@
|
|
||||||
CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS=y
|
|
||||||
CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
|
|
||||||
CONFIG_PSTREE=y
|
|
||||||
-# CONFIG_PWDX is not set
|
|
||||||
+CONFIG_PWDX=y
|
|
||||||
# CONFIG_SMEMCAP is not set
|
|
||||||
CONFIG_BB_SYSCTL=y
|
|
||||||
CONFIG_TOP=y
|
|
||||||
@@ -1069,7 +1069,7 @@
|
|
||||||
CONFIG_FEATURE_TOPMEM=y
|
|
||||||
CONFIG_UPTIME=y
|
|
||||||
# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
|
|
||||||
-# CONFIG_WATCH is not set
|
|
||||||
+CONFIG_WATCH=y
|
|
||||||
CONFIG_FEATURE_SHOW_THREADS=y
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -1087,7 +1087,7 @@
|
|
||||||
CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service"
|
|
||||||
# CONFIG_SVC is not set
|
|
||||||
CONFIG_SVOK=y
|
|
||||||
-# CONFIG_SVLOGD is not set
|
|
||||||
+CONFIG_SVLOGD=y
|
|
||||||
# CONFIG_CHCON is not set
|
|
||||||
# CONFIG_GETENFORCE is not set
|
|
||||||
# CONFIG_GETSEBOOL is not set
|
|
|
@ -1,21 +0,0 @@
|
||||||
@@ -624,12 +624,12 @@
|
|
||||||
CONFIG_LOSETUP=y
|
|
||||||
CONFIG_LSPCI=y
|
|
||||||
CONFIG_LSUSB=y
|
|
||||||
-# CONFIG_MDEV is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_CONF is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_RENAME is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_EXEC is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
|
|
||||||
-# CONFIG_FEATURE_MDEV_DAEMON is not set
|
|
||||||
+CONFIG_MDEV=y
|
|
||||||
+CONFIG_FEATURE_MDEV_CONF=y
|
|
||||||
+CONFIG_FEATURE_MDEV_RENAME=y
|
|
||||||
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
|
|
||||||
+CONFIG_FEATURE_MDEV_EXEC=y
|
|
||||||
+CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
|
|
||||||
+CONFIG_FEATURE_MDEV_DAEMON=y
|
|
||||||
# CONFIG_MESG is not set
|
|
||||||
# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
|
|
||||||
# CONFIG_MKE2FS is not set
|
|
|
@ -1,15 +0,0 @@
|
||||||
@@ -917,10 +917,10 @@
|
|
||||||
CONFIG_NSLOOKUP=y
|
|
||||||
CONFIG_FEATURE_NSLOOKUP_BIG=y
|
|
||||||
CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
|
|
||||||
-# CONFIG_NTPD is not set
|
|
||||||
-# CONFIG_FEATURE_NTPD_SERVER is not set
|
|
||||||
-# CONFIG_FEATURE_NTPD_CONF is not set
|
|
||||||
-# CONFIG_FEATURE_NTP_AUTH is not set
|
|
||||||
+CONFIG_NTPD=y
|
|
||||||
+CONFIG_FEATURE_NTPD_SERVER=y
|
|
||||||
+CONFIG_FEATURE_NTPD_CONF=y
|
|
||||||
+CONFIG_FEATURE_NTP_AUTH=y
|
|
||||||
CONFIG_PING=y
|
|
||||||
CONFIG_PING6=y
|
|
||||||
CONFIG_FEATURE_FANCY_PING=y
|
|
|
@ -1,31 +0,0 @@
|
||||||
@@ -1173,18 +1173,18 @@
|
|
||||||
#
|
|
||||||
# System Logging Utilities
|
|
||||||
#
|
|
||||||
-# CONFIG_KLOGD is not set
|
|
||||||
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
|
|
||||||
+CONFIG_KLOGD=y
|
|
||||||
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
|
|
||||||
CONFIG_LOGGER=y
|
|
||||||
-# CONFIG_LOGREAD is not set
|
|
||||||
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
|
|
||||||
-# CONFIG_SYSLOGD is not set
|
|
||||||
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
|
|
||||||
-# CONFIG_FEATURE_REMOTE_LOG is not set
|
|
||||||
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
|
|
||||||
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
|
|
||||||
+CONFIG_LOGREAD=y
|
|
||||||
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
|
|
||||||
+CONFIG_SYSLOGD=y
|
|
||||||
+CONFIG_FEATURE_ROTATE_LOGFILE=y
|
|
||||||
+CONFIG_FEATURE_REMOTE_LOG=y
|
|
||||||
+CONFIG_FEATURE_SYSLOGD_DUP=y
|
|
||||||
+CONFIG_FEATURE_SYSLOGD_CFG=y
|
|
||||||
# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
|
|
||||||
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
|
|
||||||
-# CONFIG_FEATURE_IPC_SYSLOG is not set
|
|
||||||
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
|
|
||||||
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
|
|
||||||
+CONFIG_FEATURE_IPC_SYSLOG=y
|
|
||||||
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=512
|
|
||||||
# CONFIG_FEATURE_KMSG_SYSLOG is not set
|
|
|
@ -1,35 +0,0 @@
|
||||||
@@ -990,21 +990,25 @@
|
|
||||||
CONFIG_DHCPD_LEASES_FILE=""
|
|
||||||
# CONFIG_DUMPLEASES is not set
|
|
||||||
# CONFIG_DHCPRELAY is not set
|
|
||||||
-# CONFIG_UDHCPC is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
|
|
||||||
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
|
|
||||||
+CONFIG_UDHCPC=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC_ARPING=y
|
|
||||||
+CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
|
|
||||||
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
|
|
||||||
# CONFIG_UDHCPC6 is not set
|
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
|
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
|
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
|
|
||||||
# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
|
|
||||||
-CONFIG_UDHCPC_DEFAULT_INTERFACE=""
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
+# Common options for DHCP applets
|
|
||||||
+#
|
|
||||||
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
|
|
||||||
# CONFIG_FEATURE_UDHCP_PORT is not set
|
|
||||||
-CONFIG_UDHCP_DEBUG=0
|
|
||||||
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
|
|
||||||
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
|
|
||||||
-# CONFIG_FEATURE_UDHCP_8021Q is not set
|
|
||||||
+CONFIG_UDHCP_DEBUG=2
|
|
||||||
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
|
|
||||||
+CONFIG_FEATURE_UDHCP_RFC3397=y
|
|
||||||
+CONFIG_FEATURE_UDHCP_8021Q=y
|
|
||||||
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
|
|
||||||
|
|
||||||
#
|
|
|
@ -1 +0,0 @@
|
||||||
../rootfscheck
|
|
|
@ -1,10 +0,0 @@
|
||||||
# Check the root filesystem. This is interruptible with ^C
|
|
||||||
|
|
||||||
type = scripted
|
|
||||||
command = /etc/dinit.d/rootfscheck.sh start
|
|
||||||
restart = false
|
|
||||||
options = starts-on-console pass-cs-fd start-interruptible skippable
|
|
||||||
start-timeout = 0 # unlimited
|
|
||||||
|
|
||||||
depends-on = udevd
|
|
||||||
waits-for = udev-trigger
|
|
|
@ -1,32 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
export PATH=/usr/bin:/usr/sbin:/bin:/sbin
|
|
||||||
|
|
||||||
if [ "$1" != "stop" ]; then
|
|
||||||
|
|
||||||
ROOTDEV=`findmnt -v -o SOURCE -n -M /`
|
|
||||||
|
|
||||||
echo "Checking root file system (^C to skip)..."
|
|
||||||
if [ -x /sbin/fsck ]; then
|
|
||||||
/sbin/fsck -C -a "$ROOTDEV"
|
|
||||||
fsckresult=$?
|
|
||||||
if [ $((fsckresult & 4)) -eq 4 ]; then
|
|
||||||
echo "***********************"
|
|
||||||
echo "WARNING WARNING WARNING"
|
|
||||||
echo "***********************"
|
|
||||||
echo "The root file system has problems which require user attention."
|
|
||||||
echo "A maintenance shell will now be started; system will then be rebooted."
|
|
||||||
/sbin/sulogin
|
|
||||||
/sbin/reboot --use-passed-cfd -r
|
|
||||||
elif [ $(($fsckresult & 2)) -eq 2 ]; then
|
|
||||||
echo "***********************"
|
|
||||||
echo "WARNING WARNING WARNING"
|
|
||||||
echo "***********************"
|
|
||||||
echo "The root file system had problems (now repaired): rebooting..."
|
|
||||||
sleep 5
|
|
||||||
/sbin/reboot --use-passed-cfd -r
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "WARNING - Could not find /sbin/fsck"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi;
|
|
|
@ -1,13 +1,13 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
pkgname=dinit
|
pkgname=dinit
|
||||||
version=0.17.0
|
version=0.17.1
|
||||||
revision=12
|
revision=1
|
||||||
short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)"
|
short_desc="Simple Linux / BSD init system (NOT MY SOFTWARE)"
|
||||||
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
||||||
homepage="https://github.com/fastfetch-cli/fastfetch"
|
homepage="https://github.com/davmac314/dinit"
|
||||||
license="GPL-3.0"
|
license="GPL-3.0"
|
||||||
makedepends="git make gcc m4"
|
makedepends="git make gcc m4"
|
||||||
depends="gtk+3"
|
conflicts="runit runit-void"
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
echo "Building..."
|
echo "Building..."
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
case "$ACTION" in
|
||||||
|
post)
|
||||||
|
busybox --install /usr/bin/
|
||||||
|
esac
|
|
@ -1,14 +1,14 @@
|
||||||
pkgname=evolution-patches
|
pkgname=evolution-patches
|
||||||
version=1.0
|
version=1.0
|
||||||
revision=11
|
revision=15
|
||||||
build_style=meta
|
build_style=meta
|
||||||
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
||||||
short_desc="Simple patches that enable an usable OS out of the box"
|
short_desc="Simple patches that enable an usable OS out of the box"
|
||||||
license="GPL-3.0"
|
license="GPL-3.0"
|
||||||
homepage="https://evolutionos.codeberg.page"
|
homepage="https://evolutionos.codeberg.page"
|
||||||
makedepends="busybox-core opendoas"
|
makedepends="busybox-evolution opendoas"
|
||||||
depends="busybox-core opendoas"
|
depends="busybox-evolution opendoas zzz"
|
||||||
replaces="grep which gzip tar diffutils coreutils findutils xz wget sed gawk pciutils usbutils tree shadowfix"
|
replaces="util-linux runit runit-void grep which gzip tar diffutils coreutils findutils xz wget sed gawk pciutils usbutils tree shadowfix"
|
||||||
provides="awk-0_1"
|
provides="awk-0_1"
|
||||||
conf_files="/etc/shadow /etc/doas.conf /etc/sv/agetty-tty1/conf"
|
conf_files="/etc/shadow /etc/doas.conf /etc/sv/agetty-tty1/conf"
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ do_install() {
|
||||||
|
|
||||||
# Get the list of commands from busybox
|
# Get the list of commands from busybox
|
||||||
|
|
||||||
commands="[ [[ arch ascii base32 base64 basename brctl cat chgrp chmod chown chroot comm cp crc32 cttyhack cut date dc dd df dirname dnsdomainname du dumpkmap echo ed env expand expr factor false fatattr fbset fold fsync fuser getty groups head hexedit i2cdetect i2cdump i2cget i2cset i2ctransfer id ifconfig ifenslave install iostat ipaddr iplink ipneigh iproute iprule iptunnel killall killall5 link ln loadkmap ls lsof lsscsi lzcat md5sum mkdir mkfifo mknod mkstat mv nc netstat nice nl nohup nproc nslookup od partprobe paste patch pipe_progress powertop printenv printf pstree pwd readlink realpath rm rmdir seq setfattr sha1sum sha256sum sha3sum sha512sum shred shuf sleep sort split ssl_client stat strings stty sum svok sync tac tail tee telnet test time touch tr true truncate ts tty uevent uname unexpand uniq unlink unxz unzip uudecode uuencode wc wget whoami whois xxd xz xzcat yes sh find diff gunzip tar gzip sed less which mktemp grep xargs cmp egrep fgrep lspci lsusb mpstat tree tsort zcat"
|
commands="[ [[ arch ascii base32 base64 basename brctl cat chgrp chmod chown chroot comm cp crc32 cttyhack cut date dc dd df dirname dnsdomainname du dumpkmap echo ed env expand expr factor false fatattr fbset fold fsync fuser getty groups head hexedit i2cdetect i2cdump i2cget i2cset i2ctransfer id ifconfig ifenslave install iostat ipaddr iplink ipneigh iproute iprule iptunnel killall killall5 link ln loadkmap ls lsof lsscsi lzcat md5sum mkdir mkfifo mknod mkstat mv nc netstat nice nl nohup nproc nslookup od partprobe paste patch pipe_progress powertop printenv printf pstree pwd readlink realpath rm rmdir seq setfattr sha1sum sha256sum sha3sum sha512sum shred shuf sleep sort split ssl_client stat strings stty sum svok sync tac tail tee telnet test time touch tr true truncate ts tty uevent uname unexpand uniq unlink unxz unzip uudecode uuencode wc wget whoami whois xxd xz xzcat yes sh find diff gunzip tar gzip sed less which mktemp grep xargs cmp egrep fgrep lspci lsusb mpstat tree tsort zcat add-shell addgroup adduser adjtimex ar arp ash awk bc beep bunzip2 bzcat chat cksum conspy crond crontab cryptpw delgroup deluser depmod devmem dhcprelay dnsd dos2unix dpkg dpkg-deb dumpleases ether-wake fakeidentd fbsplash fdflush fdformat freeramdisk ftpd ftpget ftpput hd hdparm hostid hostname httpd hush ifdown ifplugd ifup inetd insmod ipcalc klogd linux32 linux64 loadfont logger logname logread lpd lpq lpr lsmod lzma lzop lzopcat makedevs makemime man mdev microcom mim minips mkdosfs mkfs.ext2 mkfs.vfat mkpasswd modinfo modprobe mt nameif nanddump nandwrite nbd-client netcat nmeter ntpd nuke ping ping6 popmaildir pscan raidautorun rdate rdev readahead reformime remove-shell reset resize resume rmmod route rpm rpm2cpio run-init runlevel rx seedrng sendmail setconsole setlogcons setserial slattach smemcap start-stop-daemon syslogd tcpsvd telnetd tftp tftpd timeout traceroute traceroute6 ttysize tunctl ubiattach ubidetach ubimkvol ubirename ubirmvol ubirsvol ubiupdatevol udhcpc udhcpc6 udhcpd udpsvd uncompress unix2dos unlzma unlzop users usleep vconfig vi volname w watchdog who zcip"
|
||||||
mkdir -p ${DESTDIR}/usr/bin/
|
mkdir -p ${DESTDIR}/usr/bin/
|
||||||
# Loop through each command
|
# Loop through each command
|
||||||
for cmd in $commands; do
|
for cmd in $commands; do
|
||||||
|
@ -40,4 +40,5 @@ do_install() {
|
||||||
touch ${DESTDIR}/etc/shadow
|
touch ${DESTDIR}/etc/shadow
|
||||||
|
|
||||||
ln -sf /bin/doas ${DESTDIR}/usr/bin/sudo
|
ln -sf /bin/doas ${DESTDIR}/usr/bin/sudo
|
||||||
|
ln -sf /bin/dinit ${DESTDIR}/usr/bin/init
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Template file for 'mdocml'
|
# Template file for 'mdocml'
|
||||||
pkgname=mdocml
|
pkgname=mdocml
|
||||||
version=1.14.6
|
version=1.14.6
|
||||||
revision=7
|
revision=8
|
||||||
build_style=configure
|
build_style=configure
|
||||||
make_build_args="all man.cgi"
|
make_build_args="all man.cgi"
|
||||||
make_check_target="regress"
|
make_check_target="regress"
|
||||||
hostmakedepends="less"
|
hostmakedepends="less"
|
||||||
makedepends="zlib-devel"
|
makedepends="zlib-devel"
|
||||||
depends="busybox-core"
|
depends="busybox-evolution"
|
||||||
checkdepends="perl"
|
checkdepends="perl"
|
||||||
conf_files="/etc/man.conf"
|
conf_files="/etc/man.conf"
|
||||||
short_desc="UNIX manpage compiler toolset (mandoc)"
|
short_desc="UNIX manpage compiler toolset (mandoc)"
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
#!/bin/sh
|
||||||
|
pkgname=zzz
|
||||||
|
version=1.0.0
|
||||||
|
revision=1
|
||||||
|
short_desc="Simple resume/suspend script, seperated from runit"
|
||||||
|
maintainer="Tracker-Friendly <jliwin98@danwin1210.de>"
|
||||||
|
homepage="https://github.com/void-linux/void-runit"
|
||||||
|
license="BSD-3-Clause"
|
||||||
|
makedepends="wget acpid"
|
||||||
|
|
||||||
|
do_build() {
|
||||||
|
mkdir -p ${DESTDIR}/usr/bin
|
||||||
|
cd ${DESTDIR}
|
||||||
|
wget https://raw.githubusercontent.com/void-linux/void-runit/master/zzz
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install() {
|
||||||
|
cd ${DESTDIR}
|
||||||
|
vbin zzz
|
||||||
|
rm zzz
|
||||||
|
}
|
Reference in New Issue