summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcontrib/angstrom/build-feeds.sh5
-rw-r--r--packages/images/fso-image.bb5
-rw-r--r--packages/linux/linux-omap/omap3evm/defconfig25
-rw-r--r--packages/linux/linux-omap_git.bb5
-rw-r--r--packages/pulseaudio/pulseaudio-meta_0.9.10.bb22
-rw-r--r--packages/vlc/vlc_0.9.2.bb8
6 files changed, 49 insertions, 21 deletions
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 8d5a75fcdf..bf640d872e 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -44,13 +44,13 @@ do
BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
gdb gdbserver strace \
usbutils pciutils mtd-utils usbview hal setserial \
- task-proper-tools mc screen findutils fakeroot \
+ task-proper-tools mc screen findutils fakeroot gzip \
mono jamvm perl python ruby \
gtk+ qt-x11-free qt4-x11-free \
gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany fennec minimo openmoko-browser2 \
samba meta-nas-server \
apache2 boa cherokee lighttpd thttpd \
- gpe-sketchbook gpe-gallery gpe-scap notecase task-gpe-pim \
+ gpe-sketchbook gpe-gallery gpe-scap notecase leafpad task-gpe-pim \
pidgin irssi \
roadmap-gtk2 gpsdrive navit viking \
ffmpeg xmms totem mplayer quasar vlc-gpe gnome-mplayer \
@@ -65,6 +65,7 @@ do
asterisk \
gnuradio gnuplot mpfr gmp fftw fftwf fftwl \
gphoto2 gqview imagemagick ufraw \
+ rdesktop x11vnc tightvnc \
tzdata \
xserver-kdrive xserver-xorg \
xf86-video-fbdev xf86-video-ati xf86-video-vesa \
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index d65a01500d..d0ae4039d3 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -46,6 +46,11 @@ X_INSTALL = "\
\
"
+X_INSTALL_append_om-gta02 = "\
+ ttf-arphic-uming \
+ \
+"
+
# useful command line tools
TOOLS_INSTALL = "\
# bash \
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index 89de12e765..6020d22368 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27-rc6-omap1
-# Sat Sep 20 13:46:37 2008
+# Linux kernel version: 2.6.27-rc7-omap1
+# Mon Sep 29 14:38:02 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -34,6 +34,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
@@ -82,9 +83,8 @@ CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
# CONFIG_MARKERS is not set
@@ -268,7 +268,7 @@ CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
CONFIG_HZ=128
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
@@ -478,6 +478,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y
CONFIG_MAC80211_RC_DEFAULT="pid"
# CONFIG_MAC80211_MESH is not set
CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
CONFIG_IEEE80211=y
# CONFIG_IEEE80211_DEBUG is not set
@@ -1573,6 +1574,7 @@ CONFIG_USB_SISUSBVGA_CON=y
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
@@ -1718,6 +1720,7 @@ CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_XATTR is not set
# CONFIG_EXT4DEV_FS is not set
CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
@@ -1901,7 +1904,7 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
@@ -1912,8 +1915,8 @@ CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_PREEMPT=y
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -1940,10 +1943,14 @@ CONFIG_FRAME_POINTER=y
CONFIG_LATENCYTOP=y
CONFIG_HAVE_FTRACE=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACING=y
# CONFIG_FTRACE is not set
# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_PREEMPT_TRACER=y
# CONFIG_SCHED_TRACER is not set
# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index ec9e2c0f9c..d9e6c53bf4 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
-SRCREV = "9d1dff8638c9e96a401e1885f9948662e9ff9636"
+SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}"
-PR = "r7"
+PR = "r8"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -41,7 +41,6 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
"
SRC_URI_append_omap3evm = " \
- file://OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch;patch=1 \
"
S = "${WORKDIR}/git"
diff --git a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
index b11963b869..1c53ee0b91 100644
--- a/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio-meta_0.9.10.bb
@@ -18,7 +18,7 @@ RDEPENDS = "\
libasound-module-ctl-pulse \
libasound-module-pcm-pulse \
"
-PR = "r2"
+PR = "r3"
inherit update-rc.d
@@ -37,8 +37,8 @@ do_install() {
install -d ${D}/${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
install -d ${D}/${sysconfdir}/pulse
- install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
- install -m 0644 ${WORKDIR}/asound.conf ${D}/${sysconfdir}
+ install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session.pulseaudio-meta
+ install -m 0644 ${WORKDIR}/asound.conf ${D}/${sysconfdir}/asound.conf.pulseaudio-meta
if [ "x${TARGET_PFPU}" == "xsoft" ] ; then
sed -i -e s:resample-method=sinc-fastest:resample-method=trivial: ${D}${sysconfdir}/init.d/pulseaudio
@@ -47,8 +47,20 @@ do_install() {
PACKAGE_ARCH = "${MACHINE_ARCH}"
+pkg_postinst_${PN} () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+# Overwrite existing configfiles, yuck!
+cp /etc/pulse/session.pulseaudio-meta /etc/pulse/session
+cp /etc/asound.conf.pulseaudio-meta /etc/asound.conf
+}
+
+
CONFFILES_${PN} = "\
${sysconfdir}/init.d/pulseaudio \
- ${sysconfdir}/pulse/session \
- ${sysconfdir}/asound.conf \
+ ${sysconfdir}/pulse/session.pulseaudio-meta \
+ ${sysconfdir}/asound.conf.pulseaudio-meta \
"
diff --git a/packages/vlc/vlc_0.9.2.bb b/packages/vlc/vlc_0.9.2.bb
index af42a7c957..f50c5dd304 100644
--- a/packages/vlc/vlc_0.9.2.bb
+++ b/packages/vlc/vlc_0.9.2.bb
@@ -4,8 +4,9 @@ LICENSE = "GPL"
PRIORITY = "optional"
SECTION = "multimedia"
-DEPENDS = "libtool gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+PR = "r1"
+DEPENDS = "libtool hal gettext libgcrypt schroedinger libsdl-x11 qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
SRC_URI = "http://videolan.mirror.technotop.nl/vlc/0.9.2/vlc-${PV}.tar.bz2"
@@ -18,15 +19,18 @@ EXTRA_OECONF = "\
--disable-wxwidgets \
--enable-x11 --enable-xvideo \
--disable-screen --disable-caca \
- --disable-httpd --disable-vlm \
+ --enable-httpd --enable-vlm \
--enable-freetype \
--enable-sdl \
--enable-png \
--enable-live555 --enable-tremor \
--enable-v4l2 --disable-aa --enable-wma --disable-faad \
--enable-dbus \
+ --enable-hal \
--without-contrib \
ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
+ ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
+ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 00:35:54 +0000