[oe-commits] org.oe.dev merge of '4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d'
oe commit
openembedded-commits at lists.openembedded.org
Sat Oct 13 17:19:28 UTC 2007
merge of '4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d'
and 'ba74774ae8f7988d8fb8f6cfed387fe5b46af7c0'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 873da0372ff3245a206abda6731109ceff7fda5a
ViewMTN: http://monotone.openembedded.org/revision/info/873da0372ff3245a206abda6731109ceff7fda5a
Files:
1
packages/gstreamer/gst-plugins.inc
packages/nonworking/gutenprint/gutenprint_5.0.0.bb
packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9
packages/linux/linux-openmoko-devel/defconfig-2.6.23.1
packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/nonworking/gutenprint
packages/gutenprint
packages/avahi/avahi-ui_0.6.21.bb
packages/avahi/mango-lassi_git.bb
packages/gutenprint/gutenprint-native_5.1.3.bb
packages/gutenprint/gutenprint.inc
conf/checksums.ini
Diffs:
#
# mt diff -r4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d -r873da0372ff3245a206abda6731109ceff7fda5a
#
#
#
# patch "packages/gstreamer/gst-plugins.inc"
# from [c4fc96bca8f28d3eeeb2b2ace025cad29991bf63]
# to [c5d1a211e42f0945f1aa564833b94e0de2ed64ca]
#
============================================================
--- packages/gstreamer/gst-plugins.inc c4fc96bca8f28d3eeeb2b2ace025cad29991bf63
+++ packages/gstreamer/gst-plugins.inc c5d1a211e42f0945f1aa564833b94e0de2ed64ca
@@ -6,7 +6,7 @@ SRC_URI = "http://gstreamer.freedesktop.
SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
-EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl -disable-cdaudio --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} "
+EXTRA_OECONF = "--disable-aalib --disable-shout2 --disable-sdl --disable-cdaudio --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} "
acpaths = "-I ${S}/common/m4 -I ${S}/m4"
#
# mt diff -rba74774ae8f7988d8fb8f6cfed387fe5b46af7c0 -r873da0372ff3245a206abda6731109ceff7fda5a
#
#
#
# delete "packages/nonworking/gutenprint/gutenprint_5.0.0.bb"
#
# rename "packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9"
# to "packages/linux/linux-openmoko-devel/defconfig-2.6.23.1"
#
# rename "packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb"
# to "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
#
# rename "packages/nonworking/gutenprint"
# to "packages/gutenprint"
#
# add_file "packages/avahi/avahi-ui_0.6.21.bb"
# content [cc3527f807c63548870af63770d65b1f11b377be]
#
# add_file "packages/avahi/mango-lassi_git.bb"
# content [3a59c1e0e88776b7c84accb2784335ec0f085416]
#
# add_file "packages/gutenprint/gutenprint-native_5.1.3.bb"
# content [6f15b17606a7a96c3e4351eaab10140f8a9be587]
#
# add_file "packages/gutenprint/gutenprint.inc"
# content [b0b3b6c786e5d050f04343707b583440d20b8b0b]
#
# patch "conf/checksums.ini"
# from [dc3823b4ab32da813380365a763fa30187f934f8]
# to [0fa8e770b533da8a6bdb8b2aeba375325d6c5c83]
#
# patch "packages/linux/linux-openmoko-devel/defconfig-2.6.23.1"
# from [2deb299a86ffff85deec61aa5209451d8d0ce92a]
# to [59b43b893219e26c7022a3fcd277dbd11340e740]
#
# patch "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
# from [f6cbf2d77d77b3aff58554ab202e92e402972e55]
# to [607297ec1d58873d740b775fbb27d95fc82206d3]
#
============================================================
--- packages/avahi/avahi-ui_0.6.21.bb cc3527f807c63548870af63770d65b1f11b377be
+++ packages/avahi/avahi-ui_0.6.21.bb cc3527f807c63548870af63770d65b1f11b377be
@@ -0,0 +1,20 @@
+require avahi.inc
+PR = "r0"
+
+DEPENDS += "avahi gtk+"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
+AVAHI_GTK = "--enable-gtk"
+
+S = "${WORKDIR}/avahi-${PV}"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/avahi-ui
+ cp ${S}/avahi-ui/*.h ${STAGING_INCDIR}/avahi-ui/
+ oe_libinstall -C avahi-ui -a -so libavahi-ui ${STAGING_LIBDIR}
+}
+
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
+FILES_${PN}-dbg = "${libdir}/.debug/libavah-ui*"
============================================================
--- packages/avahi/mango-lassi_git.bb 3a59c1e0e88776b7c84accb2784335ec0f085416
+++ packages/avahi/mango-lassi_git.bb 3a59c1e0e88776b7c84accb2784335ec0f085416
@@ -0,0 +1,18 @@
+DESCRIPTION = "Input sharing, the avahi way"
+DEPENDS = "avahi-ui libglade libnotify"
+
+PV = "0.0+git${SRCDATE}"
+
+SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http"
+
+
+S = "${WORKDIR}/${PN}"
+
+do_compile_prepend() {
+ export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`"
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 mango-lassi ${D}${bindir}
+}
============================================================
--- packages/gutenprint/gutenprint-native_5.1.3.bb 6f15b17606a7a96c3e4351eaab10140f8a9be587
+++ packages/gutenprint/gutenprint-native_5.1.3.bb 6f15b17606a7a96c3e4351eaab10140f8a9be587
@@ -0,0 +1,39 @@
+SECTION = "libs"
+require gutenprint_${PV}.bb
+DEPENDS = ""
+inherit native
+
+EXTRA_OECONF = "\
+ --disable-nls \
+ --disable-gtktest \
+ --enable-cups-ppds \
+ --disable-libgutenprintui \
+ --disable-libgutenprintui2 \
+ --disable-translated-cups-ppds \
+ --with-ghostscript \
+ --enable-cups-level3-ppds \
+ --disable-gimptest \
+ --enable-test \
+ --enable-epson \
+ --with-user-guide \
+ --with-samples \
+ --with-escputil \
+ "
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+
+
+
+do_stage() {
+ autotools_stage_includes
+ install -m 0755 -d ${STAGING_DATADIR}/cups/model
+ install -m 0644 src/cups/ppd/C/*ppd* ${STAGING_DATADIR}/cups/model/
+# oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+
============================================================
--- packages/gutenprint/gutenprint.inc b0b3b6c786e5d050f04343707b583440d20b8b0b
+++ packages/gutenprint/gutenprint.inc b0b3b6c786e5d050f04343707b583440d20b8b0b
@@ -0,0 +1,28 @@
+DESCRIPTION = "Gutenprint printer drivers"
+HOMEPAGE = "http://gimp-print.sourceforge.net/"
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0 cups tiff jpeg libpng gutenprint-native espgs"
+
+
+inherit autotools pkgconfig
+PARALLEL_MAKE=""
+
+#EXTRA_OECONF = "\
+# --disable-nls \
+# --disable-gtktest \
+# --enable-cups-ppds \
+# --disable-libgutenprintui \
+# --disable-libgutenprintui2 \
+# --disable-translated-cups-ppds \
+# --with-ghostscript \
+# --enable-cups-level3-ppds \
+# --disable-gimptest \
+# --enable-test \
+# --enable-epson \
+# --with-user-guide \
+# --with-samples \
+# --with-escputil \
+# "
+
+
============================================================
--- conf/checksums.ini dc3823b4ab32da813380365a763fa30187f934f8
+++ conf/checksums.ini 0fa8e770b533da8a6bdb8b2aeba375325d6c5c83
@@ -6162,6 +6162,18 @@ sha256=2c14ada1ac7d272e03b430d3a530d60fc
md5=34b0f354819217e6a345f48ebbd8f13e
sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
+md5=2e230d005c002fb3d38a3ca07c0200d0
+sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
+
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2]
+md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
+sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
+
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2]
+md5=518d57e08fdacd88907166a3bfe383b7
+sha256=35bcba56edf2a24f5d38bac0e530b2ce0e06eb094ba083b4a679c903077a671c
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
md5=e921200f074ca97184e150ef5a4af825
sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
============================================================
--- packages/linux/linux-openmoko-devel/defconfig-2.6.23-rc9 2deb299a86ffff85deec61aa5209451d8d0ce92a
+++ packages/linux/linux-openmoko-devel/defconfig-2.6.23.1 59b43b893219e26c7022a3fcd277dbd11340e740
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.23-rc9
-# Sun Oct 7 15:39:12 2007
+# Tue Oct 9 15:27:11 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -199,6 +199,7 @@ CONFIG_MACH_NEO1973_GTA02=y
CONFIG_SMDK2440_CPU2440=y
CONFIG_MACH_HXD8=y
CONFIG_MACH_NEO1973_GTA02=y
+CONFIG_CPU_S3C2442=y
#
# S3C2442 Machines
@@ -1735,8 +1736,8 @@ CONFIG_DEBUG_LL=y
CONFIG_DEBUG_ERRORS=y
CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
-# CONFIG_DEBUG_S3C_PORT is not set
-CONFIG_DEBUG_S3C_UART=0
+CONFIG_DEBUG_S3C_PORT=y
+CONFIG_DEBUG_S3C_UART=2
#
# Security options
============================================================
--- packages/linux/linux-openmoko-devel_svn+2.6.23-rc9.bb f6cbf2d77d77b3aff58554ab202e92e402972e55
+++ packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb 607297ec1d58873d740b775fbb27d95fc82206d3
@@ -1,11 +1,14 @@ DESCRIPTION = "Linux 2.6.x (development)
require linux.inc
DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
-VANILLA_VERSION = "2.6.22"
-KERNEL_VERSION = "2.6.23-rc9"
-KERNEL_RELEASE = "2.6.23-rc9"
-PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r3"
+VANILLA_VERSION = "2.6.23.1"
+#KERNEL_VERSION = "2.6.23-rc9"
+#KERNEL_RELEASE = "2.6.23-rc9"
+#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
+KERNEL_VERSION = "${VANILLA_VERSION}"
+KERNEL_RELEASE = "${VANILLA_VERSION}"
+PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+PR = "r1"
KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT = "30008000"
@@ -14,15 +17,16 @@ SRCREV_FORMAT = "patches"
# source and patches
#
SRCREV_FORMAT = "patches"
-SRCREV = "3101"
+SRCREV = "3140"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
- ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \
+# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \
svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \
file://squashfs-2.6.23.patch;patch=1 \
file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \
-# file://printascii.patch;patch=1 \
- file://defconfig-2.6.23-rc9 \
+# file://printascii-2.6.23.patch;patch=1 \
+ file://hack-gta02-cpu.patch;patch=1 \
+ file://defconfig-2.6.23.1 \
file://logo_linux_clut224.ppm"
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
@@ -51,7 +55,7 @@ do_prepatch() {
module_autoload_s3cmci = "s3cmci"
do_prepatch() {
- cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION}
+# cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION}
mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
mv patches patches.openmoko
mv .pc .pc.old
More information about the Openembedded-commits
mailing list