[oe-commits] org.oe.dev slugos: Subsumed slugos-lag.conf into slugosle.conf, slugos-bag.conf into slugosbe.conf, and dropped slugos-{b, l}ag.conf. Deprecated openslug.conf in favour of slugosbe.conf. Deprecated debianslug.conf in favour of slugosle.conf. Eventually this all might be done with multimachine.
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Feb 10 23:27:13 UTC 2007
slugos: Subsumed slugos-lag.conf into slugosle.conf, slugos-bag.conf into slugosbe.conf, and dropped slugos-{b,l}ag.conf. Deprecated openslug.conf in favour of slugosbe.conf. Deprecated debianslug.conf in favour of slugosle.conf. Eventually this all might be done with multimachine.
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 1dd9be1ff6b0da5669a3c317d8f4f9de91e8c882
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1dd9be1ff6b0da5669a3c317d8f4f9de91e8c882
Files:
1
conf/distro/slugos-bag.conf
conf/distro/slugos-lag.conf
conf/distro/slugosbe.conf
conf/distro/slugosle.conf
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug.conf
conf/distro/ucslugc.conf
Diffs:
#
# mt diff -r9bfe666a387d3be1af5e1ff0195d3617273ff9eb -r1dd9be1ff6b0da5669a3c317d8f4f9de91e8c882
#
#
#
# delete "conf/distro/slugos-bag.conf"
#
# delete "conf/distro/slugos-lag.conf"
#
# add_file "conf/distro/slugosbe.conf"
# content [b5d3bfaa44b62b48cb22e4c1c1dc211f32962256]
#
# add_file "conf/distro/slugosle.conf"
# content [1419f9fcec03c67a5961f49ae68e4f630d535c84]
#
# patch "conf/distro/debianslug.conf"
# from [a7645f95ead5482367d3925b565021b70a721786]
# to [07feb5ae3191b605dbfda194e61dcd899487d4d7]
#
# patch "conf/distro/include/slugos.inc"
# from [082ca5c971b043bf98c454e31c5575945fa2251f]
# to [8e5244589c418a51fa28337f8a1e83c3bc291e4d]
#
# patch "conf/distro/openslug.conf"
# from [607ecad2224597c74248303923bb9006573b5923]
# to [bcacde3e84d8c42fcb26c5181e0a71b9bd54370a]
#
# patch "conf/distro/ucslugc.conf"
# from [0b87dc6ab0978c7d08149a9deb271ff5e2b85753]
# to [f74184c4911a8d6410aa3df1e5e7b39022897bce]
#
============================================================
--- conf/distro/slugosbe.conf b5d3bfaa44b62b48cb22e4c1c1dc211f32962256
+++ conf/distro/slugosbe.conf b5d3bfaa44b62b48cb22e4c1c1dc211f32962256
@@ -0,0 +1,115 @@
+#@TYPE: Distribution
+#@NAME: SlugOS/BE
+#@DESCRIPTION: SlugOS/BE Linux Distribution for the NSLU2
+
+#----------------------------------------------------------------------------------
+# STANDARD SlugOS/BE DEFINITIONS
+#----------------------------------------------------------------------------------
+DISTRO_NAME = "SlugOS/BE"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# DISTRO_FEED = "unstable"
+DISTRO_TYPE = "beta"
+SLUGOS_DISTRO ?= "slugosbe"
+
+TARGET_ARCH = "armeb"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
+
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# EXTRA PACKAGES
+# --------------
+# Filesystem support modules are listed in here for easy removal,
+# as is the lrzsz serial package and other kernel modules which are
+# not absolutely required for boot.
+# NOTE: only jffs2 support is an absolute requirement of boot, even
+# the ext2/ext3 support is optional!
+SLUGOSBE_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+
+# The standard firmware contents and additional packages built as requirements
+# of the firmware are defined here in SLUGOSBE_STANDARD_RDEPENDS and
+# SLUGOSBE_STANDARD_DEPENDS respectively.
+SLUGOSBE_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the slugosbe
+# image, programs to format disks with these file systems may be
+# added or removed. By default ext2 and ext3 support
+# is included by the following lines.
+#
+# These lines add support for formatting ext2 and ext3 file systems
+# on a hard disk attached to the NSLU2. ext3 is the standard Linux
+# file system.
+SLUGOSBE_STANDARD_RDEPENDS += "${SLUGOSBE_EXT2_PROGS}"
+
+# These lines add support for an X/Y/ZModem package called lrzsz
+# (this is of use for people with modified NSLU2 hardware which
+# supports a serial port.)
+SLUGOSBE_STANDARD_RDEPENDS += "lrzsz"
+
+# Filesystem selection. Adding entries here adds the module to the
+# image. The module must be built as part of nslu2-kernel (i.e. it
+# must be specified as a module in the defconfig file). The NLS
+# support charset modules must be given explicitly and must match
+# the codepage/iocharset and NLS handling for the file systems which
+# require them. The installed lanugage set is minimal but sufficient
+# for any file system (since it uses utf8). See
+# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
+# for more information on the language behaviour of the DOS file
+# systems.
+#
+# KERNEL LEVEL FILE SYSTEM SUPPORT
+# --------------------------------
+# NOTE: removing kernel-module-nfs from this list will prevent NFS
+# boot (however you can do a simple flash file system boot - no
+# attached disk - and install the nfs modules from ssh.)
+SLUGOSBE_STANDARD_RDEPENDS += "\
+kernel-module-ext2 \
+kernel-module-jbd \
+kernel-module-ext3 \
+kernel-module-vfat \
+kernel-module-ntfs \
+kernel-module-isofs \
+kernel-module-udf \
+kernel-module-nls-cp437 \
+kernel-module-nls-utf8 \
+"
+
+# Add daemon required for HW RNG support
+SLUGOSBE_STANDARD_RDEPENDS += "\
+rng-tools \
+"
+
+# Add modules required for usb support
+SLUGOSBE_STANDARD_RDEPENDS += "\
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+"
+
+# Add modules required for IDE support
+SLUGOSBE_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
+# Add modules required for Network support
+SLUGOSBE_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
+# This documents other file systems which are built but not installed
+# by default in the flash image.
+#
+# kernel-module-msdos - mounts a FAT file system without long file names
+# (use kernel-module-vfat, it shows the long names
+# if present.)
+
+# The 'standard' values are the defaults for the 'extra' packages added
+# to the firmware image. None of these things are requirements to have
+# a bootable, useable, system however they *are* expected to be present
+# in SlugOS/BE - see nslu2-bag for a more minimal configuration and some
+# more instructions about how to make a non-slugosbe image.
+SLUGOSBE_EXTRA_RDEPENDS ?= ""
+SLUGOS_EXTRA_RDEPENDS = "${SLUGOSBE_STANDARD_RDEPENDS} ${SLUGOSBE_EXTRA_RDEPENDS}"
+
+require conf/distro/include/slugos.inc
============================================================
--- conf/distro/slugosle.conf 1419f9fcec03c67a5961f49ae68e4f630d535c84
+++ conf/distro/slugosle.conf 1419f9fcec03c67a5961f49ae68e4f630d535c84
@@ -0,0 +1,115 @@
+#@TYPE: Distribution
+#@NAME: SlugOS/LE
+#@DESCRIPTION: SlugOS/LE Linux Distribution for the NSLU2
+
+#----------------------------------------------------------------------------------
+# STANDARD SlugOS/LE DEFINITIONS
+#----------------------------------------------------------------------------------
+DISTRO_NAME = "SlugOS/LE"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# DISTRO_FEED = "unstable"
+DISTRO_TYPE = "beta"
+SLUGOS_DISTRO ?= "slugosle"
+
+TARGET_ARCH = "arm"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
+
+#----------------------------------------------------------------------------------
+# FIRMWARE CONFIGURATION
+#----------------------------------------------------------------------------------
+# EXTRA PACKAGES
+# --------------
+# Filesystem support modules are listed in here for easy removal,
+# as is the lrzsz serial package and other kernel modules which are
+# not absolutely required for boot.
+# NOTE: only jffs2 support is an absolute requirement of boot, even
+# the ext2/ext3 support is optional!
+SLUGOSLE_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+
+# The standard firmware contents and additional packages built as requirements
+# of the firmware are defined here in SLUGOSLE_STANDARD_RDEPENDS and
+# SLUGOSLE_STANDARD_DEPENDS respectively.
+SLUGOSLE_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the slugosle
+# image, programs to format disks with these file systems may be
+# added or removed. By default ext2 and ext3 support
+# is included by the following lines.
+#
+# These lines add support for formatting ext2 and ext3 file systems
+# on a hard disk attached to the NSLU2. ext3 is the standard Linux
+# file system.
+SLUGOSLE_STANDARD_RDEPENDS += "${SLUGOSLE_EXT2_PROGS}"
+
+# These lines add support for an X/Y/ZModem package called lrzsz
+# (this is of use for people with modified NSLU2 hardware which
+# supports a serial port.)
+SLUGOSLE_STANDARD_RDEPENDS += "lrzsz"
+
+# Filesystem selection. Adding entries here adds the module to the
+# image. The module must be built as part of nslu2-kernel (i.e. it
+# must be specified as a module in the defconfig file). The NLS
+# support charset modules must be given explicitly and must match
+# the codepage/iocharset and NLS handling for the file systems which
+# require them. The installed lanugage set is minimal but sufficient
+# for any file system (since it uses utf8). See
+# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
+# for more information on the language behaviour of the DOS file
+# systems.
+#
+# KERNEL LEVEL FILE SYSTEM SUPPORT
+# --------------------------------
+# NOTE: removing kernel-module-nfs from this list will prevent NFS
+# boot (however you can do a simple flash file system boot - no
+# attached disk - and install the nfs modules from ssh.)
+SLUGOSLE_STANDARD_RDEPENDS += "\
+kernel-module-ext2 \
+kernel-module-jbd \
+kernel-module-ext3 \
+kernel-module-vfat \
+kernel-module-ntfs \
+kernel-module-isofs \
+kernel-module-udf \
+kernel-module-nls-cp437 \
+kernel-module-nls-utf8 \
+"
+
+# Add daemon required for HW RNG support
+SLUGOSLE_STANDARD_RDEPENDS += "\
+rng-tools \
+"
+
+# Add modules required for usb support
+SLUGOSLE_STANDARD_RDEPENDS += "\
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+"
+
+# Add modules required for IDE support
+SLUGOSLE_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
+# Add modules required for Network support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-via-velocity \
+"
+
+# This documents other file systems which are built but not installed
+# by default in the flash image.
+#
+# kernel-module-msdos - mounts a FAT file system without long file names
+# (use kernel-module-vfat, it shows the long names
+# if present.)
+
+# The 'standard' values are the defaults for the 'extra' packages added
+# to the firmware image. None of these things are requirements to have
+# a bootable, useable, system however they *are* expected to be present
+# in Slugosle - see slugos-lag for a more minimal configuration and some
+# more instructions about how to make a non-slugosle image.
+SLUGOSLE_EXTRA_RDEPENDS ?= ""
+SLUGOS_EXTRA_RDEPENDS = "${SLUGOSLE_STANDARD_RDEPENDS} ${SLUGOSLE_EXTRA_RDEPENDS}"
+
+require conf/distro/include/slugos.inc
============================================================
--- conf/distro/debianslug.conf a7645f95ead5482367d3925b565021b70a721786
+++ conf/distro/debianslug.conf 07feb5ae3191b605dbfda194e61dcd899487d4d7
@@ -1,123 +1,7 @@
#@TYPE: Distribution
#@NAME: DebianSlug
#@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
-#----------------------------------------------------------------------------------
-# STANDARD DebianSlug DEFINITIONS
-#----------------------------------------------------------------------------------
-DISTRO_NAME = "DebianSlug"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
SLUGOS_DISTRO = "debianslug"
+require conf/distro/slugosle.conf
-#----------------------------------------------------------------------------------
-# FIRMWARE CONFIGURATION
-#----------------------------------------------------------------------------------
-# EXTRA PACKAGES
-# --------------
-# Filesystem support modules are listed in here for easy removal,
-# as is the lrzsz serial package and other kernel modules which are
-# not absolutely required for boot.
-# NOTE: only jffs2 support is an absolute requirement of boot, even
-# the ext2/ext3 support is optional!
-DEBIANSLUG_EXT2_PROGS = "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
-
-# The standard firmware contents and additional packages built as requirements
-# of the firmware are defined here in DEBIANSLUG_STANDARD_RDEPENDS and
-# DEBIANSLUG_STANDARD_DEPENDS respectively.
-DEBIANSLUG_STANDARD_RDEPENDS = ""
-
-# Support for a variety of file systems is built in to the debianslug
-# image, programs to format disks with these file systems may be
-# added or removed. By default ext2 and ext3 support
-# is included by the following lines.
-#
-# These lines add support for formatting ext2 and ext3 file systems
-# on a hard disk attached to the NSLU2. ext3 is the standard Linux
-# file system.
-DEBIANSLUG_STANDARD_RDEPENDS += "${DEBIANSLUG_EXT2_PROGS}"
-
-# These lines add support for an X/Y/ZModem package called lrzsz
-# (this is of use for people with modified NSLU2 hardware which
-# supports a serial port.)
-DEBIANSLUG_STANDARD_RDEPENDS += "lrzsz"
-
-# Filesystem selection. Adding entries here adds the module to the
-# image. The module must be built as part of nslu2-kernel (i.e. it
-# must be specified as a module in the defconfig file). The NLS
-# support charset modules must be given explicitly and must match
-# the codepage/iocharset and NLS handling for the file systems which
-# require them. The installed lanugage set is minimal but sufficient
-# for any file system (since it uses utf8). See
-# http://www.nslu2-linux.orgwiki/HowTo/MountFATFileSystems
-# for more information on the language behaviour of the DOS file
-# systems.
-#
-# KERNEL LEVEL FILE SYSTEM SUPPORT
-# --------------------------------
-# NOTE: removing kernel-module-nfs from this list will prevent NFS
-# boot (however you can do a simple flash file system boot - no
-# attached disk - and install the nfs modules from ssh.)
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ext2 \
-kernel-module-jbd \
-kernel-module-ext3 \
-kernel-module-vfat \
-kernel-module-ntfs \
-kernel-module-isofs \
-kernel-module-udf \
-kernel-module-nls-cp437 \
-kernel-module-nls-utf8 \
-"
-
-# Add daemon required for HW RNG support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-rng-tools \
-"
-
-# Add modules required for usb support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ohci-hcd \
-kernel-module-uhci-hcd \
-"
-
-# Add modules required for IDE support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-libata \
-kernel-module-pata-artop \
-"
-
-# Add modules required for Network support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-via-velocity \
-"
-
-# This documents other file systems which are built but not installed
-# by default in the flash image.
-#
-# kernel-module-msdos - mounts a FAT file system without long file names
-# (use kernel-module-vfat, it shows the long names
-# if present.)
-
-# The 'standard' values are the defaults for the 'extra' packages added
-# to the firmware image. None of these things are requirements to have
-# a bootable, useable, system however they *are* expected to be present
-# in DebianSlug - see slugos-lag for a more minimal configuration and some
-# more instructions about how to make a non-debianslug image.
-DEBIANSLUG_EXTRA_RDEPENDS ?= ""
-SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS} ${DEBIANSLUG_EXTRA_RDEPENDS}"
-
-#----------------------------------------------------------------------------------
-# PACKAGE VERSION CONTROL
-#----------------------------------------------------------------------------------
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63"
-
-#----------------------------------------------------------------------------------
-# BASE VERSION SELECTION
-#----------------------------------------------------------------------------------
-# l - little-endian
-# a - ARM instruction set
-# g - glibc
-#
-require conf/distro/slugos-lag.conf
============================================================
--- conf/distro/include/slugos.inc 082ca5c971b043bf98c454e31c5575945fa2251f
+++ conf/distro/include/slugos.inc 8e5244589c418a51fa28337f8a1e83c3bc291e4d
@@ -1,24 +1,10 @@
#@TYPE: Distribution
#@NAME: SlugOS
#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
# WARNING: this file should not be used directly, use one of
-# the supported slugos-derived distributions instead:
+# the supported slugos-derived distributions instead.
-# Explanation of the naming
-#
-# slugos - the base distro configuration for an NSLU2
-# slugos-[bl][at][gu] - a specific configuration encoded as follows:
-#
-# b or l - big or little endian
-#
-# a or t - ARM or Thumb instructions in the low level libraries
-# set ARM_INSTRUCTION_SET to match
-#
-# g or u - glibc or uclibc libc implementation
-# set TARGET_OS to match
-#
-
#----------------------------------------------------------------------------------
# STANDARD SLUGOS DEFINITIONS
#------------------------------------------------%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list