[oe-commits] org.oe.dev merge of '288504c0e005ddaf483f67c32ceb9648a94cc671'
rwhitby commit
openembedded-commits at lists.openembedded.org
Wed Aug 29 18:09:50 UTC 2007
merge of '288504c0e005ddaf483f67c32ceb9648a94cc671'
and '3388a823662072c321fa2858d30420bd4ce65421'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e24780d148b92ff2ae1162d9886e4a7befaf60da
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e24780d148b92ff2ae1162d9886e4a7befaf60da
Files:
1
packages/squid
packages/angstrom/angstrom-x11-gpe-image.bb
packages/angstrom/angstrom-x11-office-image.bb
packages/angstrom/angstrom-x11-pimlico-image.bb
packages/blktool/blktool_4.bb
packages/squid/squid_2.6.STABLE14.bb
classes/kernel.bbclass
conf/machine/c7x0.conf
conf/machine/dht-walnut.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/include/zaurus-2.6.inc
conf/machine/smdk2443.conf
packages/linux/linux-gta01.inc
packages/update-modules/update-modules_1.0.bb
Diffs:
#
# mt diff -r288504c0e005ddaf483f67c32ceb9648a94cc671 -re24780d148b92ff2ae1162d9886e4a7befaf60da
#
#
#
# add_dir "packages/squid"
#
# add_file "packages/angstrom/angstrom-x11-gpe-image.bb"
# content [0de0219cb07aa14a5dfb92a4d594557fea1e0693]
#
# add_file "packages/angstrom/angstrom-x11-office-image.bb"
# content [715fb0b70c526570603933ef0dc9d34fc5193943]
#
# add_file "packages/angstrom/angstrom-x11-pimlico-image.bb"
# content [0d01ef64a17910501224379961acdaafafb9b70c]
#
# add_file "packages/blktool/blktool_4.bb"
# content [0b0748260015296dd13b2454c6019035c4c691c9]
#
# add_file "packages/squid/squid_2.6.STABLE14.bb"
# content [5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f]
#
# patch "classes/kernel.bbclass"
# from [26da2ff033e30db7199c7cf69fc6008850e40a16]
# to [79b0a4830c95b4a3c3463b13135ce60b5d4a616b]
#
# patch "conf/machine/c7x0.conf"
# from [7638510804028bd9403ca89524f98750881846ab]
# to [6005085b97146720e5fa0cdc84c0a795df419453]
#
# patch "conf/machine/dht-walnut.conf"
# from [64cf7d5a30c2928f4981108397790e7f45c7b9e8]
# to [bfbe361e5ef76bb71b1abf9414cc4b5e588d6f19]
#
# patch "conf/machine/fic-gta01.conf"
# from [1f95cfda3ceeee646ee03718c50280ea1818fa58]
# to [d9f73e20c859e127d386a96754598fda3fba71a7]
#
# patch "conf/machine/fic-gta02.conf"
# from [998009f2b1180b5024ef1f0ce6e808ad71d71e1a]
# to [c2f26e3d24a8b8e8b96b8e9937af9e001f8043fa]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [72f56a86eaabe41773f1417f2934a7ed5a2b288b]
# to [33450d82b33ee860d4ee408cf55294eaf200a8ef]
#
# patch "conf/machine/smdk2443.conf"
# from [d70cb9710dda2522eb9d0b4b2d44e4d723babf11]
# to [b800568c28122a7ba0477566ce850219e08ec064]
#
# patch "packages/linux/linux-gta01.inc"
# from [44323377f4017d36e02429fa4c056b0b73c70cdd]
# to [5cda3191314c5f66abcba84fb066049563b8ff99]
#
============================================================
--- packages/angstrom/angstrom-x11-gpe-image.bb 0de0219cb07aa14a5dfb92a4d594557fea1e0693
+++ packages/angstrom/angstrom-x11-gpe-image.bb 0de0219cb07aa14a5dfb92a4d594557fea1e0693
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+ "
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+ ${XSERVER} \
+ task-base-extended \
+ angstrom-x11-base-depends \
+ angstrom-gpe-task-base \
+ angstrom-gpe-task-settings \
+ kernel-modules \
+ hal \
+ angstrom-gpe-task-pim \
+ ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/angstrom/angstrom-x11-office-image.bb 715fb0b70c526570603933ef0dc9d34fc5193943
+++ packages/angstrom/angstrom-x11-office-image.bb 715fb0b70c526570603933ef0dc9d34fc5193943
@@ -0,0 +1,41 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r1"
+
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+ "
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+ ${XSERVER} \
+ task-base-extended \
+ angstrom-x11-base-depends \
+ angstrom-gpe-task-base \
+ angstrom-gpe-task-settings \
+ kernel-modules \
+ hal \
+ abiword \
+ gnumeric \
+ cups \
+ claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \
+ midori minimo \
+ gphoto2 \
+ ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/angstrom/angstrom-x11-pimlico-image.bb 0d01ef64a17910501224379961acdaafafb9b70c
+++ packages/angstrom/angstrom-x11-pimlico-image.bb 0d01ef64a17910501224379961acdaafafb9b70c
@@ -0,0 +1,36 @@
+#Angstrom X11 image, with apps and kernel modules included
+LICENSE = "MIT"
+PR = "r0"
+
+PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
+PREFERRED_PROVIDER_tslib ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
+
+ANGSTROM_EXTRA_INSTALL += " \
+ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
+ "
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "x11-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+ ${XSERVER} \
+ task-base-extended \
+ angstrom-x11-base-depends \
+ angstrom-gpe-task-base \
+ angstrom-gpe-task-settings \
+ kernel-modules \
+ hal \
+ angstrom-ohand-task-pim \
+ ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
============================================================
--- packages/blktool/blktool_4.bb 0b0748260015296dd13b2454c6019035c4c691c9
+++ packages/blktool/blktool_4.bb 0b0748260015296dd13b2454c6019035c4c691c9
@@ -0,0 +1,8 @@
+DESCRIPTION = "Display or change block device settings"
+LICENSE = "GPLv2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
+
+S = "${WORKDIR}/${PN}-${PV}.orig"
+
+inherit autotools
============================================================
--- packages/squid/squid_2.6.STABLE14.bb 5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f
+++ packages/squid/squid_2.6.STABLE14.bb 5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f
@@ -0,0 +1,11 @@
+DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
+LICENSE = "GPLv2"
+
+DEPENDS = "aio"
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+
+inherit autotools
+
+
+
============================================================
--- classes/kernel.bbclass 26da2ff033e30db7199c7cf69fc6008850e40a16
+++ classes/kernel.bbclass 79b0a4830c95b4a3c3463b13135ce60b5d4a616b
@@ -179,7 +179,9 @@ RDEPENDS_kernel = "kernel-base"
FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
FILES_kernel-dev = "/boot/System.map* /boot/config*"
RDEPENDS_kernel = "kernel-base"
-RDEPENDS_kernel-base = "kernel-image"
+# Allow machines to override this dependency if kernel image files are
+# not wanted in images as standard
+RDEPENDS_kernel-base ?= "kernel-image"
PKG_kernel-image = "kernel-image-${KERNEL_VERSION}"
PKG_kernel-base = "kernel-${KERNEL_VERSION}"
ALLOW_EMPTY_kernel = "1"
============================================================
--- conf/machine/c7x0.conf 7638510804028bd9403ca89524f98750881846ab
+++ conf/machine/c7x0.conf 6005085b97146720e5fa0cdc84c0a795df419453
@@ -10,5 +10,5 @@ ROOT_FLASH_SIZE = "25"
ROOT_FLASH_SIZE = "25"
# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
-XSERVER = "xserver-kdrive-w100"
+XSERVER = "xserver-kdrive-imageon"
============================================================
--- conf/machine/dht-walnut.conf 64cf7d5a30c2928f4981108397790e7f45c7b9e8
+++ conf/machine/dht-walnut.conf bfbe361e5ef76bb71b1abf9414cc4b5e588d6f19
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+UBOOT_ENTRYPOINT = "0"
MACHINE_FEATURES = "kernel26 ext2"
MACHINE_TASK_PROVIDER = "task-base"
============================================================
--- conf/machine/fic-gta01.conf 1f95cfda3ceeee646ee03718c50280ea1818fa58
+++ conf/machine/fic-gta01.conf d9f73e20c859e127d386a96754598fda3fba71a7
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
+UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
============================================================
--- conf/machine/fic-gta02.conf 998009f2b1180b5024ef1f0ce6e808ad71d71e1a
+++ conf/machine/fic-gta02.conf c2f26e3d24a8b8e8b96b8e9937af9e001f8043fa
@@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
============================================================
--- conf/machine/include/zaurus-2.6.inc 72f56a86eaabe41773f1417f2934a7ed5a2b288b
+++ conf/machine/include/zaurus-2.6.inc 33450d82b33ee860d4ee408cf55294eaf200a8ef
@@ -67,3 +67,6 @@ zaurus_make_installkit () {
md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
}
+
+# Don't include kernels in standard images for Zaurus machines
+RDEPENDS_kernel-base = ""
============================================================
--- conf/machine/smdk2443.conf d70cb9710dda2522eb9d0b4b2d44e4d723babf11
+++ conf/machine/smdk2443.conf b800568c28122a7ba0477566ce850219e08ec064
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PACKAGE_EXTRA_ARCHS = "armv4t"
PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443"
+UBOOT_ENTRYPOINT = "30008000"
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttySAC0"
============================================================
--- packages/linux/linux-gta01.inc 44323377f4017d36e02429fa4c056b0b73c70cdd
+++ packages/linux/linux-gta01.inc 5cda3191314c5f66abcba84fb066049563b8ff99
@@ -12,7 +12,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
##############################################################
# source and patches
#
-SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
file://defconfig-${VANILLA_VERSION}-${MACHINE} \
file://logo_linux_clut224.ppm"
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
@@ -51,7 +51,7 @@ do_prepatch() {
do_prepatch() {
mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- mv patches patches.old
+ mv patches patches.openmoko
mv .pc .pc.old
}
#
# mt diff -r3388a823662072c321fa2858d30420bd4ce65421 -re24780d148b92ff2ae1162d9886e4a7befaf60da
#
#
#
# patch "packages/update-modules/update-modules_1.0.bb"
# from [c826ebfc84c887b036affefdc32161fd9f4c103c]
# to [7244af12c753fc05bb699d727f414e78975ec933]
#
============================================================
--- packages/update-modules/update-modules_1.0.bb c826ebfc84c887b036affefdc32161fd9f4c103c
+++ packages/update-modules/update-modules_1.0.bb 7244af12c753fc05bb699d727f414e78975ec933
@@ -1,9 +1,9 @@ RDEPENDS = "${@base_contains("MACHINE_FE
SECTION = "base"
DESCRIPTION = "Script to manage module configuration files"
LICENSE = "GPLv2"
PACKAGE_ARCH = "all"
RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r5"
+PR = "r6"
SRC_URI = "file://update-modules"
@@ -18,3 +18,13 @@ do_install() {
install -d ${D}${sbindir}
install ${WORKDIR}/update-modules ${D}${sbindir}
}
+
+# The Unslung distro uses a 2.4 kernel for a machine (the NSLU2) which
+# supports both 2.4 and 2.6 kernels. Rather than forcing OE to have
+# to deal with that unique legacy corner case, we just nullify the
+# RDEPENDS here and handle it in the Unslung image recipe. I know this
+# is ugly. Please don't remove it unless you first make the RDEPENDS
+# line at the top of this file understand that a machine can be used
+# in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's
+# not worth the effort to do that, so just overlook the next line.
+RDEPENDS_unslung = ""
More information about the Openembedded-commits
mailing list