[oe-commits] org.oe.dev slugos: Replaced SLUGOS_IMAGENAME with SLUGOS_DISTRO, and localised the usage of SLUGOS_DISTRO to slugos-*.* files only. Removed SLUGOS_FLASH_IMAGE completely (made it always enabled) and cleaned up slugos-image.bb
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Feb 10 23:27:05 UTC 2007
slugos: Replaced SLUGOS_IMAGENAME with SLUGOS_DISTRO, and localised the usage of SLUGOS_DISTRO to slugos-*.* files only. Removed SLUGOS_FLASH_IMAGE completely (made it always enabled) and cleaned up slugos-image.bb
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: aec967755f263cafd292d50141a8f067a805334d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aec967755f263cafd292d50141a8f067a805334d
Files:
1
packages/images/slugos-imagename.bb
conf/distro/debianslug.conf
conf/distro/include/slugos.inc
conf/distro/openslug.conf
conf/distro/ucslugc.conf
packages/images/openprotium-image.bb
packages/images/slugos-image.bb
packages/meta/slugos-native.bb
packages/meta/slugos-packages.bb
Diffs:
#
# mt diff -r856725f840b0adb5dd7daedc821ee9cd8a9978ef -raec967755f263cafd292d50141a8f067a805334d
#
#
#
# delete "packages/images/slugos-imagename.bb"
#
# patch "conf/distro/debianslug.conf"
# from [af27797b54954f723aab903c15c1b511f27f6ac3]
# to [a7645f95ead5482367d3925b565021b70a721786]
#
# patch "conf/distro/include/slugos.inc"
# from [e9c327ed4bdf9fc4bb24a3c8f7fefc8638d5e574]
# to [38b1bf659e06882ee0efbccb10178993122d2bb2]
#
# patch "conf/distro/openslug.conf"
# from [5e2efe976eaf438e8be9044afa3cb1a3b9d27f75]
# to [607ecad2224597c74248303923bb9006573b5923]
#
# patch "conf/distro/ucslugc.conf"
# from [81a66eb9a8c934679c029a1ddf39809713d49c48]
# to [3dedc1b93daec8d139bb92cb338c0c3adb547483]
#
# patch "packages/images/openprotium-image.bb"
# from [504f2d248dbaa82c0dd9782ce5cc700e726a5328]
# to [b4b50441b7120ae285711264a6fdba8d1c65c3dd]
#
# patch "packages/images/slugos-image.bb"
# from [feb67be71a78e5d87e29a1a001ff134e032ff130]
# to [b4e869cd03b576ff78f7cb9e6eca08f44be7d135]
#
# patch "packages/meta/slugos-native.bb"
# from [0168dc4f6ef718bf58cb3842e774d96332078d5e]
# to [3d71563f326b7317f437fcac47519144f2458238]
#
# patch "packages/meta/slugos-packages.bb"
# from [53854b163697062d1da8166635438ea050a7f119]
# to [d6a43c3b79a933b96f024387f569c35cc1c6f74e]
#
============================================================
--- conf/distro/debianslug.conf af27797b54954f723aab903c15c1b511f27f6ac3
+++ conf/distro/debianslug.conf a7645f95ead5482367d3925b565021b70a721786
@@ -9,11 +9,8 @@ DISTRO_TYPE = "beta"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "debianslug"
+SLUGOS_DISTRO = "debianslug"
-# debianslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "1"
-
#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION
#----------------------------------------------------------------------------------
============================================================
--- conf/distro/include/slugos.inc e9c327ed4bdf9fc4bb24a3c8f7fefc8638d5e574
+++ conf/distro/include/slugos.inc 38b1bf659e06882ee0efbccb10178993122d2bb2
@@ -18,13 +18,6 @@
# g or u - glibc or uclibc libc implementation
# set TARGET_OS to match
#
-# The following names are deprecated:
-#
-# openslug - the historical name of a canonical slugos-bag distro
-# also the name of a standard slugos-bag distro with a package feed
-# ucslugc - the historical (and obsolete) name of slugos-btu
-# also the name of a standard slugos-btu distro with a package feed
-#
#----------------------------------------------------------------------------------
# STANDARD SLUGOS DEFINITIONS
@@ -42,6 +35,10 @@ DISTRO_FEED ?= "unstable"
# DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}"
DISTRO_FEED ?= "unstable"
+SLUGOS_DISTRO ?= "slugos"
+
+IMAGE_BASENAME = "${SLUGOS_DISTRO}"
+
# The following must also be set, they define the basic format of the build
#
#ARM_INSTRUCTION_SET "arm" or "thumb"
@@ -77,18 +74,6 @@ FULL_OPTIMIZATION = "-Os -fomit-frame-po
-fno-unroll-loops -fno-inline-functions \
-fweb -funit-at-a-time"
-# packages/meta/slugos-image.bb generates a binary image of the root file system
-# with a name controlled by the following setting - it defaults to the top level
-# ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g.
-# if you change the DISTRO from one of the standard ones in a way which does not
-# change the generated image).
-SLUGOS_IMAGENAME ?= "${DISTRO_NAME}"
-
-# pull in the frozen list of bbfiles - this sets BBFILES and this will override any
-# setting in local.conf Since this depends on ${DISTRO} it doesn't actually do
-# anything by default unless conf/distro/${DISTRO}-packages.conf exists.
-# require conf/distro/include/freeze.conf
-
#----------------------------------------------------------------------------------
# FEEDS
# The FEED_URIS lines define where on the internet SlugOS looks for packages
@@ -122,20 +107,6 @@ CMDLINE_DEBUG = "noirqdebug"
# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
CMDLINE_DEBUG = "noirqdebug"
-# Building a full image. If you set SLUGOS_FLASH_IMAGE to "nslu2" a complete
-# 8MByte flash image will be built after the rootfs JFFS2 image. Other options
-# may later be defined for other vendor-flashable image types.
-#
-# If you do this you will need to find a source for the LinkSys software to be
-# placed in the full image - 'RedBoot' (the boot loader), 'Trailer' (just a bunch
-# of bytes to flag the image as valid) and 'SysConf' (actually just a block of
-# unset data - you could modify this to pre-configure the SysConf partition of the
-# image). If you own an NSLU2 then this data is already in the flash of the NSLU2
-# and you can download it (including new versions) from the LinkSys web site - see
-# packages/meta/slugos-image.bb for information about where to put the downloaded
-# data.
-SLUGOS_FLASH_IMAGE ?= "no"
-
# EXTRA PACKAGES
# --------------
# SlugOS builds an image with no extra packages - to add packages to the
@@ -165,8 +136,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# compiler/binary/library versions (unslung uses different ones so these
-# cannot be in ${MACHINE}.conf)
+# compiler/binary/library versions
PREFERRED_VERSION_binutils ?= "2.16"
PREFERRED_VERSION_binutils-cross ?= "2.16"
PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
============================================================
--- conf/distro/openslug.conf 5e2efe976eaf438e8be9044afa3cb1a3b9d27f75
+++ conf/distro/openslug.conf 607ecad2224597c74248303923bb9006573b5923
@@ -9,11 +9,8 @@ DISTRO_TYPE = "beta"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "openslug"
+SLUGOS_DISTRO = "openslug"
-# openslug builds a complete image (not just the parts)
-SLUGOS_FLASH_IMAGE = "1"
-
#----------------------------------------------------------------------------------
# FIRMWARE CONFIGURATION
#----------------------------------------------------------------------------------
============================================================
--- conf/distro/ucslugc.conf 81a66eb9a8c934679c029a1ddf39809713d49c48
+++ conf/distro/ucslugc.conf 3dedc1b93daec8d139bb92cb338c0c3adb547483
@@ -7,7 +7,7 @@ DISTRO_TYPE = "beta"
# DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# DISTRO_FEED = "unstable"
DISTRO_TYPE = "beta"
-SLUGOS_IMAGENAME = "ucslugc"
+SLUGOS_DISTRO = "ucslugc"
PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
PREFERRED_VERSION_gcc-cross = "3.4.4"
============================================================
--- packages/images/openprotium-image.bb 504f2d248dbaa82c0dd9782ce5cc700e726a5328
+++ packages/images/openprotium-image.bb b4b50441b7120ae285711264a6fdba8d1c65c3dd
@@ -1,11 +1,9 @@ DEPENDS = "${MACHINE_TASK_PROVIDER}"
DESCRIPTION = "OpenProtium image"
HOMEPAGE = "http://www.openprotium.com"
LICENSE = "MIT"
PR = "r0"
DEPENDS = "${MACHINE_TASK_PROVIDER}"
-# SLUGOS_IMAGENAME defines the name of the image to be build, if it
-# is not set this package will be skipped!
EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x10000 -D ${SLUGOS_DEVICE_TABLE}"
IMAGE_LINGUAS = ""
============================================================
--- packages/images/slugos-image.bb feb67be71a78e5d87e29a1a001ff134e032ff130
+++ packages/images/slugos-image.bb b4e869cd03b576ff78f7cb9e6eca08f44be7d135
@@ -7,12 +7,10 @@ PR = "r44"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
PR = "r44"
+PROVIDES += "${SLUGOS_DISTRO}-image"
COMPATIBLE_MACHINE = "nslu2"
-# SLUGOS_IMAGENAME defines the name of the image to be build, if it
-# is not set this package will be skipped!
-IMAGE_BASENAME = "${SLUGOS_IMAGENAME}"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DISTRO_VERSION}"
IMAGE_FSTYPES = "jffs2"
EXTRA_IMAGECMD_jffs2 += " -D ${SLUGOS_DEVICE_TABLE}"
@@ -34,23 +32,11 @@ IMAGE_PREPROCESS_COMMAND += "install -c
IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;"
IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;"
-# Building a full image. If required do a post-process command which builds
-# the full flash image using slugimage. At present this only works for NSLU2 images.
-PACK_IMAGE = ""
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}"
-
# This hack removes '${MACHINE}' from the end of the arch.conf for ipk,
# preventing _mach.ipk (with no byte sex) taking precedence over everything
# else.
ROOTFS_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';"
-# These depends define native utilities - they do not get put in the flash and
-# are not required to build the image.
-IMAGE_TOOLS = ""
-EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
-
# CONFIG:
# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image
# SLUGOS_SUPPORT: set here, see below, added to the image.
@@ -95,25 +81,15 @@ inherit image
inherit image
-python () {
- # Don't build slugos images unless the configuration is set up
- # for an image build!
- if bb.data.getVar("SLUGOS_IMAGENAME", d, 1) == '':
- raise bb.parse.SkipPackage("absent or broken SlugOS configuration")
-}
-
-#--------------------------------------------------------------------------------
-# NSLU2 specific
-#
#NOTE: you do not actually need the boot loader in normal use because it is
# *not* overwritten by a standard upslug upgrade, so you can make an image with
# just non-LinkSys software which can be flashed into the NSLU2. Because
# LinkSys have made "EraseAll" available, however, (this does overwrite RedBoot)
# it is a bad idea to produce flash images without a valid RedBoot - that allows
# an innocent user upgrade attempt to instantly brick the NSLU2.
-PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}"
+IMAGE_POSTPROCESS_COMMAND += "slugos_pack_image;"
+EXTRA_IMAGEDEPENDS += "slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native"
NSLU2_SLUGIMAGE_ARGS ?= ""
slugos_pack_image() {
@@ -168,6 +144,3 @@ slugos_pack_image() {
-C ${DEPLOY_DIR_IMAGE} firmupgrade
rm -rf ${DEPLOY_DIR_IMAGE}/firmupgrade
}
-
-# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash
-IMAGE_TOOLS_nslu2 = "upslug2-native"
============================================================
--- packages/meta/slugos-native.bb 0168dc4f6ef718bf58cb3842e774d96332078d5e
+++ packages/meta/slugos-native.bb 3d71563f326b7317f437fcac47519144f2458238
@@ -11,7 +11,7 @@ PACKAGES = "${PN}"
EXCLUDE_FROM_WORLD = "1"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
-PROVIDES += "${SLUGOS_IMAGENAME}-native"
+PROVIDES += "${SLUGOS_DISTRO}-native"
# Run-time only (RDEPENDS) stuff - no package explicitly provides
# these targets.
============================================================
--- packages/meta/slugos-packages.bb 53854b163697062d1da8166635438ea050a7f119
+++ packages/meta/slugos-packages.bb d6a43c3b79a933b96f024387f569c35cc1c6f74e
@@ -7,7 +7,7 @@ CONFLICTS = "db3"
LICENSE = "MIT"
PR = "r17"
CONFLICTS = "db3"
-PROVIDES += "${SLUGOS_IMAGENAME}-packages"
+PROVIDES += "${SLUGOS_DISTRO}-packages"
COMPATIBLE_MACHINE = "nslu2"
EXCLUDE_FROM_WORLD = "1"
More information about the Openembedded-commits
mailing list