summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/enca/enca_1.9.bb3
-rw-r--r--packages/libgpewidget/libgpewidget-hildon_0.102.bb2
-rw-r--r--packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig96
-rw-r--r--packages/linux/handhelds-pxa-2.6_cvs.bb3
-rw-r--r--packages/meta/slugos-native.bb11
-rw-r--r--packages/tetex/tetex_3.0.bb57
-rw-r--r--packages/tslib/tslib-maemo_0.0.1-15.bb2
7 files changed, 109 insertions, 65 deletions
diff --git a/packages/enca/enca_1.9.bb b/packages/enca/enca_1.9.bb
index 2c0b1a4f86..a335b17eb6 100644
--- a/packages/enca/enca_1.9.bb
+++ b/packages/enca/enca_1.9.bb
@@ -4,6 +4,7 @@ SECTION = "libs"
PRIORITY = "optional"
HOMEPAGE = "http://trific.ath.cx/software/enca/"
MAINTAINER = "John Bloom <johnxx@gmail.com>"
+PR = "r1"
SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
file://configure-hack.patch;patch=1 \
@@ -12,7 +13,7 @@ SRC_URI = "http://trific.ath.cx/Ftp//enca/enca-${PV}.tar.bz2 \
inherit autotools
do_compile() {
- cd ${S}/tools && oe_runmake CC=${BUILD_CC}
+ cd ${S}/tools && oe_runmake CC="${BUILD_CC}"
oe_runmake
}
diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
index 74b99df262..0cce030663 100644
--- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb
+++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
@@ -13,6 +13,8 @@ SRC_URI = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
S = "${WORKDIR}/libgpewidget-${PV}"
+DEFAULT_PREFERENCE = "-1"
+
inherit pkgconfig autotools
EXTRA_OECONF = "--enable-hildon"
diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
index e4f9028150..a8c1a478a6 100644
--- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
+++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
@@ -1,20 +1,18 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-hh0
-# Wed Feb 15 12:18:35 2006
+# Linux kernel version: 2.6.16-hh0
+# Tue Apr 4 21:48:59 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
-CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y
-# CONFIG_CLEAN_COMPILE is not set
-CONFIG_BROKEN=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -30,19 +28,20 @@ CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
CONFIG_IKCONFIG=y
# CONFIG_MINIMAL_OOPS is not set
CONFIG_IKCONFIG_PROC=y
CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
+CONFIG_ELF_CORE=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -53,8 +52,11 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
CONFIG_CC_ALIGN_LABELS=0
CONFIG_CC_ALIGN_LOOPS=0
CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+CONFIG_OBSOLETE_INTERMODULE=y
#
# Loadable module support
@@ -91,7 +93,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_CO285 is not set
# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_CAMELOT is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_IOP3XX is not set
@@ -110,6 +111,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_IMX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
#
# Intel PXA2xx Implementations
@@ -129,10 +131,10 @@ CONFIG_HX4700_NAVPOINT=m
CONFIG_HX4700_CORE=m
CONFIG_HX4700_TS=m
CONFIG_HX4700_BLUETOOTH=m
-CONFIG_HX4700_WLAN=m
CONFIG_HX4700_PCMCIA=m
CONFIG_HX4700_LCD=y
CONFIG_HX4700_LEDS=m
+CONFIG_HX4700_VOLTAGE=m
# CONFIG_MACH_HX2750 is not set
# CONFIG_ARCH_H5400 is not set
# CONFIG_MACH_HIMALAYA is not set
@@ -145,10 +147,10 @@ CONFIG_HX4700_LEDS=m
# CONFIG_MACH_T3XSCALE is not set
# CONFIG_PXA_SHARPSL is not set
CONFIG_PXA27x=y
-CONFIG_PXA_KEYS=y
# CONFIG_SA1100_H3100 is not set
# CONFIG_SA1100_H3600 is not set
# CONFIG_SA1100_H3800 is not set
+CONFIG_GPIO_KEYS=y
#
# Linux As Bootloader
@@ -195,7 +197,6 @@ CONFIG_IPAQ_HANDHELD=y
#
# Bus support
#
-CONFIG_ISA_DMA_API=y
#
# PCCARD (PCMCIA/CardBus) support
@@ -216,6 +217,8 @@ CONFIG_PCMCIA_PXA2XX=m
#
CONFIG_PREEMPT=y
# CONFIG_NO_IDLE_HZ is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
@@ -238,7 +241,20 @@ CONFIG_CMDLINE="keepinitrd"
#
# CPU Frequency scaling
#
-# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_PXA=y
+CONFIG_PXA25x_ALTERNATE_FREQS=y
#
# Floating point emulation
@@ -257,7 +273,6 @@ CONFIG_FPE_NWFPE=y
CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
#
# Power management options
@@ -275,6 +290,7 @@ CONFIG_NET=y
#
# Networking options
#
+# CONFIG_NETDEBUG is not set
CONFIG_PACKET=m
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
@@ -320,6 +336,7 @@ CONFIG_BRIDGE_NETFILTER=y
# Core Netfilter Configuration
#
# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
#
# IP: Netfilter Configuration
@@ -430,6 +447,11 @@ CONFIG_IP6_NF_TARGET_MARK=m
# SCTP Configuration (EXPERIMENTAL)
#
# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
# CONFIG_ATM is not set
CONFIG_BRIDGE=m
# CONFIG_VLAN_8021Q is not set
@@ -497,11 +519,6 @@ CONFIG_IRPORT_SIR=m
#
# FIR device drivers
#
-# CONFIG_NSC_FIR is not set
-# CONFIG_WINBOND_FIR is not set
-# CONFIG_SMC_IRCC_FIR is not set
-# CONFIG_ALI_FIR is not set
-# CONFIG_VIA_FIR is not set
# CONFIG_PXA_FICP is not set
CONFIG_BT=m
CONFIG_BT_L2CAP=m
@@ -602,7 +619,7 @@ CONFIG_MTD_CFI_UTIL=y
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_IPAQ=y
+# CONFIG_MTD_IPAQ is not set
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -699,7 +716,6 @@ CONFIG_IDE_GENERIC=m
#
# IEEE 1394 (FireWire) support
#
-# CONFIG_IEEE1394 is not set
#
# I2O device support
@@ -755,7 +771,6 @@ CONFIG_NET_RADIO=y
#
# Wireless 802.11b ISA/PCI cards support
#
-# CONFIG_AIRO is not set
# CONFIG_HERMES is not set
# CONFIG_ATMEL is not set
@@ -860,6 +875,7 @@ CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_8250=m
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set
#
@@ -964,6 +980,21 @@ CONFIG_SA1100_RTC=y
# CONFIG_TELCLOCK is not set
#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+
+#
+# Dallas's 1-wire bus
+#
+CONFIG_W1=m
+# CONFIG_W1_THERM is not set
+# CONFIG_W1_SMEM is not set
+# CONFIG_W1_DS2433 is not set
+CONFIG_W1_DS2760=m
+
+#
# Hardware Monitoring support
#
CONFIG_HWMON=y
@@ -976,6 +1007,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_ASB100 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_FSCHER is not set
# CONFIG_SENSORS_FSCPOS is not set
# CONFIG_SENSORS_GL518SM is not set
@@ -1039,6 +1071,7 @@ CONFIG_VIDEO_DEV=m
#
# Video Adapters
#
+# CONFIG_VIDEO_ADV_DEBUG is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
@@ -1120,6 +1153,8 @@ CONFIG_SND_PCM=m
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set
@@ -1153,15 +1188,6 @@ CONFIG_SND_AK4641=m
# CONFIG_SOUND_PRIME is not set
#
-# Dallas's 1-wire bus
-#
-CONFIG_W1=m
-# CONFIG_W1_THERM is not set
-# CONFIG_W1_SMEM is not set
-# CONFIG_W1_DS2433 is not set
-CONFIG_W1_DS2760=m
-
-#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
@@ -1205,7 +1231,6 @@ CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=m
# CONFIG_MMC_PXA is not set
-# CONFIG_MMC_WBSD is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
CONFIG_MMC_ASIC3=m
@@ -1224,12 +1249,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
# CONFIG_EXT2_FS_SECURITY is not set
# CONFIG_EXT2_FS_XIP is not set
# CONFIG_EXT3_FS is not set
-# CONFIG_JBD is not set
CONFIG_FS_MBCACHE=m
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
CONFIG_ROMFS_FS=m
CONFIG_INOTIFY=y
@@ -1262,10 +1287,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
CONFIG_TMPFS=y
-# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
# CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
#
# Miscellaneous filesystems
@@ -1326,6 +1351,7 @@ CONFIG_MSDOS_PARTITION=y
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
#
@@ -1381,13 +1407,14 @@ CONFIG_NLS_UTF8=m
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
-CONFIG_DEBUG_KERNEL=y
# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_DEBUG_KERNEL=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_PREEMPT is not set
+CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
@@ -1396,6 +1423,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_VM is not set
CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_WAITQ is not set
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index 915efa2439..fec375dd59 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -4,7 +4,6 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
LICENSE = "GPL"
PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
#
-KERNEL_CCSUFFIX = "-3.4.4"
COMPATIBLE_HOST = "arm.*-linux"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
@@ -21,7 +20,7 @@ ALLOW_EMPTY_ipaq_pxa270 = 1
K_MAJOR = "2"
K_MINOR = "6"
-K_MICRO = "15"
+K_MICRO = "16"
HHV = "0"
#
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index e23bfd1d8f..6a19601834 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -25,16 +25,13 @@ SLUGOS_NATIVE_RT = "\
binutils-dev binutils-symlinks \
cpp cpp-symlinks \
g++ g++-symlinks \
- gcc-symlinks \
- libg2c-dev \
- libgdbm3 \
- libperl5 \
- libreadline4 libreadline-dev \
+ gcc gcc-symlinks \
+ gdbm \
libstdc++-dev \
- libthread-db1 \
ncurses-dev ncurses-terminfo \
- perl-modules \
+ perl perl-modules \
python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
+ readline \
"
# Run-time and DEPENDS
diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb
index 5f9fa62f79..69bba37957 100644
--- a/packages/tetex/tetex_3.0.bb
+++ b/packages/tetex/tetex_3.0.bb
@@ -1,9 +1,10 @@
-DESCRIPTION = "teTeX is a complete TeX distribution for UNIX compatible systems"
+DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems"
+HOMEPAGE = "http://www.tug.org/tetex"
LICENSE = "GPL"
SECTION = "console/utils"
DEPENDS = "tetex-native flex gd ncurses libpng t1lib libx11 libxau libxext libxt zlib"
-TETEX_BUILDSYSTEM_TAMER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r2"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r4"
SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
file://configure.patch;patch=1"
@@ -12,36 +13,50 @@ S = ${WORKDIR}/tetex-src-${PV}
inherit autotools
PARALLEL_MAKE = ""
-
+
export BUILDCC = "${BUILD_CC}"
export BUILDCFLAGS = "${BUILD_CFLAGS}"
export BUILDLDFLAGS = "${BUILD_LDFLAGS}"
export BUILDCCLD = "${BUILD_CC}"
-
+
EXTRA_OECONF = "--with-system-libgd \
- --with-system-ncurses \
- --with-ncurses-include=${STAGING_INCDIR} \
- --with-system-pnglib \
- --with-system-t1lib \
- --with-system-zlib \
- --without-dialog \
- --without-xdvik"
+ --with-system-ncurses \
+ --with-ncurses-include=${STAGING_INCDIR} \
+ --with-system-pnglib \
+ --with-system-t1lib \
+ --with-system-zlib \
+ --without-dialog \
+ --without-xdvik \
+ --without-x11 \
+ --without-mf-x-toolkit"
# NOTE: In theory, teTeX has a good buildsystem, which automatically detects
# whether we are cross-compiling and compiles the necessary host tools.
-# Unfortunately it doesn't work in our case and it looks easier to add
-# tetex-native for the time being. Cheers, Mickey.
-do_configure () {
- oe_runconf
- ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/info
- ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/makeinfo
- cat >${S}/utils/texinfo/tools/Makefile <<EOF
+# Unfortunately it doesn't work in our case and we better just add
+# tetex-native for the time being.
+# It would be good to autoreconf all the stuff, but the upstream configure.in
+# is faulty and outdated :/
+do_configure() {
+ rm -f texk/libtool.m4
+ libtoolize --force
+ gnu-configize
+ oe_runconf ${EXTRA_OECONF}
+ find . -name libtool|xargs rm -f
+ rm -rf ${S}/utils/texinfo/tools/info
+ rm -rf ${S}/utils/texinfo/tools/makeinfo
+ ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/info
+ ln -sf ${STAGING_BINDIR} ${S}/utils/texinfo/tools/makeinfo
+ cat >${S}/utils/texinfo/tools/Makefile <<EOF
install:
- echo "done"
+ echo "mickey _is_ cool - he tamed the tetex buildsystem"
all:
- echo "done"
+ echo "mickeys suck - he adds easter eggs in output that no one will ever read..."
EOF
}
+# NOTE: Make sure it is using _our_ libtool and nothing else :/
+do_compile() {
+ LIBTOOL="${STAGING_BINDIR}/${HOST_SYS}/libtool" oe_runmake MAKE="${MAKE} LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"
+}
# NOTE: This is really ugly. Unfortunately the teTeX people seem not to know about PREFIX...
do_install() {
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index 40a49fd7bc..483181a4f9 100644
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -4,6 +4,8 @@ DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
PR = "r1"
PROVIDES = "tslib"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"