[oe-commits] org.oe.dev merge of 'c745880b6a08ce3de37f4c125a476e0c17fd0413'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:35:11 UTC 2007
merge of 'c745880b6a08ce3de37f4c125a476e0c17fd0413'
and 'f3e9e526e8243cdb5ee7c7888a2b2dbb2fcc407e'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e09a09e07f8744e8484e7b3351be29f7775bb030
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e09a09e07f8744e8484e7b3351be29f7775bb030
Files:
1
conf/distro/debianslug.conf
conf/distro/openslug.conf
conf/distro/openslug-native.conf
conf/distro/slugos-native.conf
conf/distro/mamona.conf
classes/package_deb.bbclass
conf/distro/angstrom-2007.1.conf
packages/gpephone/linphone_1.5.0.bb
packages/keymaps/files/collie/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/python/python-2.4.4-manifest.inc
packages/tasks/task-base.bb
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -rc745880b6a08ce3de37f4c125a476e0c17fd0413 -re09a09e07f8744e8484e7b3351be29f7775bb030
#
#
# no changes
#
#
# mt diff -rf3e9e526e8243cdb5ee7c7888a2b2dbb2fcc407e -re09a09e07f8744e8484e7b3351be29f7775bb030
#
#
#
# delete "conf/distro/debianslug.conf"
#
# delete "conf/distro/openslug.conf"
#
# rename "conf/distro/openslug-native.conf"
# to "conf/distro/slugos-native.conf"
#
# add_file "conf/distro/mamona.conf"
# content [79c71417e4ff26abcb40d138494fa02b837f1e76]
#
# patch "classes/package_deb.bbclass"
# from [69d088bbe8d323f7b59f059a2d36293804925eee]
# to [cc030a88f072281edf59354e68abe78585cac42b]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [b44a36c2cd9b88ab9da4a949111c042b72d2d0c5]
# to [b186a870ef6e33f8fbb4d26aac91c77dad588247]
#
# patch "conf/distro/slugos-native.conf"
# from [4101e8c41f6e360acf33ea689b48d1ee19ef6f80]
# to [516f5865e313345406af7168220fd7948a0a84b3]
#
# patch "packages/gpephone/linphone_1.5.0.bb"
# from [e69b6f46475a126b14f8c3f27c24c2e4a9c02d91]
# to [cf9062821dab89b901f60da8f53cf8efc712b47c]
#
# patch "packages/keymaps/files/collie/keymap-2.6.map"
# from [7c72c2e8b68396eab751a0e649029dc354d97eb3]
# to [9ae351dfb21f9a85ee2f904e947faa5073a26a34]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [b8bf5423b14e0a10cb0a3ee85d3b36af30dbdf51]
# to [33fb9d5be81731b986f034509b2a4aab8152497e]
#
# patch "packages/python/python-2.4.4-manifest.inc"
# from [c54ba74a5b81534fb7e314d4133157b7ef8a7add]
# to [5d3e920d0e1b1574abeb0e3f67199d08af99476c]
#
# patch "packages/tasks/task-base.bb"
# from [1fe549e595dc265791d8b8d9c85a1fa065c3e230]
# to [c9bcc6674946fa0a5e8a46c40921b23ac7bf83e2]
#
# patch "packages/tasks/task-slugos.bb"
# from [c3e0115e26893b61230dbe110580f6cf065e2723]
# to [daa2a32b310f6b42b3690c5c008b38d19e080d6f]
#
============================================================
--- conf/distro/mamona.conf 79c71417e4ff26abcb40d138494fa02b837f1e76
+++ conf/distro/mamona.conf 79c71417e4ff26abcb40d138494fa02b837f1e76
@@ -0,0 +1,60 @@
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: Mamona
+#@--------------------------------------------------------------------
+
+DISTRO = "mamona"
+DISTRO_NAME = Mamona""
+DISTRO_VERSION = "test-${DATE}"
+DISTRO_TYPE = "debug"
+#DISTRO_TYPE = "release"
+
+TARGET_VENDOR = "-mamona"
+
+require conf/distro/include/angstrom-glibc.inc
+
+INHERIT += " package_deb debian"
+TARGET_OS = "linux-gnueabi"
+
+TARGET_FPU_nokia770 = "soft"
+TARGET_FPU_n800 = "hard"
+
+FEED_ARCH_nokia770 = "armv5te"
+
+# Actually n800 is armv6 but we are using armv5te because qemu does not emulate
+# armv6 yet.
+FEED_ARCH_n800 = "armv5te"
+#FEED_ARCH_n800 = "armv6"
+
+#Make sure we use 2.6 on machines with a 2.4/2.6 selector
+KERNEL = "kernel26"
+MACHINE_KERNEL_VERSION = "2.6"
+
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+#NPTL stuff
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.5"
+PREFERRED_VERSION_binutils-cross = "2.17.50.0.5"
+
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-initial-cross = "4.1.1"
+
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
+
+PREFERRED_VERSION_glibc ?= "2.5"
+
+PREFERRED_VERSION_glibc-intermediate ?= "2.5"
+
+PREFERRED_VERSION_glibc-initial ?= "2.5"
+
+require conf/distro/include/sane-srcdates.inc
+
+
============================================================
--- classes/package_deb.bbclass 69d088bbe8d323f7b59f059a2d36293804925eee
+++ classes/package_deb.bbclass cc030a88f072281edf59354e68abe78585cac42b
@@ -209,6 +209,7 @@ python do_package_deb () {
scriptfile = file(os.path.join(controldir, script), 'w')
except OSError:
raise bb.build.FuncFailed("unable to open %s script file for writing." % script)
+ scriptfile.write("#!/bin/sh\n")
scriptfile.write(scriptvar)
scriptfile.close()
os.chmod(os.path.join(controldir, script), 0755)
============================================================
--- conf/distro/angstrom-2007.1.conf b44a36c2cd9b88ab9da4a949111c042b72d2d0c5
+++ conf/distro/angstrom-2007.1.conf b186a870ef6e33f8fbb4d26aac91c77dad588247
@@ -53,6 +53,7 @@ FEED_ARCH_nokia770 = "armv5te"
FEED_ARCH_magician = "armv5te"
FEED_ARCH_netbook-pro = "armv5te"
FEED_ARCH_nokia770 = "armv5te"
+FEED_ARCH_omap5912osk = "armv5te"
FEED_ARCH_poodle = "armv5te"
FEED_ARCH_spitz = "armv5te"
FEED_ARCH_tosa = "armv5te"
============================================================
--- conf/distro/openslug-native.conf 4101e8c41f6e360acf33ea689b48d1ee19ef6f80
+++ conf/distro/slugos-native.conf 516f5865e313345406af7168220fd7948a0a84b3
@@ -1,9 +1,9 @@ BUILD_ARCH = "armeb"
# Our build host is armeb, not armv5eb that the kernel reports
BUILD_ARCH = "armeb"
-require conf/distro/openslug.conf
+require conf/distro/slugos.conf
-# Corresponding packages should be in openslug-native.bb,
+# Corresponding packages should be in slugos-native.bb,
# currently missing: ipkg-utils libtool quilt pkgconfig
ASSUME_PROVIDED = "libtool-cross \
libtool-native \
============================================================
--- packages/gpephone/linphone_1.5.0.bb e69b6f46475a126b14f8c3f27c24c2e4a9c02d91
+++ packages/gpephone/linphone_1.5.0.bb cf9062821dab89b901f60da8f53cf8efc712b47c
@@ -41,7 +41,4 @@ do_stage() {
do_stage() {
export LIBTOOL="${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool"
autotools_stage_all
- cp ${S}/mediastreamer2/src/libquickstream.la ${STAGING_LIBDIR}
- cp ${S}/mediastreamer2/src/libmediastreamer.la ${STAGING_LIBDIR}
- cp ${S}/coreapi/liblinphone.la ${STAGING_LIBDIR}
}
============================================================
--- packages/keymaps/files/collie/keymap-2.6.map 7c72c2e8b68396eab751a0e649029dc354d97eb3
+++ packages/keymaps/files/collie/keymap-2.6.map 9ae351dfb21f9a85ee2f904e947faa5073a26a34
@@ -6,7 +6,6 @@
# as Altgr, and simply use a proper keymap. Said keymap is as
# follows.
# keymaps 0-2,4-5,8,12,20
-keycode 1 = Escape Escape
keycode 14 = BackSpace
shift keycode 14 = BackSpace
control keycode 14 = Delete
@@ -147,7 +146,7 @@ keycode 53 = slash
control keycode 53 = Num_Lock
shiftl control keycode 53 = Num_Lock
control shiftr keycode 53 = Num_Lock
-keycode 54 = Shift
+keycode 54 = AltGr
keycode 55 = KP_Multiply
keycode 56 = Alt
keycode 57 = space
@@ -155,7 +154,7 @@ keycode 57 = space
control keycode 57 = nul
shiftl control keycode 57 = grave
control shiftr keycode 57 = grave
-keycode 97 = Control
+keycode 67 = Control
keycode 99 = Control_backslash
control keycode 99 = Control_backslash
keycode 100 = AltGr
@@ -164,6 +163,7 @@ keycode 108 = Down
keycode 106 = Right
keycode 107 = Select
keycode 108 = Down
+keycode 116 = Escape
string F1 = "\033[[A"
string F2 = "\033[[B"
string F3 = "\033[[C"
============================================================
--- packages/keymaps/keymaps_1.0.bb b8bf5423b14e0a10cb0a3ee85d3b36af30dbdf51
+++ packages/keymaps/keymaps_1.0.bb 33fb9d5be81731b986f034509b2a4aab8152497e
@@ -1,9 +1,9 @@ PACKAGE_ARCH = "${MACHINE}"
DESCRIPTION = "Keyboard map"
SECTION = "base"
RDEPENDS = "initscripts console-tools"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE}"
-PR = "r13"
+PR = "r14"
inherit update-rc.d
============================================================
--- packages/python/python-2.4.4-manifest.inc c54ba74a5b81534fb7e314d4133157b7ef8a7add
+++ packages/python/python-2.4.4-manifest.inc 5d3e920d0e1b1574abeb0e3f67199d08af99476c
@@ -10,13 +10,14 @@ PROVIDES+="python-profile python-threadi
PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc"
-PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc"
+PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc-dbg python-misc"
DESCRIPTION_python-misc-dbg="Misc Python debug files"
FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug"
RDEPENDS_python-misc-dbg="python-core"
DESCRIPTION_python-misc="Misc Python files"
+PR_python-misc="ml1"
FILES_python-misc="${libdir}/python2.4/"
RDEPENDS_python-misc="python-core"
============================================================
--- packages/tasks/task-base.bb 1fe549e595dc265791d8b8d9c85a1fa065c3e230
+++ packages/tasks/task-base.bb c9bcc6674946fa0a5e8a46c40921b23ac7bf83e2
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r22"
+PR = "r23"
PACKAGES = "task-base \
task-base-oh-minimal \
@@ -185,6 +185,7 @@ task-base-pcmcia-rrecommends = "\
kernel-module-pcnet-cs \
kernel-module-serial-cs \
kernel-module-ide-cs \
+ kernel-module-ide-disk \
${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
task-base-pcmcia24-rrecommends = "\
============================================================
--- packages/tasks/task-slugos.bb c3e0115e26893b61230dbe110580f6cf065e2723
+++ packages/tasks/task-slugos.bb daa2a32b310f6b42b3690c5c008b38d19e080d6f
@@ -103,8 +103,10 @@ kernel-module-netconsole \
kernel-module-netconsole \
"
+DISTRO_EXTRA_DEPENDS ?= ""
DEPENDS += "${DISTRO_EXTRA_DEPENDS}"
+DISTRO_EXTRA_RDEPENDS ?= ""
RDEPENDS += "\
kernel ixp4xx-npe \
base-files base-passwd netbase \
More information about the Openembedded-commits
mailing list