summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--adk/tools/pkgmaker.c2
-rw-r--r--package/Config.in2
-rw-r--r--package/busybox/Config.in.manual2
-rw-r--r--package/coreutils/Makefile2
-rw-r--r--package/findutils/Makefile2
-rw-r--r--package/grep/Makefile4
-rw-r--r--package/procps/Makefile2
-rw-r--r--package/s6/Makefile2
-rw-r--r--package/section.lst4
-rw-r--r--package/simpleinit/Makefile2
-rw-r--r--package/systemd/Makefile2
-rw-r--r--package/sysvinit/Makefile2
-rw-r--r--package/toybox/Makefile1
-rw-r--r--package/util-linux/Makefile2
14 files changed, 18 insertions, 13 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index 384f3198d..3b3b2ac07 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -745,7 +745,7 @@ int main() {
perror("Can not open Config.in file");
if (pkg_bb != NULL) {
- fprintf(cfg, "comment \"%s... %s (disabled, provided by busybox)\"\n", token, pkg_descr);
+ fprintf(cfg, "comment \"%s... %s (provided by busybox)\"\n", token, pkg_descr);
fprintf(cfg, "depends on ADK_PACKAGE_BUSYBOX_HIDE\n\n");
}
diff --git a/package/Config.in b/package/Config.in
index 5b97dfa02..fd578b8c9 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2,6 +2,8 @@ menu "Base system"
source package/Config.in.auto.base.boot
source package/Config.in.auto.base.libs
source package/Config.in.auto.base.apps
+source package/Config.in.auto.base.tools
+source package/Config.in.auto.base.init
source package/Config.in.auto.base.adk
source package/Config.in.auto.base.shells
source package/Config.in.auto.base.tests
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index b613e91f9..c2efc4888 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -228,7 +228,7 @@ endchoice
config ADK_PACKAGE_BUSYBOX_HIDE
bool "hide packages provided by busybox applets"
depends on ADK_PACKAGE_BUSYBOX
- default n
+ default y
help
Do not show packages which are provided as busybox applets
diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile
index a8a22cc88..f710d2b0a 100644
--- a/package/coreutils/Makefile
+++ b/package/coreutils/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= coreutils
PKG_VERSION:= 8.24
PKG_RELEASE:= 2
PKG_HASH:= a2d75286a4b9ef3a13039c2da3868a61be4ee9f17d8ae380a35a97e506972170
-PKG_DESCR:= basic file, shell and text manipulation utilities
+PKG_DESCR:= file, shell and text utilities
PKG_SECTION:= base/apps
PKG_NEEDS:= threads
PKG_URL:= http://www.gnu.org/software/coreutils/
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 9b5b86ae4..c090db8ce 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 4.6.0
PKG_RELEASE:= 1
PKG_HASH:= ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
PKG_DESCR:= utilities for finding files
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/tools
HOST_BUILDDEP:= bison-host
PKG_NEEDS:= threads
PKG_URL:= http://www.gnu.org/software/findutils/
diff --git a/package/grep/Makefile b/package/grep/Makefile
index b7bc2775d..b6a845546 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= grep
PKG_VERSION:= 2.27
PKG_RELEASE:= 1
PKG_HASH:= ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb
-PKG_DESCR:= global search for a regex and print out matched lines
-PKG_SECTION:= base/apps
+PKG_DESCR:= global search for a regex
+PKG_SECTION:= base/tools
PKG_DEPENDS:= libpcre
PKG_BUILDDEP:= pcre
PKG_URL:= http://www.gnu.org/software/grep/
diff --git a/package/procps/Makefile b/package/procps/Makefile
index 738ce6bda..89a901a68 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 3.2.8
PKG_RELEASE:= 2
PKG_HASH:= 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
PKG_DESCR:= /proc file system utilities
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/tools
PKG_DEPENDS:= libncurses
PKG_BUILDDEP:= ncurses
PKG_URL:= http://procps.sourceforge.net/
diff --git a/package/s6/Makefile b/package/s6/Makefile
index 323709e2a..209a60f45 100644
--- a/package/s6/Makefile
+++ b/package/s6/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.3.0.0
PKG_RELEASE:= 1
PKG_HASH:= 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6
PKG_DESCR:= small suite of programs for UNIX, designed to allow process supervision
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/init
PKG_DEPENDS:= skalibs execline
PKG_BUILDDEP:= skalibs execline
PKG_URL:= http://www.skarnet.org/software/s6/
diff --git a/package/section.lst b/package/section.lst
index b223dd094..cbb722b16 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,7 +1,9 @@
base/boot Boot Loaders
base/libs Base Libraries
+base/init Init System
base/apps Base System
-base/adk Base OpenADK scripts
+base/tools Base Tools
+base/adk Base Scripts
base/tests Testsuites
base/shells Shells
sys/drivers Hardware drivers / externel Kernel modules
diff --git a/package/simpleinit/Makefile b/package/simpleinit/Makefile
index 5d68ffce0..4de28ba48 100644
--- a/package/simpleinit/Makefile
+++ b/package/simpleinit/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:= simpleinit
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
PKG_DESCR:= very simple init
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/init
NO_DISTFILES:= 1
diff --git a/package/systemd/Makefile b/package/systemd/Makefile
index 8ae4433fa..e1074f731 100644
--- a/package/systemd/Makefile
+++ b/package/systemd/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 232
PKG_RELEASE:= 2
PKG_HASH:= 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880
PKG_DESCR:= system and service manager
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/init
PKG_DEPENDS:= libcap libmount libuuid libblkid libncurses kmod
PKG_BUILDDEP:= intltool-host gperf-host libcap util-linux gettext-host kmod
PKG_KDEPENDS:= cgroups namespaces fhandle tmpfs-posix-acl tmpfs-xattr
diff --git a/package/sysvinit/Makefile b/package/sysvinit/Makefile
index 08303ab41..d647ac8e5 100644
--- a/package/sysvinit/Makefile
+++ b/package/sysvinit/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:= 2.88dsf
PKG_RELEASE:= 1
PKG_HASH:= 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519
PKG_DESCR:= systemV init
-PKG_SECTION:= base/apps
+PKG_SECTION:= base/init
PKG_URL:= http://savannah.nongnu.org/projects/sysvinit
PKG_SITES:= http://download.savannah.gnu.org/releases/sysvinit/
diff --git a/package/toybox/Makefile b/package/toybox/Makefile
index c46bd2f30..c99b249fb 100644
--- a/package/toybox/Makefile
+++ b/package/toybox/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= linux tools collection
PKG_SECTION:= base/apps
PKG_URL:= http://landley.net/toybox/
PKG_SITES:= http://landley.net/toybox/downloads/
+PKG_BB:= 1
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 9f8d5887d..8c14dad34 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -28,7 +28,7 @@ PKGSD_FDISK:= partition table manipulation utility
PKGSC_FDISK:= sys/fs
PKGSS_FDISK:= libfdisk libblkid libuuid libncurses
PKGSD_AGETTY:= getty utility
-PKGSC_AGETTY:= base/apps
+PKGSC_AGETTY:= sys/utils
PKGSS_AGETTY:= libncurses
PKGSD_SFDISK:= scriptable partition table manipulation utility
PKGSC_SFDISK:= sys/fs
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 10:28:24 +0000