[oe-commits] org.oe.dev slugos: Major build structure change - subsumed openslug and debianslug into a single slugos distribution which works with either nslu2be or nslu2le machines. Kept the openslug and debianslug conf files around to enable people to migrate smoothly, but eventually they will disappear.

rwhitby commit openembedded-commits at lists.openembedded.org
Mon Feb 12 08:28:59 UTC 2007 

slugos: Major build structure change - subsumed openslug and debianslug into a single slugos distribution which works with either nslu2be or nslu2le machines.  Kept the openslug and debianslug conf files around to enable people to migrate smoothly, but eventually they will disappear.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 879c2e35f17da4b01ea93a7d8a286583b9eec1f6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=879c2e35f17da4b01ea93a7d8a286583b9eec1f6
Files:
1
conf/distro/slugosbe.conf
conf/distro/slugosle.conf
conf/distro/slugos.conf
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug-native.conf
conf/distro/openslug.conf
conf/distro/ucslugc.conf
packages/images/slugos-image.bb
packages/meta/slugos-native-packages.bb
packages/meta/slugos-native.bb
packages/meta/slugos-packages.bb
Diffs:

#
# mt diff -rc20ea006f5c07c135b16a8a30893f175d5bd073e -r879c2e35f17da4b01ea93a7d8a286583b9eec1f6
#
# 
# 
# delete "conf/distro/slugosbe.conf"
# 
# delete "conf/distro/slugosle.conf"
# 
# add_file "conf/distro/slugos.conf"
#  content [51e9e47076c4e34172e83dfdcb5d1118e101f3f5]
# 
# patch "conf/distro/debianslug.conf"
#  from [07feb5ae3191b605dbfda194e61dcd899487d4d7]
#    to [4950c9cabe21424b3a85a184facbc8485d3b0695]
# 
# patch "conf/distro/include/slugos.inc"
#  from [8e5244589c418a51fa28337f8a1e83c3bc291e4d]
#    to [44acef7fe9ba49c9885d1ba13e8ef25544336d7d]
# 
# patch "conf/distro/openslug-native.conf"
#  from [23fdffba5ef690baf7bfe6cda08bc61734dbc0a9]
#    to [4101e8c41f6e360acf33ea689b48d1ee19ef6f80]
# 
# patch "conf/distro/openslug.conf"
#  from [bcacde3e84d8c42fcb26c5181e0a71b9bd54370a]
#    to [0c53992cc239e0986d4ba57bfd99d0351d1ee935]
# 
# patch "conf/distro/ucslugc.conf"
#  from [f74184c4911a8d6410aa3df1e5e7b39022897bce]
#    to [f48396b3a853f5f0cf619acd130e9f0cf00a752a]
# 
# patch "packages/images/slugos-image.bb"
#  from [39cd82c2827b6cb235223b33970dc6ac3c07280a]
#    to [8d31a1ded4a3c49f73a313715e2a093049eb00f4]
# 
# patch "packages/meta/slugos-native-packages.bb"
#  from [579ef8aec74560e593d0a7255147e21119942db9]
#    to [1f17cecf30ce24231fd5284ecdb19767d3cf88e3]
# 
# patch "packages/meta/slugos-native.bb"
#  from [3d71563f326b7317f437fcac47519144f2458238]
#    to [47615f9c6a736942237210e4962e94ce87b4e464]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [d6a43c3b79a933b96f024387f569c35cc1c6f74e]
#    to [bd98bf286379b864293b8a3ff99330d9f1a5bcc1]
# 
============================================================
--- conf/distro/slugos.conf	51e9e47076c4e34172e83dfdcb5d1118e101f3f5
+++ conf/distro/slugos.conf	51e9e47076c4e34172e83dfdcb5d1118e101f3f5
@@ -0,0 +1,110 @@
+#@TYPE: Distribution
+#@NAME: SlugOS
+#@DESCRIPTION: SlugOS Linux Distribution for the NSLU2
+
+#----------------------------------------------------------------------------------
+# STANDARD SlugOS/BE DEFINITIONS
+#----------------------------------------------------------------------------------
+DISTRO_NAME = "SlugOS"
+# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
+# DISTRO_FEED = "unstable"
+DISTRO_TYPE = "beta"
+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!
+SLUGOS_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 SLUGOS_STANDARD_RDEPENDS.
+SLUGOS_STANDARD_RDEPENDS = ""
+
+# Support for a variety of file systems is built in to the slugos
+# 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.
+SLUGOS_STANDARD_RDEPENDS += "${SLUGOS_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.)
+SLUGOS_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.)
+SLUGOS_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
+SLUGOS_STANDARD_RDEPENDS += "\
+rng-tools \
+"
+
+# Add modules required for usb support
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+"
+
+# Add modules required for IDE support
+SLUGOS_STANDARD_RDEPENDS += "\
+kernel-module-libata \
+kernel-module-pata-artop \
+"
+
+# Add modules required for Network support
+SLUGOS_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.
+SLUGOS_EXTRA_RDEPENDS = "${SLUGOS_STANDARD_RDEPENDS}"
+
+require conf/distro/include/slugos.inc
============================================================
--- conf/distro/debianslug.conf	07feb5ae3191b605dbfda194e61dcd899487d4d7
+++ conf/distro/debianslug.conf	4950c9cabe21424b3a85a184facbc8485d3b0695
@@ -1,7 +1,11 @@
 #@TYPE: Distribution
 #@NAME: DebianSlug
 #@DESCRIPTION: DebianSlug Linux Distribution for the NSLU2
 
-SLUGOS_DISTRO = "debianslug"
+DISTRO_NAME = "DebianSlug"
+IMAGE_BASENAME = "debianslug"
+TARGET_ARCH = "arm"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
 
+require conf/distro/slugos.conf
-require conf/distro/slugosle.conf
============================================================
--- conf/distro/include/slugos.inc	8e5244589c418a51fa28337f8a1e83c3bc291e4d
+++ conf/distro/include/slugos.inc	44acef7fe9ba49c9885d1ba13e8ef25544336d7d
@@ -23,10 +23,8 @@ DISTRO_FEED ?= "unstable"
 # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
 DISTRO_FEED ?= "unstable"
 
-SLUGOS_DISTRO ?= "slugos"
+IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}"
 
-IMAGE_BASENAME = "${SLUGOS_DISTRO}"
-
 # The following need not be set, the defaults should be adequate
 #USE_NLS = "no" or "yes"
 USE_NLS ?= "no"
@@ -41,10 +39,8 @@ USE_NLS_glib-2.0 = "yes"
 # glib-2.0 builds require USE_NLS to be overridden
 USE_NLS_glib-2.0 = "yes"
 
-INHERIT += "package_ipk debian"
+INHERIT += "package_ipk debian multimachine"
 
-DISTRO_BASE = ":slugos"
-
 # FULL_OPTIMIZATION
 #    Optimization settings.  Os works fine and is significantly better than O2.
 #    The other settings are somewhat arbitrary.  The optimisations chosen here
@@ -64,8 +60,8 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-po
 #  (such as a local feed) can be defined in local.conf
 #----------------------------------------------------------------------------------
 #
-FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/cross/${DISTRO_FEED}"
-FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${SLUGOS_DISTRO}/native/${DISTRO_FEED}"
+FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/cross/${DISTRO_FEED}"
+FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME}/native/${DISTRO_FEED}"
 
 #----------------------------------------------------------------------------------
 # FIRMWARE CONFIGURATION
============================================================
--- conf/distro/openslug-native.conf	23fdffba5ef690baf7bfe6cda08bc61734dbc0a9
+++ conf/distro/openslug-native.conf	4101e8c41f6e360acf33ea689b48d1ee19ef6f80
@@ -1,9 +1,7 @@
-SLUGOS_DISTRO = "openslug"
-
 # Our build host is armeb, not armv5eb that the kernel reports
 BUILD_ARCH = "armeb"
 
-require conf/distro/slugosbe.conf
+require conf/distro/openslug.conf
 
 # Corresponding packages should be in openslug-native.bb,
 # currently missing: ipkg-utils libtool quilt pkgconfig
============================================================
--- conf/distro/openslug.conf	bcacde3e84d8c42fcb26c5181e0a71b9bd54370a
+++ conf/distro/openslug.conf	0c53992cc239e0986d4ba57bfd99d0351d1ee935
@@ -1,7 +1,11 @@
 #@TYPE: Distribution
 #@NAME: OpenSlug
 #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
 
-SLUGOS_DISTRO = "openslug"
+DISTRO_NAME = "OpenSlug"
+IMAGE_BASENAME = "openslug"
+TARGET_ARCH = "armeb"
+ARM_INSTRUCTION_SET = "arm"
+TARGET_OS = "linux"
 
+require conf/distro/slugos.conf
-require conf/distro/slugosbe.conf
============================================================
--- conf/distro/ucslugc.conf	f74184c4911a8d6410aa3df1e5e7b39022897bce
+++ conf/distro/ucslugc.conf	f48396b3a853f5f0cf619acd130e9f0cf00a752a
@@ -1,13 +1,9 @@ DISTRO_NAME = "UcSlugC"
 #@TYPE: Distribution
 #@NAME: UcSlugC
 #@DESCRIPTION: UcSlugC Linux Distribution for the NSLU2
 
 DISTRO_NAME = "UcSlugC"
-# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
-# DISTRO_FEED = "unstable"
-DISTRO_TYPE = "beta"
-SLUGOS_DISTRO = "ucslugc"
-
+IMAGE_BASENAME = "ucslugc"
 TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "thumb"
 TARGET_OS = "linux-uclibc"
============================================================
--- packages/images/slugos-image.bb	39cd82c2827b6cb235223b33970dc6ac3c07280a
+++ packages/images/slugos-image.bb	8d31a1ded4a3c49f73a313715e2a093049eb00f4
@@ -7,11 +7,10 @@ PR = "r45"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
 PR = "r45"
-PROVIDES += "${SLUGOS_DISTRO}-image"
 
 COMPATIBLE_MACHINE = "nslu2"
 
-IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
+IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2"
 EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
============================================================
--- packages/meta/slugos-native-packages.bb	579ef8aec74560e593d0a7255147e21119942db9
+++ packages/meta/slugos-native-packages.bb	1f17cecf30ce24231fd5284ecdb19767d3cf88e3
@@ -1,8 +1,7 @@ PR = "r1"
 # Only list packages which will not build 'cross' in here.
 DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
 LICENSE = "MIT"
 PR = "r1"
-PROVIDES += "${SLUGOS_DISTRO}-native-packages"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
============================================================
--- packages/meta/slugos-native.bb	3d71563f326b7317f437fcac47519144f2458238
+++ packages/meta/slugos-native.bb	47615f9c6a736942237210e4962e94ce87b4e464
@@ -11,7 +11,6 @@ PACKAGES = "${PN}"
 EXCLUDE_FROM_WORLD = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
-PROVIDES += "${SLUGOS_DISTRO}-native"
 
 # Run-time only (RDEPENDS) stuff - no package explicitly provides
 # these targets.
============================================================
--- packages/meta/slugos-packages.bb	d6a43c3b79a933b96f024387f569c35cc1c6f74e
+++ packages/meta/slugos-packages.bb	bd98bf286379b864293b8a3ff99330d9f1a5bcc1
@@ -5,9 +5,8 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
 CONFLICTS = "db3"
-PROVIDES += "${SLUGOS_DISTRO}-packages"
 
 COMPATIBLE_MACHINE = "nslu2"
 EXCLUDE_FROM_WORLD = "1"
@@ -106,6 +105,7 @@ SLUGOS_PACKAGES = "\
 	make \
 	masqmail \
 	mdadm \
+	mediatomb \
 	memtester \
 	mgetty \
 	miau \

More information about the Openembedded-commits mailing list