[oe-commits] org.oe.dev merge of '2700039073a3760641797b52ac5897f2eee3d92a'
mickeyl commit
oe at amethyst.openembedded.net
Sun Jul 27 10:42:23 UTC 2008
merge of '2700039073a3760641797b52ac5897f2eee3d92a'
and 'ddb3262e0fe9acfe7d20567e33ef27bcfe0d0801'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0f42cd616108360d027b0381a276d5b1a3cf26fa
ViewMTN: http://monotone.openembedded.org/revision/info/0f42cd616108360d027b0381a276d5b1a3cf26fa
Files:
1
packages/dnsmasq/dnsmasq_2.38.bb
packages/dnsmasq/dnsmasq_2.45.bb
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-bootstrap-native_3.4.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/ecj-initial_3.4.bb
packages/openmoko-projects/illume
packages/util-linux-ng/util-linux-ng-2.14
packages/xorg-font/font-misc-misc
packages/ecj/ecj-bootstrap-native_3.3.2.bb
packages/ecj/ecj-initial_3.3.2.bb
packages/openchrome/openchrome.inc
packages/openchrome/xf86-video-openchrome_0.2.902.bb
packages/openmoko-projects/illume/configure-keyboard.patch
packages/snes9x/64bit.patch
packages/util-linux-ng/util-linux-ng-2.14/util-linux-ng-uclibc-versionsort.patch
packages/xorg-font/font-misc-misc/configure-mapdir.patch
packages/xorg-font/font-misc-misc_1.0.0.bb
classes/icecc.bbclass
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/alsa/alsa-versym.inc
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-native.inc
packages/efl1/ecore_cvs.bb
packages/eglibc/eglibc.inc
packages/eglibc/eglibc_svn.bb
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/gcc/gcc-cross-kernel.inc
packages/glibc/glibc.inc
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/glibc/glibc_cvs.bb
packages/initrdscripts/initramfs-kexec_1.0.bb
packages/kexec/files/kexec-klibc.patch
packages/kexec/kexec-tools-static_1.101.bb
packages/openchrome/openchrome_svn.bb
packages/openmoko-projects/illume_svn.bb
packages/snes9x/snes9x_1.43-WIP1.bb
packages/util-linux-ng/util-linux-ng_2.14.bb
packages/xorg-lib/libx11-native_1.0.1.bb
conf/distro/include/angstrom-2007-for-openmoko.inc
conf/distro/openmoko.conf
packages/images/fso-image.bb
Diffs:
#
# mt diff -r2700039073a3760641797b52ac5897f2eee3d92a -r0f42cd616108360d027b0381a276d5b1a3cf26fa
#
#
#
# rename "packages/dnsmasq/dnsmasq_2.38.bb"
# to "packages/dnsmasq/dnsmasq_2.45.bb"
#
# rename "packages/ecj/ecj-bootstrap-native_3.3.bb"
# to "packages/ecj/ecj-bootstrap-native_3.4.bb"
#
# rename "packages/ecj/ecj-initial_3.3.bb"
# to "packages/ecj/ecj-initial_3.4.bb"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_dir "packages/util-linux-ng/util-linux-ng-2.14"
#
# add_dir "packages/xorg-font/font-misc-misc"
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.2.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-initial_3.3.2.bb"
# content [b62ca6b6be5ba0eb2884b571d54eec89895f48a5]
#
# add_file "packages/ecj/ecj-initial_3.3.bb"
# content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
#
# add_file "packages/openchrome/openchrome.inc"
# content [6b05f1276b7c3b8ed66ecb3b304ef3578d60373f]
#
# add_file "packages/openchrome/xf86-video-openchrome_0.2.902.bb"
# content [af8e84ea948021194f8c0a6a0b2648d7dfde2bac]
#
# add_file "packages/openmoko-projects/illume/configure-keyboard.patch"
# content [7d8bf7ac9d5970f6624d67804676e55a5f781bd0]
#
# add_file "packages/snes9x/64bit.patch"
# content [892094c30481d08f67b597846d74b773713ee387]
#
# add_file "packages/util-linux-ng/util-linux-ng-2.14/util-linux-ng-uclibc-versionsort.patch"
# content [54e479ad338ff587544d556bfa464d1faadaa87c]
#
# add_file "packages/xorg-font/font-misc-misc/configure-mapdir.patch"
# content [b0b2748dc694aa702123cdda29e0fc58955d3509]
#
# add_file "packages/xorg-font/font-misc-misc_1.0.0.bb"
# content [b48bf951fff089de82beb7849571026e5551d5eb]
#
# patch "classes/icecc.bbclass"
# from [9c947e1b89f7e9f05b8448240eee79d396cce6b0]
# to [a138cd782d31fb7b6a7dab8c89a1cd1bdbc901ae]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a]
# to [37caae48109ecf51cac36b99d1c159bf899e43a0]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2fd13fc744e766175938eb267aa49d99d9f5c39e]
# to [1f2ab31eceb6206825c9568b313ab48c224c8863]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [f978a9c4326f1feb4b7e6b23a94f6b9ce18b90d1]
# to [dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e]
#
# patch "packages/alsa/alsa-versym.inc"
# from [957d390b9f2272ea29b2cb24f7e33f8ca8843d15]
# to [ee3bac83a82fa536deab3a9b0d3b47dfacfab388]
#
# patch "packages/classpath/classpath-initial_0.93.bb"
# from [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
# to [e8d4723f96ff6828015eafcabc845d6122cf304f]
#
# patch "packages/classpath/classpath-native.inc"
# from [ce05671105e08fb6217f1907cf4202d41ebfd512]
# to [f1053899930127b54417bca6f25818bdf90a200e]
#
# patch "packages/ecj/ecj-initial_3.4.bb"
# from [b410a403c3f29b5239ebde0751e23e02f0d3409a]
# to [e4737a57975f1f5295f3ba5362f3903d1e4b715b]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
# to [2585aee85a18623ca3ef7c268f21be835fffc097]
#
# patch "packages/eglibc/eglibc.inc"
# from [eef22ba34145bef9522d66a4eb30da587ba3e6a2]
# to [08b9b1f3b71d0ea992ad8a5b349c51348b11f917]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [40ee7830b471a23f6a2b24acfbde31a644e4883e]
# to [17bc96153f4c89522834fb62626b509064db5c9f]
#
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
# from [d15cc6aacfe8b486cda2afc1db23d838625b6e22]
# to [089be2aa36c43d51f94e09db1e42a7291c6b8c1d]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [d7bc43957414c34d3f5aac03b45f32b0b23d6d86]
# to [7db81e96548c8bd3dbcb37e96e83695ccaf7a9bc]
#
# patch "packages/gcc/gcc-cross-kernel.inc"
# from [20867aba06eab9b6f8398e481391ea9109b3b80e]
# to [3c5f4ada32dfb18f511b21b25bee2d337693cce0]
#
# patch "packages/glibc/glibc.inc"
# from [d7da3e08d193524257645bad4468dbb3dd7ed044]
# to [927e40aea451df01896552dc6d4aeafb51256604]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [3a9fabb2ed822172d6bc645d6117c110ff2da56b]
# to [ba51bec78b675855eb7116970581ad0dfdcdb96d]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [a05368cc1ea6f02c543106ad20542cf04f7b0bcc]
# to [a32da8f1be170e6519b62b6293fb148aeb82115a]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [314aacd6675d23786bc88655667f770055366126]
# to [4f6b05a32c535fce34cdba7e735283f3df97cc25]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [89ee3fd283a562c5561a6de606db66d12795072c]
# to [df07870e2108f0e1f8052678a72335e56f8fd9aa]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [5b9b2e484e2768849ae6344a1446e6cf3d0c9311]
# to [a952adc9414b47b8206832f0d75d585c3e43fbe2]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [080eea190e1890106f1667575d0e273f205d8321]
# to [ba380ebe857f50552686909fcd13bbcef6f79539]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [0a9634d3e67065acc7ae313f476d83d88e477c1b]
# to [8e9b799b018652d09ef1fc4f2b4b6be852cf6d27]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [e92036999b4b227a5394127826f7bedca0f170c0]
# to [08d38bef97b465bdbbd9988c3d75ff83cf44f0f2]
#
# patch "packages/glibc/glibc_2.3.6.bb"
# from [9dd9250e2535fbb9f9eff537aed1ddea9f930ef4]
# to [fab77d02c64d34ef4ef3c628ae712ad0135f0e51]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [e6ab6d37f23b9a634967d847fe03def83de0e5c1]
# to [f68ade6f61a11d4095c2ba68793e93ff94386717]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [f25ba05b746d335564c48624c6f003b00af568e8]
# to [f6b52e6b6d1513de5433a1a2c19635a6be187917]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [f81d1ef81d05c21e61baeb73ea4681826ea29ec6]
# to [99f15a0f7f70175af2348206ce4d9af3cbd90e4c]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [2e3b0b9403b1cac53b2bfd4c8849a047ab228782]
# to [1af6eb49cf20c7ff14c284e68d6b956d049ca292]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [74e6e4b399c916d539839e83abc452a48fb44845]
# to [0b88b80c48ad29d479a89c81290ce09e7a009b13]
#
# patch "packages/initrdscripts/initramfs-kexec_1.0.bb"
# from [887f543ee47d7063adbb65d1337be522ec8c3fd7]
# to [19eebe40da32b895da48037b3aadec5cdda88979]
#
# patch "packages/kexec/files/kexec-klibc.patch"
# from [0c778df2238eb4e8880f42f1cbad2044a8dadd87]
# to [c40f0d603ea5a1cbe3bd3cd0d383db0415b7e9ee]
#
# patch "packages/kexec/kexec-tools-static_1.101.bb"
# from [631b2a5ebad7343ec05c584ae17b033dec44c0f7]
# to [bfde2acd1dce8182c6df19630026d692fb77fb5d]
#
# patch "packages/openchrome/openchrome_svn.bb"
# from [7eebdeee0fc8144c09e311f8487f162295b0dd20]
# to [09a235effbb87c3702c8b93749812c0d5f51ab2f]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [39270f48f788723273ee3a1246361321db6608d4]
# to [7ee2770bdff03d604f1482288b0b7c00f05481ce]
#
# patch "packages/snes9x/snes9x_1.43-WIP1.bb"
# from [af3bab5a92cdc8d31e61a1bd22b151b3d6760256]
# to [ff6c690e4975f1e3e41aaeea8034f1fbce1e5c5b]
#
# patch "packages/util-linux-ng/util-linux-ng_2.14.bb"
# from [5661ee890f7e557f934a1d336b7ab7ee3f8a410e]
# to [47c0e31e56605d3874318e61419d054a55efd35c]
#
# patch "packages/xorg-lib/libx11-native_1.0.1.bb"
# from [7c117d26c8901c44e5cebd665e12dfc191784a6d]
# to [7f8ffc178891c54f10966ce194ca30c7439f2019]
#
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
+++ packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/openchrome/openchrome.inc 6b05f1276b7c3b8ed66ecb3b304ef3578d60373f
+++ packages/openchrome/openchrome.inc 6b05f1276b7c3b8ed66ecb3b304ef3578d60373f
@@ -0,0 +1,17 @@
+PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
+PACKAGES_DYNAMIC = "xorg-driver-via"
+
+FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
+FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
+FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
+FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
+FILES_libviaXvMC-dbg += "${libdir}/.debug/libviaXvMC.so.*"
+FILES_libviaXvMCPro-dbg += "${libdir}/.debug/libviaXvMCPro.so.*"
+
+DEPENDS = "xserver-xorg libxvmc"
+
+inherit autotools xorg-module
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/openchrome/xf86-video-openchrome_0.2.902.bb af8e84ea948021194f8c0a6a0b2648d7dfde2bac
+++ packages/openchrome/xf86-video-openchrome_0.2.902.bb af8e84ea948021194f8c0a6a0b2648d7dfde2bac
@@ -0,0 +1,3 @@
+SRC_URI = "http://www.openchrome.org/releases/xf86-video-openchrome-${PV}.tar.gz file://configure.patch;patch=1 file://configure-dri.patch;patch=1"
+
+incl%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rddb3262e0fe9acfe7d20567e33ef27bcfe0d0801 -r0f42cd616108360d027b0381a276d5b1a3cf26fa
#
#
#
# patch "conf/distro/include/angstrom-2007-for-openmoko.inc"
# from [85b9d88526b7e40205f13f547c01c721f42fa32f]
# to [628f04b4b86a64fdc89bf6da6312cb3ddd89b323]
#
# patch "conf/distro/openmoko.conf"
# from [56485e49938379e78da05fc595ef5d2edef9dd28]
# to [ee68bedb7c293916d63371c4a1679786be088e72]
#
# patch "packages/images/fso-image.bb"
# from [8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2]
# to [5c8597f6d160a644126f564543e5c4e542223e4b]
#
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko.inc 85b9d88526b7e40205f13f547c01c721f42fa32f
+++ conf/distro/include/angstrom-2007-for-openmoko.inc 628f04b4b86a64fdc89bf6da6312cb3ddd89b323
@@ -6,11 +6,6 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-# If you want to use the angstrom 2007.12 release or if
-# you want to base you distro on angstrom 2007, switch to
-# the org.openembedded.angstrom-2007.12-stable branch
-# THIS FILE WILL GO AWAY IN JANUARY 2008!!
-
DISTRO_VERSION = "2007.11RC3"
DISTRO_REVISION = "51"
@@ -33,31 +28,13 @@ IMAGE_LINGUAS = '${@base_less_or_equal("
# Also, it appears that no locales fit in 16Mb for now. "C" locale rules!
IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}'
-# These will be put under package management soon
-#FEED_URIS += " \
-# no-arch##${ANGSTROM_URI}/unstable/feed/all \
-# base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \
-# perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \
-# python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \
-# debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \
-# gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \
-# ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}"
-# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/base \
-# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \
-# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates"
-
-
# set feed path variables
FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/"
#The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
-CVS_TARBALL_STASH ?= "\
- http://www.angstrom-distribution.org/unstable/sources/ \
- http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
- "
+CVS_TARBALL_STASH ?= "http://www.angstrom-distribution.org/unstable/sources/"
-
#Make sure we use 2.6 on machines with a 2.4/2.6 selector
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
============================================================
--- conf/distro/openmoko.conf 56485e49938379e78da05fc595ef5d2edef9dd28
+++ conf/distro/openmoko.conf ee68bedb7c293916d63371c4a1679786be088e72
@@ -10,19 +10,19 @@ require conf/distro/include/angstrom-200
#
# Header
#
-DISTRO_NAME = "Openmoko"
-DISTRO_VERSION = "P1-Snapshot-${DATE}"
+DISTRO_NAME = "openmoko"
+DISTRO_VERSION = "-${DATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
DISTRO = "openmoko"
OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/"
+CVS_TARBALL_STASH += "http://downloads.openmoko.org/sources/"
PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/"
-ANGSTROM_FEED_CONFIGS = "openmoko-feed-configs"
+ANGSTROM_FEED_CONFIGS ?= "openmoko-feed-configs"
# 2.18 seems to break badly on 64-bit systems
PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
@@ -31,12 +31,13 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
# we want the openmoko svn version of gsmd
PREFERRED_PROVIDER_libgsmd = "libgsmd"
-# Bleeding-edge developers should add the following line to their local.conf:
+# Bleeding-edge developers should add the following lines to their local.conf:
# require conf/distro/include/moko-autorev.inc
+# require conf/distro/include/fso-autorev.inc
# override the PACKAGE_ARCH of certain packages for openmoko distro
#
-# Same kernel runs on both these machines
+# Same kernel used to run on both these machines...
# Currently not used but left here in case someone wants to switch on
# quickly
#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}"
============================================================
--- packages/images/fso-image.bb 8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2
+++ packages/images/fso-image.bb 5c8597f6d160a644126f564543e5c4e542223e4b
@@ -40,6 +40,7 @@ TOOLS_INSTALL = "\
# useful command line tools
TOOLS_INSTALL = "\
# bash \
+ dosfstools \
htop \
iptables \
lsof \
More information about the Openembedded-commits
mailing list