[oe-commits] org.oe.dev slugos: Bumped version to 4.6, replaced dropbear with openssh, remove some non-essential stuff from the boot rootfs
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Aug 11 06:51:37 UTC 2007
slugos: Bumped version to 4.6, replaced dropbear with openssh, remove some non-essential stuff from the boot rootfs
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: afea80bc686fadcf59edc2fed29a3feeb14c093b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=afea80bc686fadcf59edc2fed29a3feeb14c093b
Files:
1
conf/distro/include/slugos.inc
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -r0a67a58d5896007a3481c8825620a850eea1f505 -rafea80bc686fadcf59edc2fed29a3feeb14c093b
#
#
#
# patch "conf/distro/include/slugos.inc"
# from [dd3fea4cb57defe36baa89ffab3a41ff6fd04c71]
# to [8815c04029a7743b2e7c97af8068899853cd3143]
#
# patch "packages/tasks/task-slugos.bb"
# from [a87c962b09a3b4d79d70e7d24e3702d49e347f3c]
# to [886169eff4c43655de9f427988ddbe1c01deab8f]
#
============================================================
--- conf/distro/include/slugos.inc dd3fea4cb57defe36baa89ffab3a41ff6fd04c71
+++ conf/distro/include/slugos.inc 8815c04029a7743b2e7c97af8068899853cd3143
@@ -16,7 +16,7 @@
#TARGET_OS "linux" or "linux-uclibc"
# The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.5"
+SLUGOS_VERSION = "4.6"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
@@ -145,3 +145,5 @@ PREFERRED_VERSION_linux-libc-headers = "
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+PREFERRED_VERSION_openssh ?= "4.6p1"
============================================================
--- packages/tasks/task-slugos.bb a87c962b09a3b4d79d70e7d24e3702d49e347f3c
+++ packages/tasks/task-slugos.bb 886169eff4c43655de9f427988ddbe1c01deab8f
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r13"
+PR = "r14"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -28,7 +28,7 @@ SLUGOS_STANDARD_RRECOMMENDS = ""
# udev is the default way of handling devices, there is no guarantee
# that the static device table is completely correct (it is just
# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev"
+SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
# These lines add support for formatting ext2 and ext3 file systems
# on a hard disk attached to the NSLU2. ext3 is the standard Linux
@@ -62,10 +62,6 @@ kernel-module-vfat \
kernel-module-jbd \
kernel-module-ext3 \
kernel-module-vfat \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-nfs \
-kernel-module-loop \
kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
@@ -85,10 +81,8 @@ kernel-module-uhci-hcd \
"
# Add modules required for IDE support
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kernel-module-libata \
-kernel-module-pata-artop \
-"
+# SLUGOS_STANDARD_RRECOMMENDS += "\
+# "
# Add modules required for Network support
SLUGOS_STANDARD_RRECOMMENDS += "\
@@ -98,29 +92,19 @@ kernel-module-via-velocity \
kernel-module-via-velocity \
"
-# Add modules required for Wifi support
-SLUGOS_STANDARD_RRECOMMENDS += "\
-madwifi-ng-modules madwifi-ng-tools wireless-tools \
-"
-
-## Other wireless tools that should be considered
-## should space be available in the rootfs
+# portmap \
+# kexec-tools \
+# kernel-module-nfs \
+# kernel-module-isofs \
+# kernel-module-udf \
+# kernel-module-loop \
+# kernel-module-libata \
+# kernel-module-pata-artop \
+# kernel-module-netconsole \
# wpa-supplicant \
# zd1211-firmware kernel-module-zd1211rw \
+# madwifi-ng-modules madwifi-ng-tools wireless-tools \
-# Add kexec tools for rebooting alternate kernels
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kexec-tools \
-"
-
-# Add modules required for Network Console support
-# NOTE: This module is desirable for systems lacking a physical
-# console, but is usually only enabled if specific needs or issues
-# arise. If space in the flash is at a premium, it can be omitted.
-SLUGOS_STANDARD_RRECOMMENDS += "\
-kernel-module-netconsole \
-"
-
DISTRO_EXTRA_DEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
@@ -129,10 +113,9 @@ RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
busybox initscripts-slugos slugos-init \
- update-modules sysvinit tinylogin \
+ update-modules sysvinit tinylogin udev \
module-init-tools modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
- portmap \
beep \
e2fsprogs-blkid \
util-linux-mount \
@@ -143,6 +126,6 @@ RRECOMMENDS += "\
${DISTRO_EXTRA_RDEPENDS}"
RRECOMMENDS += "\
- dropbear \
+ openssh \
${SLUGOS_STANDARD_RRECOMMENDS} \
${DISTRO_EXTRA_RRECOMMENDS}"
More information about the Openembedded-commits
mailing list