From c00cd09f520da9d74176f4b9ab1b21db5e9067e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:16:57 +0000 Subject: start removing task-bootstrap* as stated in removal.txt --- packages/obsolete/tasks/.mtn2git_empty | 0 .../obsolete/tasks/task-bootstrap-unionroot.bb | 34 ++++++++++++++++++++++ packages/obsolete/tasks/task-bootstrap.bb | 27 +++++++++++++++++ packages/obsolete/tasks/task-bootstrap.inc | 9 ++++++ packages/tasks/task-bootstrap-unionroot.bb | 34 ---------------------- packages/tasks/task-bootstrap.bb | 27 ----------------- packages/tasks/task-bootstrap.inc | 9 ------ removal.txt | 1 + 8 files changed, 71 insertions(+), 70 deletions(-) create mode 100644 packages/obsolete/tasks/.mtn2git_empty create mode 100644 packages/obsolete/tasks/task-bootstrap-unionroot.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.inc delete mode 100644 packages/tasks/task-bootstrap-unionroot.bb delete mode 100644 packages/tasks/task-bootstrap.bb delete mode 100644 packages/tasks/task-bootstrap.inc diff --git a/packages/obsolete/tasks/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb new file mode 100644 index 0000000000..e737e31608 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Core packages required for a basic installation with unionroot" +PROVIDES = "task-bootstrap" +RPROVIDES = "task-bootstrap" +PR = "r2" +DEFAULT_PREFERENCE = "-1" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts \ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)} \ + unionfs-modules \ + unionfs-utils \ + unionroot \ + unionroot-utils' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb new file mode 100644 index 0000000000..d84f331102 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Core packages required for a basic installation" +PR = "r25" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts fuser setserial\ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)}' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.inc b/packages/obsolete/tasks/task-bootstrap.inc new file mode 100644 index 0000000000..073da7055f --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.inc @@ -0,0 +1,9 @@ +def bootstrap_modutils_rdepends(d): + import bb + m = bb.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils-depmod') + if '26' in m: + r.append('module-init-tools-depmod') + return ' '.join(r) diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb deleted file mode 100644 index e737e31608..0000000000 --- a/packages/tasks/task-bootstrap-unionroot.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation with unionroot" -PROVIDES = "task-bootstrap" -RPROVIDES = "task-bootstrap" -PR = "r2" -DEFAULT_PREFERENCE = "-1" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts \ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)} \ - unionfs-modules \ - unionfs-utils \ - unionroot \ - unionroot-utils' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb deleted file mode 100644 index d84f331102..0000000000 --- a/packages/tasks/task-bootstrap.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation" -PR = "r25" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts fuser setserial\ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)}' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.inc b/packages/tasks/task-bootstrap.inc deleted file mode 100644 index 073da7055f..0000000000 --- a/packages/tasks/task-bootstrap.inc +++ /dev/null @@ -1,9 +0,0 @@ -def bootstrap_modutils_rdepends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils-depmod') - if '26' in m: - r.append('module-init-tools-depmod') - return ' '.join(r) diff --git a/removal.txt b/removal.txt index 7c09fded9f..70dc59278b 100644 --- a/removal.txt +++ b/removal.txt @@ -24,6 +24,7 @@ Removal Date: 2006-12-22 Maintainer: None Reason: Obsoleted by task-base Proposed by: Koen Kooi +Note: Moved to packages/obsolete/tasks on 2006-12-22 Package Name: gst* 0.8.x Removal Date: 2006-12-29 -- cgit v1.2.3 From c0c21a6d23cf70c053dbf39f85402e2d4ba21677 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:26:00 +0000 Subject: local.conf.sample: update it a bit --- conf/local.conf.sample | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 52bd88a4e9..df00fbae37 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -55,8 +55,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TMPDIR = /usr/local/projects/oetmp # Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -# MACHINE = "collie" +# for machines currently known to OpenEmbedded. This will automatically take care +# of TARGET_ARCH +# MACHINE = "c7x0" # Use this to specify the target architecture. Note that this is only # needed when building for a machine not known to OpenEmbedded. Better use @@ -66,25 +67,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Use this to specify the target operating system. The default is "linux", # for a normal linux system with glibc. Set this to "linux-uclibc" if you want # to build a uclibc based system. +# Normally the DISTRO of your choosing will take care of this # TARGET_OS = "linux" # TARGET_OS = "linux-uclibc" # Uncomment this to select a distribution policy. See the conf directory # for distributions currently known to OpenEmbedded. -# Although they no longer contain version number in the (file-)name -# familiar-unstable and openzaurus-unstable are so called "versioned" -# distros, i.e. they explicitely select specific versions of various -# packages. +# Although it no longer contain version number in the (file-)name +# openzaurus-unstable is a so called "versioned" distro, i.e. they +# explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "generic" -# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and # thereby guarantee i18n support on all devices. If your build breaks on # qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that # this breaks i18n on devices with less than 128MB RAM) or installing # a working third-party qemu (e.g. provided by your distribution) and -# adding qemu-native to ASSUME_PROVIDED +# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party +# qemus lack patches needed to work with various OE targets. # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" @@ -108,7 +110,8 @@ IMAGE_FSTYPES = "jffs2 tar" # BBDEBUG = "yes" # Uncomment these two if you want BitBake to build images useful for debugging. -# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined +# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined. +# Also note that OE now produces -dbg packages which contain debugging symbols. # DEBUG_BUILD = "1" # INHIBIT_PACKAGE_STRIP = "1" -- cgit v1.2.3