From 6ccc0b7bd8208c36ed7f581c0f9e45df7e686468 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 4 Nov 2009 11:48:09 +0000 Subject: x11vnc_0.9.8.bb : new version of x11vnc --- recipes/vnc/x11vnc_0.9.8.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 recipes/vnc/x11vnc_0.9.8.bb (limited to 'recipes') diff --git a/recipes/vnc/x11vnc_0.9.8.bb b/recipes/vnc/x11vnc_0.9.8.bb new file mode 100644 index 0000000000..f3d706be5b --- /dev/null +++ b/recipes/vnc/x11vnc_0.9.8.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Export your X session on-the-fly via VNC" +HOMEPAGE = "http://www.karlrunge.com/x11vnc/" +AUTHOR = "Karl Runge" +SECTION = "x11/utils" +LICENSE = "GPL" +DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" + +inherit autotools -- cgit v1.2.3 From bec85b495e91d6fcab9d10c7853669d004b0f718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 8 Nov 2009 04:04:13 +0000 Subject: linux: Linux 2.6.31.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Štetiar Acked-by: Otavio Salvador --- recipes/linux/linux_2.6.31.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 15597104b6..f0ff5162f5 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r4" S = "${WORKDIR}/linux-${PV}" @@ -13,7 +13,7 @@ DEFAULT_PREFERENCE_qemumips = "1" DEFAULT_PREFERENCE_qemux86 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.3.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.5.bz2;patch=1 \ file://defconfig" SRC_URI_append_db1200 ="\ -- cgit v1.2.3 From 29bc82428b4d36efdce9968da085d11f9ee09f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 8 Nov 2009 04:04:14 +0000 Subject: linux: Linux 2.6.31.5 for IEI Nano GX-466 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Štetiar Acked-by: Otavio Salvador --- .../linux/linux-2.6.31/iei-nanogx-466/defconfig | 1688 ++++++++++++++++++++ recipes/linux/linux_2.6.31.bb | 3 +- 2 files changed, 1690 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig (limited to 'recipes') diff --git a/recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig b/recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig new file mode 100644 index 0000000000..5084958efb --- /dev/null +++ b/recipes/linux/linux-2.6.31/iei-nanogx-466/defconfig @@ -0,0 +1,1688 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.31.5 +# Tue Oct 27 00:08:58 2009 +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +# CONFIG_X86_64 is not set +CONFIG_X86=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_FAST_CMPXCHG_LOCAL=y +CONFIG_MMU=y +CONFIG_ZONE_DMA=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +# CONFIG_RWSEM_GENERIC_SPINLOCK is not set +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +# CONFIG_GENERIC_TIME_VSYSCALL is not set +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_32_LAZY_GS=y +CONFIG_KTIME_SCALAR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +# CONFIG_CLASSIC_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_PREEMPT_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +CONFIG_RELAY=y +CONFIG_NAMESPACES=y +# CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_NET_NS is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_HAVE_PERF_COUNTERS=y + +# +# Performance Counters +# +# CONFIG_PERF_COUNTERS is not set +# CONFIG_VM_EVENT_COUNTERS is not set +CONFIG_PCI_QUIRKS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_TRACEPOINTS=y +CONFIG_MARKERS=y +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_API_DEBUG=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_FREEZER is not set + +# +# Processor type and features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_SMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_SCHED_OMIT_FRAME_POINTER is not set +# CONFIG_PARAVIRT_GUEST is not set +# CONFIG_MEMTEST is not set +# CONFIG_M386 is not set +# CONFIG_M486 is not set +# CONFIG_M586 is not set +# CONFIG_M586TSC is not set +# CONFIG_M586MMX is not set +# CONFIG_M686 is not set +# CONFIG_MPENTIUMII is not set +# CONFIG_MPENTIUMIII is not set +# CONFIG_MPENTIUMM is not set +# CONFIG_MPENTIUM4 is not set +# CONFIG_MK6 is not set +# CONFIG_MK7 is not set +# CONFIG_MK8 is not set +# CONFIG_MCRUSOE is not set +# CONFIG_MEFFICEON is not set +# CONFIG_MWINCHIPC6 is not set +# CONFIG_MWINCHIP3D is not set +# CONFIG_MGEODEGX1 is not set +CONFIG_MGEODE_LX=y +# CONFIG_MCYRIXIII is not set +# CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_GENERIC_CPU is not set +CONFIG_X86_GENERIC=y +CONFIG_X86_CPU=y +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 +CONFIG_X86_CMPXCHG=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_X86_XADD=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_INTEL is not set +# CONFIG_CPU_SUP_CYRIX_32 is not set +CONFIG_CPU_SUP_AMD=y +# CONFIG_CPU_SUP_CENTAUR is not set +# CONFIG_CPU_SUP_TRANSMETA_32 is not set +# CONFIG_CPU_SUP_UMC_32 is not set +# CONFIG_X86_DS is not set +# CONFIG_HPET_TIMER is not set +CONFIG_DMI=y +# CONFIG_IOMMU_HELPER is not set +# CONFIG_IOMMU_API is not set +CONFIG_NR_CPUS=1 +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +CONFIG_X86_MCE=y +# CONFIG_X86_OLD_MCE is not set +CONFIG_X86_NEW_MCE=y +# CONFIG_X86_ANCIENT_MCE is not set +# CONFIG_X86_MCE_INJECT is not set +# CONFIG_VM86 is not set +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_MICROCODE=y +CONFIG_MICROCODE_INTEL=y +# CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=y +CONFIG_X86_CPUID=y +# CONFIG_X86_CPU_DEBUG is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +# CONFIG_VMSPLIT_3G is not set +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +CONFIG_VMSPLIT_1G=y +CONFIG_PAGE_OFFSET=0x40000000 +# CONFIG_X86_PAE is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set +CONFIG_X86_RESERVE_LOW_64K=y +# CONFIG_MATH_EMULATION is not set +# CONFIG_MTRR is not set +# CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +CONFIG_HZ_1000=y +CONFIG_HZ=1000 +# CONFIG_SCHED_HRTICK is not set +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x1000000 +# CONFIG_RELOCATABLE is not set +CONFIG_PHYSICAL_ALIGN=0x1000000 +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set + +# +# Power management and ACPI options +# +# CONFIG_PM is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +# CONFIG_PCI_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIEASPM is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCI_LEGACY is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +# CONFIG_SCx200 is not set +# CONFIG_GEODE_MFGPT_TIMER is not set +# CONFIG_OLPC is not set +# CONFIG_PCCARD is not set +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set +# CONFIG_NET_DSA is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_NET_DROP_MONITOR is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +# CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_HD is not set +# CONFIG_MISC_DEVICES is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +CONFIG_IDE_XFER_MODE=y +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_IDE_PROC_FS is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_PLATFORM=y +# CONFIG_BLK_DEV_CMD640 is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_PCIBUS_ORDER is not set +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_RZ1000 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_ATIIXP is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_CS5535 is not set +CONFIG_BLK_DEV_CS5536=y +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT8172 is not set +# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SIS5513 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_TC86C001 is not set +CONFIG_BLK_DEV_IDEDMA=y + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +# CONFIG_BLK_DEV_SD is not set +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_BLK_DEV_DM is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +CONFIG_REALTEK_PHY=y +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +# CONFIG_B44 is not set +# CONFIG_FORCEDETH is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +# CONFIG_NATSEMI is not set +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +CONFIG_8139TOO=y +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +# CONFIG_R6040 is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SMSC9420 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_KS8842 is not set +# CONFIG_VIA_RHINE is not set +# CONFIG_SC92031 is not set +# CONFIG_ATL2 is not set +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set +# CONFIG_TR is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +CONFIG_WLAN_80211=y +# CONFIG_LIBERTAS is not set +# CONFIG_AIRO is not set +# CONFIG_ATMEL is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_HOSTAP is not set +# CONFIG_HERMES is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_WAN is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_POLLDEV=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_INPUT_JOYSTICK=y +# CONFIG_JOYSTICK_ANALOG is not set +# CONFIG_JOYSTICK_A3D is not set +# CONFIG_JOYSTICK_ADI is not set +# CONFIG_JOYSTICK_COBRA is not set +# CONFIG_JOYSTICK_GF2K is not set +# CONFIG_JOYSTICK_GRIP is not set +# CONFIG_JOYSTICK_GRIP_MP is not set +# CONFIG_JOYSTICK_GUILLEMOT is not set +# CONFIG_JOYSTICK_INTERACT is not set +# CONFIG_JOYSTICK_SIDEWINDER is not set +# CONFIG_JOYSTICK_TMDC is not set +# CONFIG_JOYSTICK_IFORCE is not set +# CONFIG_JOYSTICK_WARRIOR is not set +# CONFIG_JOYSTICK_MAGELLAN is not set +# CONFIG_JOYSTICK_SPACEORB is not set +# CONFIG_JOYSTICK_SPACEBALL is not set +# CONFIG_JOYSTICK_STINGER is not set +# CONFIG_JOYSTICK_TWIDJOY is not set +# CONFIG_JOYSTICK_ZHENHUA is not set +# CONFIG_JOYSTICK_JOYDUMP is not set +# CONFIG_JOYSTICK_XPAD is not set +CONFIG_INPUT_TABLET=y +# CONFIG_TABLET_USB_ACECAD is not set +# CONFIG_TABLET_USB_AIPTEK is not set +# CONFIG_TABLET_USB_GTCO is not set +# CONFIG_TABLET_USB_KBTAB is not set +# CONFIG_TABLET_USB_WACOM is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_WM97XX is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_W90X900 is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_PCSPKR is not set +# CONFIG_INPUT_WISTRON_BTNS is not set +# CONFIG_INPUT_ATI_REMOTE is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_DEVKMEM=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINK is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set +# CONFIG_N_HDLC is not set +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +# CONFIG_STALDRV is not set +# CONFIG_NOZOMI is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM_INTEL is not set +# CONFIG_HW_RANDOM_AMD is not set +CONFIG_HW_RANDOM_GEODE=y +# CONFIG_HW_RANDOM_VIA is not set +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set +# CONFIG_MWAVE is not set +# CONFIG_PC8736x_GPIO is not set +# CONFIG_NSC_GPIO is not set +# CONFIG_CS5535_GPIO is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_HANGCHECK_TIMER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set +CONFIG_DEVPORT=y +# CONFIG_I2C is not set +# CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +# CONFIG_GPIOLIB is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=y +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set +# CONFIG_SENSORS_K8TEMP is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_CORETEMP is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83627HF is not set +CONFIG_SENSORS_W83627EHF=y +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_SENSORS_APPLESMC is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +# CONFIG_THERMAL_HWMON is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_GEODE_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_IBMASR is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I6300ESB_WDT is not set +# CONFIG_ITCO_WDT is not set +# CONFIG_IT8712F_WDT is not set +# CONFIG_IT87_WDT is not set +# CONFIG_HP_WATCHDOG is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_PC87413_WDT is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SBC8360_WDT is not set +# CONFIG_SBC7240_WDT is not set +# CONFIG_CPU5_WDT is not set +# CONFIG_SMSC_SCH311X_WDT is not set +# CONFIG_SMSC37B787_WDT is not set +CONFIG_W83627HF_WDT=y +# CONFIG_W83697HF_WDT is not set +# CONFIG_W83697UG_WDT is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_W83977F_WDT is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_SBC_EPX_C3_WATCHDOG is not set + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_REGULATOR is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ARC is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_VESA is not set +# CONFIG_FB_N411 is not set +# CONFIG_FB_HGA is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_LE80578 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +CONFIG_FB_GEODE=y +# CONFIG_FB_GEODE_LX is not set +CONFIG_FB_GEODE_GX=y +# CONFIG_FB_GEODE_GX1 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +CONFIG_FONT_PEARL_8x8=y +CONFIG_FONT_ACORN_8x8=y +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_10x18=y +# CONFIG_LOGO is not set +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PROCFS is not set +CONFIG_SND_VERBOSE_PRINTK=y +# CONFIG_SND_DEBUG is not set +CONFIG_SND_VMASTER=y +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_AC97_CODEC=y +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_AC97_POWER_SAVE is not set +CONFIG_SND_PCI=y +# CONFIG_SND_AD1889 is not set +# CONFIG_SND_ALS300 is not set +# CONFIG_SND_ALS4000 is not set +# CONFIG_SND_ALI5451 is not set +# CONFIG_SND_ATIIXP is not set +# CONFIG_SND_ATIIXP_MODEM is not set +# CONFIG_SND_AU8810 is not set +# CONFIG_SND_AU8820 is not set +# CONFIG_SND_AU8830 is not set +# CONFIG_SND_AW2 is not set +# CONFIG_SND_AZT3328 is not set +# CONFIG_SND_BT87X is not set +# CONFIG_SND_CA0106 is not set +# CONFIG_SND_CMIPCI is not set +# CONFIG_SND_OXYGEN is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS5530 is not set +CONFIG_SND_CS5535AUDIO=y +# CONFIG_SND_CTXFI is not set +# CONFIG_SND_DARLA20 is not set +# CONFIG_SND_GINA20 is not set +# CONFIG_SND_LAYLA20 is not set +# CONFIG_SND_DARLA24 is not set +# CONFIG_SND_GINA24 is not set +# CONFIG_SND_LAYLA24 is not set +# CONFIG_SND_MONA is not set +# CONFIG_SND_MIA is not set +# CONFIG_SND_ECHO3G is not set +# CONFIG_SND_INDIGO is not set +# CONFIG_SND_INDIGOIO is not set +# CONFIG_SND_INDIGODJ is not set +# CONFIG_SND_INDIGOIOX is not set +# CONFIG_SND_INDIGODJX is not set +# CONFIG_SND_EMU10K1 is not set +# CONFIG_SND_EMU10K1X is not set +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +# CONFIG_SND_ES1938 is not set +# CONFIG_SND_ES1968 is not set +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDA_INTEL is not set +# CONFIG_SND_HDSP is not set +# CONFIG_SND_HDSPM is not set +# CONFIG_SND_HIFIER is not set +# CONFIG_SND_ICE1712 is not set +# CONFIG_SND_ICE1724 is not set +# CONFIG_SND_INTEL8X0 is not set +# CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_KORG1212 is not set +# CONFIG_SND_LX6464ES is not set +# CONFIG_SND_MAESTRO3 is not set +# CONFIG_SND_MIXART is not set +# CONFIG_SND_NM256 is not set +# CONFIG_SND_PCXHR is not set +# CONFIG_SND_RIPTIDE is not set +# CONFIG_SND_RME32 is not set +# CONFIG_SND_RME96 is not set +# CONFIG_SND_RME9652 is not set +# CONFIG_SND_SIS7019 is not set +# CONFIG_SND_SONICVIBES is not set +# CONFIG_SND_TRIDENT is not set +# CONFIG_SND_VIA82XX is not set +# CONFIG_SND_VIA82XX_MODEM is not set +# CONFIG_SND_VIRTUOSO is not set +# CONFIG_SND_VX222 is not set +# CONFIG_SND_YMFPCI is not set +# CONFIG_SND_USB is not set +CONFIG_SND_SOC=y +# CONFIG_SND_SOC_ALL_CODECS is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_HID_PID is not set +# CONFIG_USB_HIDDEV is not set + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=y +CONFIG_HID_APPLE=y +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y +CONFIG_HID_CYPRESS=y +# CONFIG_HID_DRAGONRISE is not set +CONFIG_HID_EZKEY=y +CONFIG_HID_KYE=y +CONFIG_HID_GYRATION=y +CONFIG_HID_KENSINGTON=y +CONFIG_HID_LOGITECH=y +CONFIG_LOGITECH_FF=y +# CONFIG_LOGIRUMBLEPAD2_FF is not set +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y +CONFIG_HID_NTRIG=y +CONFIG_HID_PANTHERLORD=y +CONFIG_PANTHERLORD_FF=y +CONFIG_HID_PETALYNX=y +CONFIG_HID_SAMSUNG=y +CONFIG_HID_SONY=y +CONFIG_HID_SUNPLUS=y +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +CONFIG_HID_TOPSEED=y +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_ZEROPLUS is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +CONFIG_USB_DEBUG=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_DEVICE_CLASS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_MON is not set +# CONFIG_USB_WUSB is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_WHCI_HCD is not set +# CONFIG_USB_HWA_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=y +CONFIG_USB_PRINTER=y +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +CONFIG_USB_LIBUSUAL=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_VST is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y + +# +# Reporting subsystems +# +# CONFIG_EDAC_DEBUG is not set +# CONFIG_EDAC_MM_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +# CONFIG_INTEL_IOATDMA is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# TI VLYNQ +# +# CONFIG_STAGING is not set +CONFIG_X86_PLATFORM_DEVICES=y + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +# CONFIG_DMIID is not set +# CONFIG_ISCSI_IBFT_FIND is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT4_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +# 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_BTRFS_FS is not set +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_CUSE=y +CONFIG_GENERIC_ACL=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +# CONFIG_PROC_KCORE is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_SQUASHFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_NETWORK_FILESYSTEMS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +# CONFIG_LDM_PARTITION is not set +CONFIG_SGI_PARTITION=y +# CONFIG_ULTRIX_PARTITION is not set +CONFIG_SUN_PARTITION=y +CONFIG_KARMA_PARTITION=y +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="utf8" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_FRAME_WARN=2048 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +# CONFIG_FRAME_POINTER is not set +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_SYSCTL_SYSCALL_CHECK is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y +CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_STRICT_DEVMEM is not set +CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y +CONFIG_EARLY_PRINTK_DBGP=y +# CONFIG_4KSTACKS is not set +# CONFIG_DOUBLEFAULT is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +CONFIG_OPTIMIZE_INLINING=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_SECURITY_FILE_CAPABILITIES=y +# CONFIG_CRYPTO is not set +CONFIG_HAVE_KVM=y +CONFIG_HAVE_KVM_IRQCHIP=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_FIND_LAST_BIT=y +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC_T10DIF=y +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index f0ff5162f5..21ebe2cc95 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r4" +PR = "r5" S = "${WORKDIR}/linux-${PV}" @@ -11,6 +11,7 @@ DEFAULT_PREFERENCE_collie = "1" DEFAULT_PREFERENCE_db1200 = "1" DEFAULT_PREFERENCE_qemumips = "1" DEFAULT_PREFERENCE_qemux86 = "1" +DEFAULT_PREFERENCE_iei-nanogx-466 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.5.bz2;patch=1 \ -- cgit v1.2.3 From 2f9a991fd522fb03ccba98244ef5bb3f620e5194 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 3 Nov 2009 09:18:29 +0000 Subject: pulseaudio: added pulseaudio-0.9.19 Signed-off-by: Liam Girdwood --- .../pulseaudio-0.9.19/autoconf_version.patch | 13 ++++++++++ .../pulseaudio/pulseaudio-0.9.19/buildfix.patch | 13 ++++++++++ .../pulseaudio-0.9.19/configure_silent_rules.patch | 29 +++++++++++++++++++++ .../pulseaudio-0.9.19/gcc4-compile-fix.patch | 18 +++++++++++++ recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch | 30 ++++++++++++++++++++++ .../pulseaudio-0.9.19/volatiles.04_pulse | 2 ++ recipes/pulseaudio/pulseaudio_0.9.19.bb | 18 +++++++++++++ 7 files changed, 123 insertions(+) create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch create mode 100644 recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse create mode 100644 recipes/pulseaudio/pulseaudio_0.9.19.bb (limited to 'recipes') diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch b/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch new file mode 100644 index 0000000000..7a0759da13 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/autoconf_version.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.15/configure.ac +=================================================================== +--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100 ++++ pulseaudio-0.9.15/configure.ac 2009-05-22 11:32:50.000000000 +0100 +@@ -20,7 +20,7 @@ + # along with PulseAudio; if not, write to the Free Software Foundation, + # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +-AC_PREREQ(2.63) ++AC_PREREQ(2.61) + + m4_define(pa_major, [0]) + m4_define(pa_minor, [9]) diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch b/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch new file mode 100644 index 0000000000..ca01e0d80f --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/buildfix.patch @@ -0,0 +1,13 @@ +Index: pulseaudio-0.9.11/src/pulsecore/atomic.h +=================================================================== +--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h ++++ pulseaudio-0.9.11/src/pulsecore/atomic.h +@@ -40,6 +40,8 @@ + #error "Please include config.h before including this file!" + #endif + ++#include "macro.h" ++ + #ifdef HAVE_ATOMIC_BUILTINS + + /* __sync based implementation */ diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch b/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch new file mode 100644 index 0000000000..aeabec2b09 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/configure_silent_rules.patch @@ -0,0 +1,29 @@ +Index: pulseaudio-0.9.19/configure.ac +=================================================================== +--- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000 ++++ pulseaudio-0.9.19/configure.ac 2009-10-31 11:50:35.000000000 +0000 +@@ -27,12 +27,13 @@ + AC_CONFIG_SRCDIR([src/daemon/main.c]) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS([config.h]) +-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) ++AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax]) + + m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) + m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) + m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`) + ++ + AC_SUBST(PA_MAJOR, pa_major) + AC_SUBST(PA_MINOR, pa_minor) + AC_SUBST(PA_MICRO, pa_micro) +@@ -80,7 +81,8 @@ + ;; + esac + +-AM_SILENT_RULES([yes]) ++# only use if available ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + #### Checks for programs. #### + diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch b/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch new file mode 100644 index 0000000000..34ad026e4d --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/gcc4-compile-fix.patch @@ -0,0 +1,18 @@ +| fix for more strict syntax compliance in gcc4.x +| pulsecore/core-util.c: In function 'pa_raise_priority': +| pulsecore/core-util.c:547: error: label at end of compound statement +| Signed off: mickey@openmoko.org +| +Index: pulseaudio-0.9.6/src/pulsecore/core-util.c +=================================================================== +--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c ++++ pulseaudio-0.9.6/src/pulsecore/core-util.c +@@ -535,7 +535,7 @@ void pa_raise_priority(void) { + pa_log_info("Successfully gained high priority class."); + #endif + +-fail: ++fail:; + + #if defined(HAVE_SYS_CAPABILITY_H) + if (caps) { diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch b/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch new file mode 100644 index 0000000000..7b333e3df9 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/tls_m4.patch @@ -0,0 +1,30 @@ +Index: pulseaudio-0.9.15/m4/tls.m4 +=================================================================== +--- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200 ++++ pulseaudio-0.9.15/m4/tls.m4 2009-07-10 09:55:25.266365511 +0200 +@@ -1,12 +1,19 @@ + AC_DEFUN([CC_CHECK_TLS], [ + AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], + cc_cv_tls___thread, +- [AC_COMPILE_IFELSE( +- AC_LANG_PROGRAM( +- [[static __thread int a = 6;]], +- [[a = 5;]]), +- [cc_cv_tls___thread=yes], +- [cc_cv_tls___thread=no]) ++ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], ++ [chktls_save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" ++ chktls_save_CFLAGS="$CFLAGS" ++ CFLAGS="-fPIC $CFLAGS" ++ dnl If -shared works, test if TLS works in a shared library. ++ AC_LINK_IFELSE([int f() { return 0; }], ++ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], ++ [cc_cv_tls___thread=yes], ++ [cc_cv_tls___thread=no]), ++ [cc_cv_tls___thread=yes]) ++ CFLAGS="$chktls_save_CFLAGS" ++ LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no]) + ]) + + AS_IF([test "x$cc_cv_tls___thread" = "xyes"], diff --git a/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse b/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse new file mode 100644 index 0000000000..5b1998032b --- /dev/null +++ b/recipes/pulseaudio/pulseaudio-0.9.19/volatiles.04_pulse @@ -0,0 +1,2 @@ +# +d pulse pulse 0755 /var/run/pulse none diff --git a/recipes/pulseaudio/pulseaudio_0.9.19.bb b/recipes/pulseaudio/pulseaudio_0.9.19.bb new file mode 100644 index 0000000000..cd9e46e4f2 --- /dev/null +++ b/recipes/pulseaudio/pulseaudio_0.9.19.bb @@ -0,0 +1,18 @@ +require pulseaudio.inc + +DEPENDS += "gdbm speex" + +inherit gettext + +SRC_URI += "\ + file://buildfix.patch;patch=1 \ + file://autoconf_version.patch;patch=1 \ + file://tls_m4.patch;patch=1 \ + file://configure_silent_rules.patch;patch=1 \ +" + +do_compile_prepend() { + cd ${S} + mkdir -p ${S}/libltdl + cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl +} -- cgit v1.2.3 From 636a0d3acb17cfb07bd5b7ccfd7a031e9e5cbdd4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 Nov 2009 14:28:54 -0200 Subject: xf86-video-cirrus: add 1.3.2 and set it as prefered for X11 7.5 Signed-off-by: Otavio Salvador --- recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb (limited to 'recipes') diff --git a/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb new file mode 100644 index 0000000000..ce19dd4f73 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-cirrus_1.3.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc +PE = "1" + +DESCRIPTION = "X.Org X server -- Cirrus display driver" -- cgit v1.2.3 From 8e41a1e490a129be56338f194330af05d186f454 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 9 Nov 2009 22:05:42 +0100 Subject: Revert "geodegx: Linux 2.6.31.4" This reverts commit 2c92869662d1f0b28229cdba9e9852ba642e0733. --- recipes/linux/linux-2.6.31.4/geode/defconfig | 1792 -------------------------- recipes/linux/linux_2.6.31.4.bb | 13 - 2 files changed, 1805 deletions(-) delete mode 100644 recipes/linux/linux-2.6.31.4/geode/defconfig delete mode 100644 recipes/linux/linux_2.6.31.4.bb (limited to 'recipes') diff --git a/recipes/linux/linux-2.6.31.4/geode/defconfig b/recipes/linux/linux-2.6.31.4/geode/defconfig deleted file mode 100644 index 62ca6cad99..0000000000 --- a/recipes/linux/linux-2.6.31.4/geode/defconfig +++ /dev/null @@ -1,1792 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.4 -# Thu Oct 15 09:26:12 2009 -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_64 is not set -CONFIG_X86=y -CONFIG_OUTPUT_FORMAT="elf32-i386" -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y -# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_X86_32_LAZY_GS=y -CONFIG_KTIME_SCALAR=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_CONSTRUCTORS=y - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set - -# -# RCU Subsystem -# -# CONFIG_CLASSIC_RCU is not set -CONFIG_TREE_RCU=y -# CONFIG_PREEMPT_RCU is not set -# CONFIG_RCU_TRACE is not set -CONFIG_RCU_FANOUT=32 -# CONFIG_RCU_FANOUT_EXACT is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set -# CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=18 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set -# CONFIG_CGROUPS is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -CONFIG_RELAY=y -CONFIG_NAMESPACES=y -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_USER_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -# CONFIG_EMBEDDED is not set -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_EXTRA_PASS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_HAVE_PERF_COUNTERS=y - -# -# Performance Counters -# -# CONFIG_PERF_COUNTERS is not set -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -# CONFIG_PROFILING is not set -CONFIG_TRACEPOINTS=y -CONFIG_MARKERS=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_API_DEBUG=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -# CONFIG_SLOW_WORK is not set -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_SLABINFO=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -# CONFIG_MODULES is not set -CONFIG_BLOCK=y -# CONFIG_LBDAF is not set -CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -# CONFIG_FREEZER is not set - -# -# Processor type and features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -# CONFIG_SMP is not set -# CONFIG_X86_EXTENDED_PLATFORM is not set -# CONFIG_SCHED_OMIT_FRAME_POINTER is not set -# CONFIG_PARAVIRT_GUEST is not set -# CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -CONFIG_MGEODE_LX=y -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_GENERIC_CPU is not set -# CONFIG_X86_GENERIC is not set -CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=64 -CONFIG_X86_INTERNODE_CACHE_BYTES=64 -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_XADD=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_USE_3DNOW=y -CONFIG_X86_TSC=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 -CONFIG_X86_DEBUGCTLMSR=y -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -# CONFIG_X86_DS is not set -# CONFIG_HPET_TIMER is not set -CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set -# CONFIG_IOMMU_API is not set -CONFIG_NR_CPUS=1 -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -# CONFIG_X86_UP_APIC is not set -# CONFIG_X86_MCE is not set -# CONFIG_X86_ANCIENT_MCE is not set -CONFIG_VM86=y -# CONFIG_TOSHIBA is not set -# CONFIG_I8K is not set -# CONFIG_X86_REBOOTFIXUPS is not set -# CONFIG_MICROCODE is not set -# CONFIG_X86_MSR is not set -# CONFIG_X86_CPUID is not set -# CONFIG_X86_CPU_DEBUG is not set -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set -# CONFIG_HIGHMEM64G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_X86_PAE is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -# CONFIG_X86_RESERVE_LOW_64K is not set -# CONFIG_MATH_EMULATION is not set -# CONFIG_MTRR is not set -# CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -CONFIG_SCHED_HRTICK=y -# CONFIG_KEXEC is not set -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_RELOCATABLE=y -CONFIG_X86_NEED_RELOCS=y -CONFIG_PHYSICAL_ALIGN=0x1000000 -# CONFIG_COMPAT_VDSO is not set -# CONFIG_CMDLINE_BOOL is not set - -# -# Power management and ACPI options -# -# CONFIG_PM is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y -CONFIG_CPU_FREQ_DEBUG=y -# CONFIG_CPU_FREQ_STAT is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set - -# -# CPUFreq processor drivers -# -# CONFIG_X86_POWERNOW_K6 is not set -# CONFIG_X86_POWERNOW_K7 is not set -# CONFIG_X86_GX_SUSPMOD is not set -# CONFIG_X86_SPEEDSTEP_CENTRINO is not set -# CONFIG_X86_SPEEDSTEP_ICH is not set -# CONFIG_X86_SPEEDSTEP_SMI is not set -# CONFIG_X86_P4_CLOCKMOD is not set -# CONFIG_X86_CPUFREQ_NFORCE2 is not set -# CONFIG_X86_LONGRUN is not set -# CONFIG_X86_E_POWERSAVER is not set - -# -# shared options -# -# CONFIG_X86_SPEEDSTEP_LIB is not set -# CONFIG_CPU_IDLE is not set - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOOLPC is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCIEPORTBUS=y -# CONFIG_HOTPLUG_PCI_PCIE is not set -CONFIG_PCIEAER=y -# CONFIG_PCIE_ECRC is not set -# CONFIG_PCIEAER_INJECT is not set -# CONFIG_PCIEASPM is not set -# CONFIG_ARCH_SUPPORTS_MSI is not set -# CONFIG_PCI_LEGACY is not set -# CONFIG_PCI_STUB is not set -# CONFIG_PCI_IOV is not set -CONFIG_ISA_DMA_API=y -# CONFIG_ISA is not set -# CONFIG_MCA is not set -# CONFIG_SCx200 is not set -# CONFIG_GEODE_MFGPT_TIMER is not set -# CONFIG_OLPC is not set -CONFIG_K8_NB=y -# CONFIG_PCCARD is not set -CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_FAKE is not set -# CONFIG_HOTPLUG_PCI_COMPAQ is not set -# CONFIG_HOTPLUG_PCI_CPCI is not set -# CONFIG_HOTPLUG_PCI_SHPC is not set - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_HAVE_AOUT=y -# CONFIG_BINFMT_AOUT is not set -# CONFIG_BINFMT_MISC is not set -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -# CONFIG_NET_KEY is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -CONFIG_INET_LRO=y -# CONFIG_INET_DIAG is not set -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set -# CONFIG_NETWORK_SECMARK is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -# CONFIG_NETFILTER_ADVANCED is not set - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=y -CONFIG_NETFILTER_NETLINK_LOG=y -# CONFIG_NF_CONNTRACK is not set -CONFIG_NETFILTER_XTABLES=y -CONFIG_NETFILTER_XT_TARGET_MARK=y -CONFIG_NETFILTER_XT_TARGET_NFLOG=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y -CONFIG_NETFILTER_XT_MATCH_MARK=y -# CONFIG_IP_VS is not set - -# -# IP: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -CONFIG_IP_NF_FILTER=y -CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_LOG=y -CONFIG_IP_NF_TARGET_ULOG=y -CONFIG_IP_NF_MANGLE=y -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_ECONET is not set -# CONFIG_WAN_ROUTER is not set -# CONFIG_PHONET is not set -# CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set -# CONFIG_DCB is not set - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_WIRELESS is not set -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set -# CONFIG_NET_9P is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_CONNECTOR is not set -# CONFIG_MTD is not set -# CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -# CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_BLK_DEV_XIP is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_BLK_DEV_HD is not set -CONFIG_MISC_DEVICES=y -# CONFIG_IBM_ASM is not set -# CONFIG_PHANTOM is not set -# CONFIG_SGI_IOC4 is not set -# CONFIG_TIFM_CORE is not set -# CONFIG_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HP_ILO is not set -# CONFIG_ISL29003 is not set -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -# CONFIG_EEPROM_93CX6 is not set -# CONFIG_CB710_CORE is not set -CONFIG_HAVE_IDE=y -CONFIG_IDE=y - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_BLK_DEV_IDE_SATA=y -CONFIG_IDE_GD=y -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_IDE_TASK_IOCTL is not set -# CONFIG_IDE_PROC_FS is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_PLATFORM=y -# CONFIG_BLK_DEV_CMD640 is not set -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_IDEPCI_PCIBUS_ORDER is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_RZ1000 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_ATIIXP is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_CS5535 is not set -CONFIG_BLK_DEV_CS5536=y -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_IT8172 is not set -# CONFIG_BLK_DEV_IT8213 is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SIS5513 is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_BLK_DEV_TC86C001 is not set -CONFIG_BLK_DEV_IDEDMA=y - -# -# SCSI device support -# -# CONFIG_RAID_ATTRS is not set -# CONFIG_SCSI is not set -# CONFIG_SCSI_DMA is not set -# CONFIG_SCSI_NETLINK is not set -# CONFIG_ATA is not set -# CONFIG_MD is not set -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# You can enable one or both FireWire driver stacks. -# - -# -# See the help texts for more information. -# -# CONFIG_FIREWIRE is not set -# CONFIG_IEEE1394 is not set -# CONFIG_I2O is not set -# CONFIG_MACINTOSH_DRIVERS is not set -CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set -# CONFIG_BONDING is not set -# CONFIG_MACVLAN is not set -# CONFIG_EQUALIZER is not set -# CONFIG_TUN is not set -# CONFIG_VETH is not set -# CONFIG_ARCNET is not set -CONFIG_PHYLIB=y - -# -# MII PHY device drivers -# -# CONFIG_MARVELL_PHY is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_VITESSE_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_BROADCOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set -CONFIG_REALTEK_PHY=y -# CONFIG_NATIONAL_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_FIXED_PHY is not set -# CONFIG_MDIO_BITBANG is not set -CONFIG_NET_ETHERNET=y -CONFIG_MII=y -# CONFIG_HAPPYMEAL is not set -# CONFIG_SUNGEM is not set -# CONFIG_CASSINI is not set -# CONFIG_NET_VENDOR_3COM is not set -# CONFIG_ETHOC is not set -# CONFIG_DNET is not set -# CONFIG_NET_TULIP is not set -# CONFIG_HP100 is not set -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -# CONFIG_PCNET32 is not set -# CONFIG_AMD8111_ETH is not set -# CONFIG_ADAPTEC_STARFIRE is not set -# CONFIG_B44 is not set -# CONFIG_FORCEDETH is not set -# CONFIG_E100 is not set -# CONFIG_FEALNX is not set -# CONFIG_NATSEMI is not set -# CONFIG_NE2K_PCI is not set -# CONFIG_8139CP is not set -CONFIG_8139TOO=y -# CONFIG_8139TOO_PIO is not set -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -# CONFIG_R6040 is not set -# CONFIG_SIS900 is not set -# CONFIG_EPIC100 is not set -# CONFIG_SMSC9420 is not set -# CONFIG_SUNDANCE is not set -# CONFIG_TLAN is not set -# CONFIG_KS8842 is not set -# CONFIG_VIA_RHINE is not set -# CONFIG_SC92031 is not set -# CONFIG_ATL2 is not set -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_TR is not set - -# -# Wireless LAN -# -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# - -# -# USB Network Adapters -# -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_USBNET is not set -# CONFIG_WAN is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_PPP=y -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=y -CONFIG_PPP_SYNC_TTY=y -CONFIG_PPP_DEFLATE=y -CONFIG_PPP_BSDCOMP=y -CONFIG_PPP_MPPE=y -# CONFIG_PPPOE is not set -# CONFIG_PPPOL2TP is not set -# CONFIG_SLIP is not set -CONFIG_SLHC=y -CONFIG_NETCONSOLE=y -# CONFIG_NETCONSOLE_DYNAMIC is not set -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -# CONFIG_ISDN is not set -# CONFIG_PHONE is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=y -CONFIG_INPUT_POLLDEV=y - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_EVDEV is not set -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_INPUT_MOUSE is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_AD7879_I2C=y -CONFIG_TOUCHSCREEN_AD7879=y -CONFIG_TOUCHSCREEN_EETI=y -CONFIG_TOUCHSCREEN_FUJITSU=y -CONFIG_TOUCHSCREEN_GUNZE=y -CONFIG_TOUCHSCREEN_ELO=y -CONFIG_TOUCHSCREEN_WACOM_W8001=y -CONFIG_TOUCHSCREEN_MTOUCH=y -CONFIG_TOUCHSCREEN_INEXIO=y -CONFIG_TOUCHSCREEN_MK712=y -CONFIG_TOUCHSCREEN_PENMOUNT=y -CONFIG_TOUCHSCREEN_TOUCHRIGHT=y -CONFIG_TOUCHSCREEN_TOUCHWIN=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=y -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_TOUCHIT213=y -CONFIG_TOUCHSCREEN_TSC2007=y -CONFIG_TOUCHSCREEN_W90X900=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=y -# CONFIG_INPUT_WISTRON_BTNS is not set -# CONFIG_INPUT_ATI_REMOTE is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set -# CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INPUT_CM109 is not set -# CONFIG_INPUT_UINPUT is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_CT82C710 is not set -# CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVKMEM=y -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set -# CONFIG_CYCLADES is not set -# CONFIG_DIGIEPCA is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -# CONFIG_SYNCLINK is not set -# CONFIG_SYNCLINKMP is not set -# CONFIG_SYNCLINK_GT is not set -# CONFIG_N_HDLC is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_SX is not set -# CONFIG_RIO is not set -# CONFIG_STALDRV is not set -# CONFIG_NOZOMI is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -CONFIG_SERIAL_8250_DETECT_IRQ=y -CONFIG_SERIAL_8250_RSA=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_LEGACY_PTYS is not set -# CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=y -# CONFIG_HW_RANDOM_TIMERIOMEM is not set -CONFIG_HW_RANDOM_INTEL=y -CONFIG_HW_RANDOM_AMD=y -CONFIG_HW_RANDOM_GEODE=y -CONFIG_HW_RANDOM_VIA=y -CONFIG_NVRAM=y -# CONFIG_R3964 is not set -# CONFIG_APPLICOM is not set -# CONFIG_SONYPI is not set -# CONFIG_MWAVE is not set -# CONFIG_PC8736x_GPIO is not set -# CONFIG_NSC_GPIO is not set -# CONFIG_CS5535_GPIO is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_HANGCHECK_TIMER is not set -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set -CONFIG_DEVPORT=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_CHARDEV is not set -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -CONFIG_I2C_I801=y -# CONFIG_I2C_ISCH is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_SIMTEC is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Graphics adapter I2C/DDC channel drivers -# -# CONFIG_I2C_VOODOO3 is not set - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_SCx200_ACB is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_DS1682 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -# CONFIG_SPI is not set - -# -# PPS support -# -# CONFIG_PPS is not set -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -# CONFIG_GPIOLIB is not set -# CONFIG_W1 is not set -# CONFIG_POWER_SUPPLY is not set -CONFIG_HWMON=y -# CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_ABITUGURU3 is not set -# CONFIG_SENSORS_AD7414 is not set -# CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1029 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ADT7462 is not set -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_ADT7473 is not set -# CONFIG_SENSORS_ADT7475 is not set -# CONFIG_SENSORS_K8TEMP is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_I5K_AMB is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_FSCHMD is not set -# CONFIG_SENSORS_G760A is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_CORETEMP is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_LM93 is not set -# CONFIG_SENSORS_LTC4215 is not set -# CONFIG_SENSORS_LTC4245 is not set -# CONFIG_SENSORS_LM95241 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_MAX6650 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_DME1737 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_THMC50 is not set -# CONFIG_SENSORS_TMP401 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_VT8231 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83793 is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83L786NG is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_SENSORS_HDAPS is not set -# CONFIG_SENSORS_APPLESMC is not set -# CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -# CONFIG_ACQUIRE_WDT is not set -# CONFIG_ADVANTECH_WDT is not set -# CONFIG_ALIM1535_WDT is not set -# CONFIG_ALIM7101_WDT is not set -CONFIG_GEODE_WDT=y -# CONFIG_SC520_WDT is not set -# CONFIG_EUROTECH_WDT is not set -# CONFIG_IB700_WDT is not set -# CONFIG_IBMASR is not set -# CONFIG_WAFER_WDT is not set -# CONFIG_I6300ESB_WDT is not set -# CONFIG_ITCO_WDT is not set -# CONFIG_IT8712F_WDT is not set -# CONFIG_IT87_WDT is not set -# CONFIG_HP_WATCHDOG is not set -# CONFIG_SC1200_WDT is not set -# CONFIG_PC87413_WDT is not set -# CONFIG_60XX_WDT is not set -# CONFIG_SBC8360_WDT is not set -# CONFIG_SBC7240_WDT is not set -# CONFIG_CPU5_WDT is not set -# CONFIG_SMSC_SCH311X_WDT is not set -# CONFIG_SMSC37B787_WDT is not set -# CONFIG_W83627HF_WDT is not set -# CONFIG_W83697HF_WDT is not set -# CONFIG_W83697UG_WDT is not set -# CONFIG_W83877F_WDT is not set -# CONFIG_W83977F_WDT is not set -# CONFIG_MACHZ_WDT is not set -# CONFIG_SBC_EPX_C3_WATCHDOG is not set - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_TWL4030_CORE is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_AB3100_CORE is not set -# CONFIG_REGULATOR is not set -# CONFIG_MEDIA_SUPPORT is not set - -# -# Graphics support -# -CONFIG_AGP=y -# CONFIG_AGP_ALI is not set -# CONFIG_AGP_ATI is not set -# CONFIG_AGP_AMD is not set -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -# CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SIS is not set -# CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_VIA is not set -# CONFIG_AGP_EFFICEON is not set -CONFIG_DRM=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_R128 is not set -# CONFIG_DRM_RADEON is not set -# CONFIG_DRM_I810 is not set -# CONFIG_DRM_I830 is not set -CONFIG_DRM_I915=y -# CONFIG_DRM_I915_KMS is not set -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_DRM_VIA is not set -# CONFIG_DRM_SAVAGE is not set -# CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set -CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set -# CONFIG_FB_DDC is not set -# CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -# CONFIG_FB_SYS_FILLRECT is not set -# CONFIG_FB_SYS_COPYAREA is not set -# CONFIG_FB_SYS_IMAGEBLIT is not set -# CONFIG_FB_FOREIGN_ENDIAN is not set -# CONFIG_FB_SYS_FOPS is not set -# CONFIG_FB_SVGALIB is not set -# CONFIG_FB_MACMODES is not set -# CONFIG_FB_BACKLIGHT is not set -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ARC is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set -# CONFIG_FB_VESA is not set -# CONFIG_FB_N411 is not set -# CONFIG_FB_HGA is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_I810 is not set -# CONFIG_FB_LE80578 is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON is not set -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_S3 is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_GEODE is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX is not set -# CONFIG_FB_BROADSHEET is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -# CONFIG_BACKLIGHT_PROGEAR is not set -# CONFIG_BACKLIGHT_MBP_NVIDIA is not set -# CONFIG_BACKLIGHT_SAHARA is not set - -# -# Display device support -# -# CONFIG_DISPLAY_SUPPORT is not set - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_SOUND=y -# CONFIG_SOUND_OSS_CORE is not set -# CONFIG_SND is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set -# CONFIG_HIDRAW is not set - -# -# USB Input Devices -# -CONFIG_USB_HID=y -CONFIG_HID_PID=y -# CONFIG_USB_HIDDEV is not set - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=y -CONFIG_HID_APPLE=y -CONFIG_HID_BELKIN=y -CONFIG_HID_CHERRY=y -CONFIG_HID_CHICONY=y -CONFIG_HID_CYPRESS=y -CONFIG_HID_DRAGONRISE=y -# CONFIG_DRAGONRISE_FF is not set -CONFIG_HID_EZKEY=y -CONFIG_HID_KYE=y -CONFIG_HID_GYRATION=y -CONFIG_HID_KENSINGTON=y -CONFIG_HID_LOGITECH=y -# CONFIG_LOGITECH_FF is not set -# CONFIG_LOGIRUMBLEPAD2_FF is not set -CONFIG_HID_MICROSOFT=y -CONFIG_HID_MONTEREY=y -CONFIG_HID_NTRIG=y -CONFIG_HID_PANTHERLORD=y -# CONFIG_PANTHERLORD_FF is not set -CONFIG_HID_PETALYNX=y -CONFIG_HID_SAMSUNG=y -CONFIG_HID_SONY=y -CONFIG_HID_SUNPLUS=y -CONFIG_HID_GREENASIA=y -# CONFIG_GREENASIA_FF is not set -CONFIG_HID_SMARTJOYPLUS=y -# CONFIG_SMARTJOYPLUS_FF is not set -CONFIG_HID_TOPSEED=y -CONFIG_HID_THRUSTMASTER=y -# CONFIG_THRUSTMASTER_FF is not set -CONFIG_HID_ZEROPLUS=y -# CONFIG_ZEROPLUS_FF is not set -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=y -CONFIG_USB_DEBUG=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_MON is not set -# CONFIG_USB_WUSB is not set -# CONFIG_USB_WUSB_CBAF is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_XHCI_HCD is not set -CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1760_HCD is not set -CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_WHCI_HCD is not set -# CONFIG_USB_HWA_HCD is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_LIBUSUAL=y - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set - -# -# USB port drivers -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_VST is not set -# CONFIG_USB_GADGET is not set - -# -# OTG and related infrastructure -# -# CONFIG_NOP_USB_XCEIV is not set -# CONFIG_UWB is not set -# CONFIG_MMC is not set -# CONFIG_MEMSTICK is not set -# CONFIG_NEW_LEDS is not set -# CONFIG_ACCESSIBILITY is not set -# CONFIG_INFINIBAND is not set -# CONFIG_EDAC is not set -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set - -# -# SPI RTC drivers -# - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_V3020 is not set - -# -# on-CPU RTC drivers -# -# CONFIG_DMADEVICES is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_UIO is not set - -# -# TI VLYNQ -# -# CONFIG_STAGING is not set -# CONFIG_X86_PLATFORM_DEVICES is not set - -# -# Firmware Drivers -# -# CONFIG_EDD is not set -CONFIG_FIRMWARE_MEMMAP=y -# CONFIG_DELL_RBU is not set -# CONFIG_DCDBAS is not set -# CONFIG_DMIID is not set -# CONFIG_ISCSI_IBFT_FIND is not set - -# -# File systems -# -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -# CONFIG_EXT4_FS is not set -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=y -# 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_BTRFS_FS is not set -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -# CONFIG_QUOTA is not set -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set -CONFIG_GENERIC_ACL=y - -# -# Caches -# -# CONFIG_FSCACHE is not set - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -# CONFIG_PROC_KCORE is not set -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -# CONFIG_CONFIGFS_FS is not set -# CONFIG_MISC_FILESYSTEMS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -# CONFIG_ATARI_PARTITION is not set -CONFIG_MAC_PARTITION=y -CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -# CONFIG_LDM_PARTITION is not set -CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_PRINTK_TIME=y -# CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=2048 -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_ARCH_WANT_FRAME_POINTERS=y -# CONFIG_FRAME_POINTER is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_LATENCYTOP is not set -# CONFIG_SYSCTL_SYSCALL_CHECK is not set -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FTRACE_SYSCALLS=y -CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_STRICT_DEVMEM is not set -CONFIG_X86_VERBOSE_BOOTUP=y -CONFIG_EARLY_PRINTK=y -# CONFIG_EARLY_PRINTK_DBGP is not set -# CONFIG_4KSTACKS is not set -CONFIG_DOUBLEFAULT=y -# CONFIG_IOMMU_STRESS is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -CONFIG_OPTIMIZE_INLINING=y - -# -# Security options -# -# CONFIG_KEYS is not set -# CONFIG_SECURITY is not set -# CONFIG_SECURITYFS is not set -CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -# CONFIG_CRYPTO_FIPS is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -# CONFIG_CRYPTO_GF128MUL is not set -# CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_AUTHENC is not set - -# -# Authenticated Encryption with Associated Data -# -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_SEQIV is not set - -# -# Block modes -# -# CONFIG_CRYPTO_CBC is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_XTS is not set - -# -# Hash modes -# -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set - -# -# Digest -# -# CONFIG_CRYPTO_CRC32C is not set -# CONFIG_CRYPTO_CRC32C_INTEL is not set -# CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=y -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_586 is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_DES is not set -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_586 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_TWOFISH_586 is not set - -# -# Compression -# -# CONFIG_CRYPTO_DEFLATE is not set -# CONFIG_CRYPTO_ZLIB is not set -# CONFIG_CRYPTO_LZO is not set - -# -# Random Number Generation -# -# CONFIG_CRYPTO_ANSI_CPRNG is not set -# CONFIG_CRYPTO_HW is not set -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -# CONFIG_VIRTUALIZATION is not set -# CONFIG_BINARY_PRINTF is not set - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=y -# CONFIG_CRC16 is not set -CONFIG_CRC_T10DIF=y -# CONFIG_CRC_ITU_T is not set -CONFIG_CRC32=y -# CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_NLATTR=y diff --git a/recipes/linux/linux_2.6.31.4.bb b/recipes/linux/linux_2.6.31.4.bb deleted file mode 100644 index 719c5eba68..0000000000 --- a/recipes/linux/linux_2.6.31.4.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux 2.6 kernel for the AMD Geode GX processor" -LICENSE = "GPL" - -require linux.inc -COMPATIBLE_MACHINE = "geodegx" - -PR = "r0" -S = "${WORKDIR}/linux-${PV}" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_geodegx = "1" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://defconfig" -- cgit v1.2.3 From 189fc6375fd364b98b4a9530f547984e159dd838 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Nov 2009 16:07:17 -0800 Subject: mono: Replace cross compilation workaround for x86 architecture. * Replace the workaround with backported patches from mono 2.4 branch Signed-off-by: Khem Raj --- .../mono-cross-compilation-for-amd64.patch | 167 +++++++++++++++++++-- recipes/mono/mono_2.4.2.3.bb | 2 +- 2 files changed, 156 insertions(+), 13 deletions(-) (limited to 'recipes') diff --git a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch index e8d91da148..3cf5473e8a 100644 --- a/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch +++ b/recipes/mono/mono-2.4.2.3/mono-cross-compilation-for-amd64.patch @@ -1,23 +1,166 @@ -This is a workaround for bug 515050 https://bugzilla.novell.com/show_bug.cgi?id=515050#c2 -Real fix is something else which did not make into 2.4.2 +Backport following fixes from mono-2-4 branch http://lists.ximian.com/pipermail/mono-patches/2009-June/151386.html http://lists.ximian.com/pipermail/mono-patches/2009-June/151387.html -but we are ok with workaround its safe. - -Khem Index: mono-2.4.2.3/mono/mini/genmdesc.pl =================================================================== ---- mono-2.4.2.3.orig/mono/mini/genmdesc.pl 2009-10-15 18:21:45.000000000 -0700 -+++ mono-2.4.2.3/mono/mini/genmdesc.pl 2009-10-15 18:22:19.000000000 -0700 -@@ -47,7 +47,7 @@ sub load_opcodes - $arch_define = "TARGET_ARM"; - } - -- $cpp .= " -D$arch_define $srcdir/mini-ops.h|"; -+ $cpp .= " -DMONO_ARCH_SUPPORT_SIMD_INTRINSICS -D$arch_define $srcdir/mini-ops.h|"; +--- mono-2.4.2.3.orig/mono/mini/genmdesc.pl 2009-11-04 15:36:19.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/genmdesc.pl 2009-11-04 15:36:27.000000000 -0800 +@@ -51,7 +51,7 @@ sub load_opcodes #print "Running: $cpp\n"; open (OPS, $cpp) || die "Cannot execute cpp: $!"; while () { +- next unless /MINI_OP\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; ++ next unless /MINI_OP3?\s*\(\s*(\S+?)\s*,\s*"(.*?)"/; + my ($sym, $name) = ($1, $2); + push @opcodes, [$sym, $name]; + $table{$name} = {num => $i, name => $name}; +@@ -159,16 +159,19 @@ sub build_table { + } + + sub usage { +- die "genmdesc.pl arch srcdir desc output name\n"; ++ die "genmdesc.pl arch srcdir output name desc [desc2 ...]\n"; + } + + my $arch = shift || usage (); + my $srcdir = shift || usage (); +-my $file = shift || usage (); + my $output = shift || usage (); + my $name = shift || usage (); ++usage () unless @ARGV; ++my @files = @ARGV; + + load_opcodes ($srcdir, $arch); +-load_file ($file); ++foreach my $file (@files) { ++ load_file ($file); ++} + build_table ($output, $name); + +Index: mono-2.4.2.3/mono/mini/Makefile.am +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/Makefile.am 2009-11-04 15:30:20.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/Makefile.am 2009-11-04 15:36:27.000000000 -0800 +@@ -422,40 +422,40 @@ GENMDESC_PRG=./genmdesc + endif !CROSS_COMPILING + + cpu-x86.h: cpu-x86.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-x86.md cpu-x86.h x86_desc ++ $(GENMDESC_PRG) cpu-x86.h x86_desc $(srcdir)/cpu-x86.md + + cpu-amd64.h: cpu-amd64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-amd64.md cpu-amd64.h amd64_desc ++ $(GENMDESC_PRG) cpu-amd64.h amd64_desc $(srcdir)/cpu-amd64.md + + cpu-ppc.h: cpu-ppc.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ppc.md cpu-ppc.h ppcg4 ++ $(GENMDESC_PRG) cpu-ppc.h ppcg4 $(srcdir)/cpu-ppc.md + + cpu-ppc64.h: cpu-ppc64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ppc64.md cpu-ppc64.h ppc64_cpu_desc ++ $(GENMDESC_PRG) cpu-ppc64.h ppc64_cpu_desc $(srcdir)/cpu-ppc64.md + + cpu-arm.h: cpu-arm.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-arm.md cpu-arm.h arm_cpu_desc ++ $(GENMDESC_PRG) cpu-arm.h arm_cpu_desc $(srcdir)/cpu-arm.md + + cpu-sparc.h: cpu-sparc.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-sparc.md cpu-sparc.h sparc_desc ++ $(GENMDESC_PRG) cpu-sparc.h sparc_desc $(srcdir)/cpu-sparc.md + + cpu-s390.h: cpu-s390.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-s390.md cpu-s390.h s390_cpu_desc ++ $(GENMDESC_PRG) cpu-s390.h s390_cpu_desc $(srcdir)/cpu-s390.md + + cpu-s390x.h: cpu-s390x.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-s390x.md cpu-s390x.h s390x_cpu_desc ++ $(GENMDESC_PRG) cpu-s390x.h s390x_cpu_desc $(srcdir)/cpu-s390x.md + + cpu-ia64.h: cpu-ia64.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-ia64.md cpu-ia64.h ia64_desc ++ $(GENMDESC_PRG) cpu-ia64.h ia64_desc $(srcdir)/cpu-ia64.md + + cpu-alpha.h: cpu-alpha.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-alpha.md cpu-alpha.h alpha_desc ++ $(GENMDESC_PRG) cpu-alpha.h alpha_desc $(srcdir)/cpu-alpha.md + + cpu-hppa.h: cpu-hppa.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-hppa.md cpu-hppa.h hppa_desc ++ $(GENMDESC_PRG) cpu-hppa.h hppa_desc $(srcdir)/cpu-hppa.md + + cpu-mips.h: cpu-mips.md genmdesc$(EXEEXT) +- $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc ++ $(GENMDESC_PRG) cpu-mips.h mips_desc $(srcdir)/cpu-mips.md + + testi: mono test.exe + $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe +Index: mono-2.4.2.3/mono/mini/genmdesc.c +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/genmdesc.c 2009-11-04 15:35:34.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/genmdesc.c 2009-11-04 15:36:27.000000000 -0800 +@@ -211,21 +211,20 @@ int + main (int argc, char* argv []) + { + init_table (); +- switch (argc) { +- case 2: ++ if (argc == 2) { + /* useful to get a new file when some opcodes are added: looses the comments, though */ + load_file (argv [1]); + dump (); +- break; +- case 4: +- load_file (argv [1]); +- build_table (argv [2], argv [3]); +- break; +- default: ++ } else if (argc < 4) { + g_print ("Usage: genmdesc arguments\n"); +- g_print ("\tgenmdesc desc Output to stdout the description file.\n"); +- g_print ("\tgenmdesc desc output name Write to output the description in a table named 'name'.\n"); ++ g_print ("\tgenmdesc desc Output to stdout the description file.\n"); ++ g_print ("\tgenmdesc output name desc [desc1...] Write to output the description in a table named 'name'.\n"); + return 1; ++ } else { ++ int i; ++ for (i = 3; i < argc; ++i) ++ load_file (argv [i]); ++ build_table (argv [1], argv [2]); + } + return 0; + } +Index: mono-2.4.2.3/mono/mini/mini-ops.h +=================================================================== +--- mono-2.4.2.3.orig/mono/mini/mini-ops.h 2009-11-04 15:35:34.000000000 -0800 ++++ mono-2.4.2.3/mono/mini/mini-ops.h 2009-11-04 15:38:37.000000000 -0800 +@@ -72,7 +72,7 @@ MINI_OP(OP_STOREI8_MEMBASE_REG, "storei8 + MINI_OP(OP_STORER4_MEMBASE_REG, "storer4_membase_reg", IREG, FREG, NONE) + MINI_OP(OP_STORER8_MEMBASE_REG, "storer8_membase_reg", IREG, FREG, NONE) + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + MINI_OP(OP_STOREX_MEMBASE_REG, "storex_membase_reg", IREG, XREG, NONE) + MINI_OP(OP_STOREX_ALIGNED_MEMBASE_REG, "storex_aligned_membase_reg", IREG, XREG, NONE) + MINI_OP(OP_STOREX_NTA_MEMBASE_REG, "storex_nta_membase_reg", IREG, XREG, NONE) +@@ -100,7 +100,7 @@ MINI_OP(OP_LOADR8_MEMBASE,"loadr8_membas + + MINI_OP(OP_LOADX_MEMBASE, "loadx_membase", XREG, IREG, NONE) + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + MINI_OP(OP_LOADX_ALIGNED_MEMBASE, "loadx_aligned_membase", XREG, IREG, NONE) + #endif + +@@ -578,7 +578,7 @@ MINI_OP(OP_NOT_NULL, "not_null", NONE, I + + /* SIMD opcodes. */ + +-#ifdef MONO_ARCH_SUPPORT_SIMD_INTRINSICS ++#if defined(TARGET_X86) || defined(TARGET_AMD64) + + MINI_OP(OP_ADDPS, "addps", XREG, XREG, XREG) + MINI_OP(OP_DIVPS, "divps", XREG, XREG, XREG) diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.4.2.3.bb index 5e659f3948..c6e36653db 100644 --- a/recipes/mono/mono_2.4.2.3.bb +++ b/recipes/mono/mono_2.4.2.3.bb @@ -2,7 +2,7 @@ require mono-${PV}.inc DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" # mono makes use of non-thumb-compatible inline asm. ARM_INSTRUCTION_SET = "arm" -- cgit v1.2.3 From ce3802e207ab25f2f8fe1c663aedb5038a92577f Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 10 Nov 2009 00:37:09 +0100 Subject: vala: add unofficial point release 0.7.8.1 --- recipes/vala/vala-native_0.7.8.1.bb | 3 +++ recipes/vala/vala-native_0.7.8.bb | 8 -------- recipes/vala/vala-native_git.bb | 6 ++---- recipes/vala/vala.inc | 2 +- recipes/vala/vala_0.7.8.1.bb | 2 ++ recipes/vala/vala_0.7.8.bb | 4 ---- 6 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 recipes/vala/vala-native_0.7.8.1.bb delete mode 100644 recipes/vala/vala-native_0.7.8.bb create mode 100644 recipes/vala/vala_0.7.8.1.bb delete mode 100644 recipes/vala/vala_0.7.8.bb (limited to 'recipes') diff --git a/recipes/vala/vala-native_0.7.8.1.bb b/recipes/vala/vala-native_0.7.8.1.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.8.1.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb deleted file mode 100644 index 7a5cad2d30..0000000000 --- a/recipes/vala/vala-native_0.7.8.bb +++ /dev/null @@ -1,8 +0,0 @@ -require vala.inc -inherit native - -PR = "r0" - -DEPENDS = "glib-2.0-native" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb index 545849b9d3..698ad4a301 100644 --- a/recipes/vala/vala-native_git.bb +++ b/recipes/vala/vala-native_git.bb @@ -3,11 +3,9 @@ inherit native DEPENDS = "glib-2.0-native" # vala from git always needs the latest released version to compile itself -DEPENDS += "vala-bootstrap-native" -PV = "0.6.0-fso1-gitr${SRCREV}" +PV = "0.7.0-fso1-gitr${SRCREV}" SRC_URI = "\ - ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \ - file://static-dbus-methods.patch;patch=1 \ + ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=pending-upstream-move \ " S = "${WORKDIR}/git" diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc index f45d557c88..258a3f7498 100644 --- a/recipes/vala/vala.inc +++ b/recipes/vala/vala.inc @@ -4,7 +4,7 @@ SECTION = "devel" DEPENDS = "glib-2.0 dbus" HOMEPAGE = "http://vala-project.org" LICENSE = "LGPL" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "http://www.freesmartphone.org/sources/vala-${PV}.tar.gz" diff --git a/recipes/vala/vala_0.7.8.1.bb b/recipes/vala/vala_0.7.8.1.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.8.1.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb deleted file mode 100644 index 2d0b5b7765..0000000000 --- a/recipes/vala/vala_0.7.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -require vala.inc -PR = "r0" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" -- cgit v1.2.3 From e6ee9ab2e4370d6b006a1578210b38fbd72fb91a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 9 Nov 2009 23:21:42 +0000 Subject: glibc-package.bbclass: Operate on PKG, not D after package.bbclass updates Signed-off-by: Richard Purdie --- recipes/glibc/glibc-package.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 179e41f734..f1e38e7c71 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -153,26 +153,26 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib + ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi - install -m 0755 ${D}${bindir}/localedef $treedir/bin + install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin } do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree - mkdir -p ${D}${libdir} - cp -pPR $treedir/${libdir}/locale ${D}${libdir} + mkdir -p ${PKGD}${libdir} + cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} } python package_do_split_gconvs () { -- cgit v1.2.3 From ebf3936f96740e7c950a12e993d27de93de33a68 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Nov 2009 10:51:09 +0100 Subject: curl-native: disable gnutls since we don't have a gnutls-native recipe * this fixes an opkg-native build bug --- recipes/curl/curl-native_7.19.6.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/curl/curl-native_7.19.6.bb b/recipes/curl/curl-native_7.19.6.bb index d395021512..b201530cf6 100644 --- a/recipes/curl/curl-native_7.19.6.bb +++ b/recipes/curl/curl-native_7.19.6.bb @@ -1,7 +1,9 @@ require curl-common.inc inherit native DEPENDS = "zlib-native" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" + +CURL_FEATURES = "zlib,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp" do_stage () { autotools_stage_all -- cgit v1.2.3 From df42e934d34da0e6b0e9e8c9e6e2bd85bd2c2a23 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 11:06:11 +0100 Subject: mythplugins: added mythweb (not fully tested yet) --- recipes/mythtv/mythplugins_0.21+0.22rc2.bb | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'recipes') diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb index 82b61db469..2b1f4d5714 100644 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -1,9 +1,8 @@ -# todo: add mythweb DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" -RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ - mythgame mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder" +RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \ + mythmusic mythmovies mythnews mythvideo mythweather mythweb mythzoneminder" PV = "0.21+0.22rc2" -PR = "r4" +PR = "r5" QMAKE_PROFILES = "mythplugins.pro" @@ -36,8 +35,24 @@ do_configure() { } do_install () { oe_runmake install INSTALL_ROOT="${D}" + install -d ${D}${datadir}/apache2 + install -d ${D}${datadir}/apache2/htdocs + install -d ${D}/etc/apache2 + install -d ${D}/etc/apache2/extra + cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ + cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf + sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf } +pkg_postinst_${PN}() { + chgrp -R apache /usr/share/apache2/htdocs/data + chmod g+rw /usr/share/apache2/htdocs/data + grep mythweb.conf /etc/apache2/httpd.conf || \ + echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf + +} + + PACKAGES =+ "mytharchive mytharchive-dbg \ mythbrowser mythbrowser-dbg \ mythflix mythflix-dbg \ @@ -48,6 +63,7 @@ PACKAGES =+ "mytharchive mytharchive-dbg \ mythnews mythnews-dbg \ mythvideo mythvideo-dbg \ mythweather mythweather-dbg \ + mythweb \ mythzoneminder mythzoneminder-dbg" FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ @@ -258,6 +274,9 @@ FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ " FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" +FILES_mythweb = "${datadir}/apache2/htdocs \ + /etc/apache2/extra/mythweb.conf" + FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \ ${datadir}/mythtv/zonemindermenu.xml \ ${datadir}/mythtv/i18n/mythzoneminder* \ -- cgit v1.2.3 From 9aa60a9740949921984e203c570c8299a6d4a01a Mon Sep 17 00:00:00 2001 From: Marc Olzheim Date: Mon, 9 Nov 2009 23:33:38 +0000 Subject: Move 3.0.2 to a .inc and use INC_PR (to avoid useless duplication). --- recipes/dhcp/dhcp3.inc | 62 ++++++++++++++++++++++++++++++++++++++++++++++ recipes/dhcp/dhcp_3.0.2.bb | 58 +++---------------------------------------- 2 files changed, 66 insertions(+), 54 deletions(-) create mode 100644 recipes/dhcp/dhcp3.inc (limited to 'recipes') diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc new file mode 100644 index 0000000000..f099003bee --- /dev/null +++ b/recipes/dhcp/dhcp3.inc @@ -0,0 +1,62 @@ +SECTION = "console/network" +DESCRIPTION = "Internet Software Consortium DHCP package" +HOMEPAGE = "http://www.isc.org/" +LICENSE = "BSD" +INC_PR = "r11" + +SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \ + file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ + file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ + file://init-relay file://default-relay \ + file://init-server file://default-server \ + file://dhclient.conf file://dhcpd.conf" + + +inherit update-rc.d + +INITSCRIPT_PACKAGES = "dhcp-server" +INITSCRIPT_NAME_dhcp-server = dhcp-server +INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ." + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure() { + ./configure +} + +do_compile() { + make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ + -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ + -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \ + -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ + -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' +} + +do_install() { + make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/dhcp + install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay + install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay + install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server + install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server + install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf + install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf + install -d ${D}/var/lib/dhcp3 +} + +PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" +FILES_${PN} = "" +FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" +FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" + +FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3" + +FILES_dhcp-omshell = "${bindir}/omshell" + +CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" +CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" +CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb index 052fa7e843..993459028b 100644 --- a/recipes/dhcp/dhcp_3.0.2.bb +++ b/recipes/dhcp/dhcp_3.0.2.bb @@ -1,62 +1,12 @@ -SECTION = "console/network" -DESCRIPTION = "Internet Software Consortium DHCP package" -HOMEPAGE = "http://www.isc.org/" -LICENSE = "BSD" -PR = "r10" +require dhcp3.inc + SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ - file://dhclient-script-exit-status.dpatch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" - -inherit update-rc.d - -INITSCRIPT_PACKAGES = "dhcp-server" -INITSCRIPT_NAME_dhcp-server = dhcp-server -INITSCRIPT_PARAMS_dhcp-server = "start 30 2 3 4 5 . stop 30 0 1 6 ." - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure() { - ./configure -} - -do_compile() { - make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ - -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \ - -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \ - -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ - -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' -} - -do_install() { - make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install -d ${D}${sysconfdir}/dhcp - install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay - install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay - install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server - install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server - install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf - install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf - install -d ${D}/var/lib/dhcp3 -} - -PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell" -FILES_${PN} = "" -FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" -FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" - -FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3" -RDEPENDS_dhcp-client = "bash" - -FILES_dhcp-omshell = "${bindir}/omshell" - -CONFFILES_dhcp-server_nylon = "/etc/dhcp/dhcpd.conf" -CONFFILES_dhcp-relay_nylon = "/etc/default/dhcp-relay" -CONFFILES_dhcp-client_nylon = "/etc/dhcp/dhclient.conf" +PR = "${INC_PR}" -- cgit v1.2.3 From 977aa17219ead613a86e21830fd49d32a8b5db45 Mon Sep 17 00:00:00 2001 From: Marc Olzheim Date: Mon, 9 Nov 2009 23:35:17 +0000 Subject: Add latest 3.1.2p1 (latest 3.x stable release). --- recipes/dhcp/dhcp_3.1.2p1.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipes/dhcp/dhcp_3.1.2p1.bb (limited to 'recipes') diff --git a/recipes/dhcp/dhcp_3.1.2p1.bb b/recipes/dhcp/dhcp_3.1.2p1.bb new file mode 100644 index 0000000000..e57fb016a9 --- /dev/null +++ b/recipes/dhcp/dhcp_3.1.2p1.bb @@ -0,0 +1,11 @@ +require dhcp3.inc + +SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \ + file://fixincludes.patch;patch=1 \ + file://dhclient-script-exit-status.dpatch;patch=1 \ + file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ + file://init-relay file://default-relay \ + file://init-server file://default-server \ + file://dhclient.conf file://dhcpd.conf" + +PR = "${INC_PR}" -- cgit v1.2.3 From 1fb32f0c6a85abc3397d16f6779a546696b86b2d Mon Sep 17 00:00:00 2001 From: Marc Olzheim Date: Mon, 9 Nov 2009 23:38:58 +0000 Subject: Get rid of useless bash dependency in the linux client script. --- recipes/dhcp/dhcp_3.0.1.bb | 3 ++- recipes/dhcp/dhcp_3.0.2.bb | 3 ++- recipes/dhcp/dhcp_3.1.2p1.bb | 3 ++- recipes/dhcp/files/useless-use-of-bash.patch | 8 ++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 recipes/dhcp/files/useless-use-of-bash.patch (limited to 'recipes') diff --git a/recipes/dhcp/dhcp_3.0.1.bb b/recipes/dhcp/dhcp_3.0.1.bb index 7d55dc3a03..2deee26a0c 100644 --- a/recipes/dhcp/dhcp_3.0.1.bb +++ b/recipes/dhcp/dhcp_3.0.1.bb @@ -2,10 +2,11 @@ SECTION = "console/network" DESCRIPTION = "Internet Software Consortium DHCP package" HOMEPAGE = "http://www.isc.org/" LICENSE = "BSD" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" diff --git a/recipes/dhcp/dhcp_3.0.2.bb b/recipes/dhcp/dhcp_3.0.2.bb index 993459028b..3c3c742b33 100644 --- a/recipes/dhcp/dhcp_3.0.2.bb +++ b/recipes/dhcp/dhcp_3.0.2.bb @@ -3,10 +3,11 @@ require dhcp3.inc SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \ file://noattrmode.patch;patch=1 \ file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ file://dhclient-script-exit-status.dpatch;patch=1 \ file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" -PR = "${INC_PR}" +PR = "${INC_PR}.0" diff --git a/recipes/dhcp/dhcp_3.1.2p1.bb b/recipes/dhcp/dhcp_3.1.2p1.bb index e57fb016a9..4900a49789 100644 --- a/recipes/dhcp/dhcp_3.1.2p1.bb +++ b/recipes/dhcp/dhcp_3.1.2p1.bb @@ -2,10 +2,11 @@ require dhcp3.inc SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.1-history/dhcp-${PV}.tar.gz \ file://fixincludes.patch;patch=1 \ + file://useless-use-of-bash.patch;patch=1 \ file://dhclient-script-exit-status.dpatch;patch=1 \ file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \ file://init-relay file://default-relay \ file://init-server file://default-server \ file://dhclient.conf file://dhcpd.conf" -PR = "${INC_PR}" +PR = "${INC_PR}.0" diff --git a/recipes/dhcp/files/useless-use-of-bash.patch b/recipes/dhcp/files/useless-use-of-bash.patch new file mode 100644 index 0000000000..6628fe7274 --- /dev/null +++ b/recipes/dhcp/files/useless-use-of-bash.patch @@ -0,0 +1,8 @@ +--- dhcp-3.0.2p1/client/scripts/linux 2006-07-22 04:24:16.000000000 +0200 ++++ dhcp-3.0.2p1/client/scripts/linux 2009-11-03 17:51:55.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # dhclient-script for Linux. Dan Halbert, March, 1997. + # Updated for Linux 2.[12] by Brian J. Murrell, January 1999. + # No guarantees about this. I'm a novice at the details of Linux -- cgit v1.2.3 From 97bc0069b87614d696913ba736474752c9ed169c Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 11:43:53 +0100 Subject: mysql5: removed DEFAULT_PREFERENCE="-1" i(as discussed on email and irc) --- recipes/mysql/mysql5_5.1.40.inc | 2 - recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch | 61 ----------- recipes/mythtv/mythtv-0.22/configure.patch | 61 +++++++++++ recipes/mythtv/mythtv_0.21+0.22rc2.bb | 121 --------------------- recipes/mythtv/mythtv_0.22.bb | 121 +++++++++++++++++++++ 5 files changed, 182 insertions(+), 184 deletions(-) delete mode 100644 recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch create mode 100644 recipes/mythtv/mythtv-0.22/configure.patch delete mode 100644 recipes/mythtv/mythtv_0.21+0.22rc2.bb create mode 100644 recipes/mythtv/mythtv_0.22.bb (limited to 'recipes') diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc index 2edab16f55..aa69831397 100644 --- a/recipes/mysql/mysql5_5.1.40.inc +++ b/recipes/mysql/mysql5_5.1.40.inc @@ -5,8 +5,6 @@ LICENSE = "GPL" DEPENDS = "ncurses" PR = "r2" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ file://plug.in.patch;patch=1 \ diff --git a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch b/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch deleted file mode 100644 index 748c88d9fc..0000000000 --- a/recipes/mythtv/mythtv-0.21+0.22rc2/configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: mythtv/configure -=================================================================== ---- mythtv/configure (revision 22430) -+++ mythtv/configure (working copy) -@@ -919,27 +919,27 @@ - #deprecated, use check_lib or check_lib2 instead - has_library() - { -- if test -f /etc/ld.so.conf ; then -- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` -- else -- LIBPATHS='' -- fi -+ LIBPATHS='' -+ if test "x${sysroot}" = "x" ; then -+ if test -f /etc/ld.so.conf ; then -+ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` -+ fi -+ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " -+ # Mac OS X has a different variable for this: -+ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " - -- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " -- # Mac OS X has a different variable for this: -- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " -- -- # recurse down just one level, should be enough in most cases -- if test -f /etc/ld.so.conf ; then -- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` -- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` -- for x in $SRCH ; do -- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` -- LIBPATHS="$LIBPATHS $LP_APPEND" -- done -+ # recurse down just one level, should be enough in most cases -+ if test -f /etc/ld.so.conf ; then -+ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` -+ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` -+ for x in $SRCH ; do -+ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` -+ LIBPATHS="$LIBPATHS $LP_APPEND" -+ done -+ fi - fi - -- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " -+ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " - - HAS_IT="no" - for LIBPATH in $LIBPATHS ; do -@@ -4252,8 +4252,8 @@ - # -L from early in the link line, to ignore any old installed libmyth* - # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include - # directories, it cannot be modified. --QMAKE_LIBDIR_QT -= $libdir --LATE_LIBS += -L$libdir -+QMAKE_LIBDIR_QT -= ${sysroot}${libdir} -+LATE_LIBS += -L${sysroot}${libdir} - EOF - - diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 diff --git a/recipes/mythtv/mythtv-0.22/configure.patch b/recipes/mythtv/mythtv-0.22/configure.patch new file mode 100644 index 0000000000..748c88d9fc --- /dev/null +++ b/recipes/mythtv/mythtv-0.22/configure.patch @@ -0,0 +1,61 @@ +Index: mythtv/configure +=================================================================== +--- mythtv/configure (revision 22430) ++++ mythtv/configure (working copy) +@@ -919,27 +919,27 @@ + #deprecated, use check_lib or check_lib2 instead + has_library() + { +- if test -f /etc/ld.so.conf ; then +- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` +- else +- LIBPATHS='' +- fi ++ LIBPATHS='' ++ if test "x${sysroot}" = "x" ; then ++ if test -f /etc/ld.so.conf ; then ++ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` ++ fi ++ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " ++ # Mac OS X has a different variable for this: ++ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " + +- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` " +- # Mac OS X has a different variable for this: +- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " +- +- # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then +- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` +- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` +- for x in $SRCH ; do +- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` +- LIBPATHS="$LIBPATHS $LP_APPEND" +- done ++ # recurse down just one level, should be enough in most cases ++ if test -f /etc/ld.so.conf ; then ++ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` ++ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` ++ for x in $SRCH ; do ++ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"` ++ LIBPATHS="$LIBPATHS $LP_APPEND" ++ done ++ fi + fi + +- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " ++ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + + HAS_IT="no" + for LIBPATH in $LIBPATHS ; do +@@ -4252,8 +4252,8 @@ + # -L from early in the link line, to ignore any old installed libmyth* + # Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include + # directories, it cannot be modified. +-QMAKE_LIBDIR_QT -= $libdir +-LATE_LIBS += -L$libdir ++QMAKE_LIBDIR_QT -= ${sysroot}${libdir} ++LATE_LIBS += -L${sysroot}${libdir} + EOF + + diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1 diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.21+0.22rc2.bb deleted file mode 100644 index bc85a1ad86..0000000000 --- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb +++ /dev/null @@ -1,121 +0,0 @@ -require mythtv.inc - -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" -RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" - -PV = "0.21+0.22rc2" -PR = "r3" -REALPV = "0.22" - -DEFAULT_PREFERENCE = "-1" -ALLOW_EMPTY_${PN} = "1" - -QMAKE_PROFILES = "mythtv.pro" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \ - file://configure.patch;patch=1 \ - " - -S = "${WORKDIR}/mythtv-0.22rc2" - -inherit qmake2 qt4x11 - -EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" -EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te" -EXTRA_MYTHTVCONF ?= "" -EXTRA_OECONF = " \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_HOST} \ - --prefix=${prefix} \ - --arch=${TARGET_ARCH} \ - \ - --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-ldflags="${TARGET_LDFLAGS}" \ - ${EXTRA_MYTHTVCONF} \ -" - -do_configure_prepend() { -# it's not autotools anyway, so we call ./configure directly - find . -name "Makefile"|xargs rm -f - ./configure --qmake=qmake2 \ - --disable-altivec \ - --disable-opengl \ - --disable-stripping \ - --disable-xvmc \ - --enable-v4l \ - --enable-audio-oss \ - --enable-dvb \ - --enable-libmp3lame \ - --dvb-path=${STAGING_INCDIR} \ - --without-bindings=perl,python \ - ${EXTRA_OECONF} -} -do_install() { - oe_runmake INSTALL_ROOT=${D} install - install -d ${D}${datadir}/mythtv - install -d ${D}${datadir}/mythtv/sql - install -m 0644 ${S}/database/mc.sql ${D}${datadir}/mythtv/sql -} -do_stage() { - install -d ${STAGING_INCDIR} - install -d ${STAGING_INCDIR}/${PN} - install -d ${STAGING_INCDIR}/${PN}/dvdnav - install -d ${STAGING_INCDIR}/${PN}/dvdread - install -d ${STAGING_INCDIR}/${PN}/libavcodec - install -d ${STAGING_INCDIR}/${PN}/libavformat - install -d ${STAGING_INCDIR}/${PN}/libavutil - install -d ${STAGING_INCDIR}/${PN}/libmyth - install -d ${STAGING_INCDIR}/${PN}/libmythdb - install -d ${STAGING_INCDIR}/${PN}/libmythui - install -d ${STAGING_INCDIR}/${PN}/libswscale - install -d ${STAGING_INCDIR}/${PN}/mpeg2dec - install -d ${STAGING_INCDIR}/${PN}/upnp - install -m 0644 ${D}/${includedir}/${PN}/*.h ${STAGING_INCDIR}/${PN} - install -m 0644 ${D}/${includedir}/${PN}/mythconfig.mak ${STAGING_INCDIR}/${PN} - install -m 0644 ${D}/${includedir}/${PN}/dvdnav/*.h ${STAGING_INCDIR}/${PN}/dvdnav - install -m 0644 ${D}/${includedir}/${PN}/dvdread/*.h ${STAGING_INCDIR}/${PN}/dvdread - install -m 0644 ${D}/${includedir}/${PN}/libavcodec/*.h ${STAGING_INCDIR}/${PN}/libavcodec - install -m 0644 ${D}/${includedir}/${PN}/libavformat/*.h ${STAGING_INCDIR}/${PN}/libavformat - install -m 0644 ${D}/${includedir}/${PN}/libavutil/*.h ${STAGING_INCDIR}/${PN}/libavutil - install -m 0644 ${D}/${includedir}/${PN}/libmyth/*.h ${STAGING_INCDIR}/${PN}/libmyth - install -m 0644 ${D}/${includedir}/${PN}/libmythdb/*.h ${STAGING_INCDIR}/${PN}/libmythdb - install -m 0644 ${D}/${includedir}/${PN}/libmythui/*.h ${STAGING_INCDIR}/${PN}/libmythui - install -m 0644 ${D}/${includedir}/${PN}/libswscale/*.h ${STAGING_INCDIR}/${PN}/libswscale - install -m 0644 ${D}/${includedir}/${PN}/mpeg2dec/*.h ${STAGING_INCDIR}/${PN}/mpeg2dec - install -m 0644 ${D}/${includedir}/${PN}/upnp/*.h ${STAGING_INCDIR}/${PN}/upnp - # next part may need to be done better - cp -R ${D}/${libdir}/* ${STAGING_LIBDIR} - # ugly chmod ahead - chmod -R ugo+r ${STAGING_LIBDIR} -} - -PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" -PACKAGES_DYNAMIC = "mythtv-theme-*" - -FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" -FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" -FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" -FILES_mythtv-bin = "${bindir}/*" -FILES_mythtv-filters = "${libdir}/mythtv/filters/*" -FILES_mythtv-database = "${datadir}/mythtv/sql/" - -mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" - -python __anonymous () { - import bb - mythlibs = bb.data.getVar('mythlibs', d).split() - pv = bb.data.expand(bb.data.getVar("REALPV", d), d) - for m in mythlibs: - bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) - bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) - packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) - bb.data.setVar("PACKAGES", packages, d) -} -python populate_packages_prepend () { - new_packages = [] - def the_hook(file, pkg, pattern, format, basename): - new_packages.append(pkg) - do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) - bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) -} diff --git a/recipes/mythtv/mythtv_0.22.bb b/recipes/mythtv/mythtv_0.22.bb new file mode 100644 index 0000000000..bc85a1ad86 --- /dev/null +++ b/recipes/mythtv/mythtv_0.22.bb @@ -0,0 +1,121 @@ +require mythtv.inc + +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" +RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" + +PV = "0.21+0.22rc2" +PR = "r3" +REALPV = "0.22" + +DEFAULT_PREFERENCE = "-1" +ALLOW_EMPTY_${PN} = "1" + +QMAKE_PROFILES = "mythtv.pro" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \ + file://configure.patch;patch=1 \ + " + +S = "${WORKDIR}/mythtv-0.22rc2" + +inherit qmake2 qt4x11 + +EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" +EXTRA_MYTHTVCONF_armv5te = "--cpu=armv5te" +EXTRA_MYTHTVCONF ?= "" +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + --arch=${TARGET_ARCH} \ + \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + ${EXTRA_MYTHTVCONF} \ +" + +do_configure_prepend() { +# it's not autotools anyway, so we call ./configure directly + find . -name "Makefile"|xargs rm -f + ./configure --qmake=qmake2 \ + --disable-altivec \ + --disable-opengl \ + --disable-stripping \ + --disable-xvmc \ + --enable-v4l \ + --enable-audio-oss \ + --enable-dvb \ + --enable-libmp3lame \ + --dvb-path=${STAGING_INCDIR} \ + --without-bindings=perl,python \ + ${EXTRA_OECONF} +} +do_install() { + oe_runmake INSTALL_ROOT=${D} install + install -d ${D}${datadir}/mythtv + install -d ${D}${datadir}/mythtv/sql + install -m 0644 ${S}/database/mc.sql ${D}${datadir}/mythtv/sql +} +do_stage() { + install -d ${STAGING_INCDIR} + install -d ${STAGING_INCDIR}/${PN} + install -d ${STAGING_INCDIR}/${PN}/dvdnav + install -d ${STAGING_INCDIR}/${PN}/dvdread + install -d ${STAGING_INCDIR}/${PN}/libavcodec + install -d ${STAGING_INCDIR}/${PN}/libavformat + install -d ${STAGING_INCDIR}/${PN}/libavutil + install -d ${STAGING_INCDIR}/${PN}/libmyth + install -d ${STAGING_INCDIR}/${PN}/libmythdb + install -d ${STAGING_INCDIR}/${PN}/libmythui + install -d ${STAGING_INCDIR}/${PN}/libswscale + install -d ${STAGING_INCDIR}/${PN}/mpeg2dec + install -d ${STAGING_INCDIR}/${PN}/upnp + install -m 0644 ${D}/${includedir}/${PN}/*.h ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/mythconfig.mak ${STAGING_INCDIR}/${PN} + install -m 0644 ${D}/${includedir}/${PN}/dvdnav/*.h ${STAGING_INCDIR}/${PN}/dvdnav + install -m 0644 ${D}/${includedir}/${PN}/dvdread/*.h ${STAGING_INCDIR}/${PN}/dvdread + install -m 0644 ${D}/${includedir}/${PN}/libavcodec/*.h ${STAGING_INCDIR}/${PN}/libavcodec + install -m 0644 ${D}/${includedir}/${PN}/libavformat/*.h ${STAGING_INCDIR}/${PN}/libavformat + install -m 0644 ${D}/${includedir}/${PN}/libavutil/*.h ${STAGING_INCDIR}/${PN}/libavutil + install -m 0644 ${D}/${includedir}/${PN}/libmyth/*.h ${STAGING_INCDIR}/${PN}/libmyth + install -m 0644 ${D}/${includedir}/${PN}/libmythdb/*.h ${STAGING_INCDIR}/${PN}/libmythdb + install -m 0644 ${D}/${includedir}/${PN}/libmythui/*.h ${STAGING_INCDIR}/${PN}/libmythui + install -m 0644 ${D}/${includedir}/${PN}/libswscale/*.h ${STAGING_INCDIR}/${PN}/libswscale + install -m 0644 ${D}/${includedir}/${PN}/mpeg2dec/*.h ${STAGING_INCDIR}/${PN}/mpeg2dec + install -m 0644 ${D}/${includedir}/${PN}/upnp/*.h ${STAGING_INCDIR}/${PN}/upnp + # next part may need to be done better + cp -R ${D}/${libdir}/* ${STAGING_LIBDIR} + # ugly chmod ahead + chmod -R ugo+r ${STAGING_LIBDIR} +} + +PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" +PACKAGES_DYNAMIC = "mythtv-theme-*" + +FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" +FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" +FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" +FILES_mythtv-bin = "${bindir}/*" +FILES_mythtv-filters = "${libdir}/mythtv/filters/*" +FILES_mythtv-database = "${datadir}/mythtv/sql/" + +mythlibs = "mythdb mythavutil mythavcodec mythavformat mythswscale mythhdhomerun myth mythtv mythui mythfreemheg mythupnp mythlivemedia" + +python __anonymous () { + import bb + mythlibs = bb.data.getVar('mythlibs', d).split() + pv = bb.data.expand(bb.data.getVar("REALPV", d), d) + for m in mythlibs: + bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) + bb.data.setVar("FILES_lib%s%s-dev" % (m, pv), "${libdir}/lib%s-%s.*" % (m, pv), d) + packages = " ".join(map(lambda x: "lib%s%s lib%s%s-dev" % (x, pv, x, pv), mythlibs) + bb.data.getVar("PACKAGES", d).split()) + bb.data.setVar("PACKAGES", packages, d) +} +python populate_packages_prepend () { + new_packages = [] + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + do_split_packages(d, root=bb.data.expand('${datadir}/mythtv/themes', d), file_regex='(.*)', output_pattern='mythtv-theme-%s', description='MythTV theme %s', allow_dirs=True, hook=the_hook, prepend=True) + bb.data.setVar("RDEPENDS_${PN}", "%s %s" % (bb.data.getVar("RDEPENDS_${PN}", d), " ".join(new_packages)), d) +} -- cgit v1.2.3 From e7e57a26a9d36e309bdaf277f8c48ba7a808d9cc Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 12:12:28 +0100 Subject: mythtv: upgraded recipe to 0.22, removed DEFAULT_PREFERENCE="-1"; added dependency to mysql5 --- recipes/mythtv/mythtv_0.22.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'recipes') diff --git a/recipes/mythtv/mythtv_0.22.bb b/recipes/mythtv/mythtv_0.22.bb index bc85a1ad86..0ff2b4d0c6 100644 --- a/recipes/mythtv/mythtv_0.22.bb +++ b/recipes/mythtv/mythtv_0.22.bb @@ -1,22 +1,25 @@ require mythtv.inc -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-database \ +mysql5-server mysql5-client" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" -PV = "0.21+0.22rc2" -PR = "r3" +PV = "0.22" +PR = "r0" +# REALPV is here to support release candidates +# OE in that case has as PV something like 0.21+0.22rc1 +# but for packaging the real PV is needed REALPV = "0.22" -DEFAULT_PREFERENCE = "-1" ALLOW_EMPTY_${PN} = "1" QMAKE_PROFILES = "mythtv.pro" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2 \ +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2 \ file://configure.patch;patch=1 \ " -S = "${WORKDIR}/mythtv-0.22rc2" +S = "${WORKDIR}/mythtv-0.22" inherit qmake2 qt4x11 -- cgit v1.2.3 From 097108055b706e34717da7751a2be940e40bacd7 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 12:16:46 +0100 Subject: myththemes: updated to 0.22 --- recipes/mythtv/myththemes_0.21+0.22rc2.bb | 19 ------------------- recipes/mythtv/myththemes_0.22.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 recipes/mythtv/myththemes_0.21+0.22rc2.bb create mode 100644 recipes/mythtv/myththemes_0.22.bb (limited to 'recipes') diff --git a/recipes/mythtv/myththemes_0.21+0.22rc2.bb b/recipes/mythtv/myththemes_0.21+0.22rc2.bb deleted file mode 100644 index a3be987fe9..0000000000 --- a/recipes/mythtv/myththemes_0.21+0.22rc2.bb +++ /dev/null @@ -1,19 +0,0 @@ -inherit qmake2 - -PV = "0.21+0.22rc2" -PR = "r0" - -FILES_${PN} =+ "${datadir}" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2" - -S = "${WORKDIR}/myththemes-0.22rc2" - -do_configure() { - ${S}/configure --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} -} - -do_install () { - oe_runmake install INSTALL_ROOT=${D} -} - diff --git a/recipes/mythtv/myththemes_0.22.bb b/recipes/mythtv/myththemes_0.22.bb new file mode 100644 index 0000000000..444786a434 --- /dev/null +++ b/recipes/mythtv/myththemes_0.22.bb @@ -0,0 +1,19 @@ +inherit qmake2 + +PV = "0.22" +PR = "r0" + +FILES_${PN} =+ "${datadir}" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2" + +S = "${WORKDIR}/myththemes-0.22" + +do_configure() { + ${S}/configure --qmake=qmake2 --sysroot=${STAGING_DIR_HOST} --prefix=${prefix} +} + +do_install () { + oe_runmake install INSTALL_ROOT=${D} +} + -- cgit v1.2.3 From f6eb78a867e439f4cd67ce2a9fc06eb74743a909 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 Nov 2009 11:23:44 +0000 Subject: elibc-package.bbclass: Operate on PKG, not D after package.bbclass updates Signed-off-by: Richard Purdie --- recipes/eglibc/eglibc-package.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index a50ec61ae7..27437f6021 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -152,23 +152,23 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${PKGD}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls -d ${D}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib + ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib fi - install -m 0755 ${D}${bindir}/localedef $treedir/bin + install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin } do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree - mkdir -p ${D}${libdir} - cp -pPR $treedir/${libdir}/locale ${D}${libdir} + mkdir -p ${PKGD}${libdir} + cp -pPR $treedir/${libdir}/locale ${PKGD}${libdir} } python package_do_split_gconvs () { -- cgit v1.2.3 From 313105650b9f76190cbd130310526b1200574e31 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 13:11:49 +0100 Subject: mythplugins moved to 0.22 --- recipes/mythtv/mythplugins_0.21+0.22rc2.bb | 291 ----------------------------- recipes/mythtv/mythplugins_0.22.bb | 291 +++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 291 deletions(-) delete mode 100644 recipes/mythtv/mythplugins_0.21+0.22rc2.bb create mode 100644 recipes/mythtv/mythplugins_0.22.bb (limited to 'recipes') diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb deleted file mode 100644 index 2b1f4d5714..0000000000 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ /dev/null @@ -1,291 +0,0 @@ -DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" -RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \ - mythmusic mythmovies mythnews mythvideo mythweather mythweb mythzoneminder" -PV = "0.21+0.22rc2" -PR = "r5" - -QMAKE_PROFILES = "mythplugins.pro" - -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ - file://sysroot.patch;patch=1 \ - file://mythplugins_wo_qtopengl.diff;patch=1 \ - file://configure.patch;patch=1 \ - file://mytharchive.pro.patch;patch=1 \ - " - -S = "${WORKDIR}/mythplugins-0.22rc2" - -inherit qmake2 qt4x11 - -EXTRA_OECONF = " \ - --cross-prefix=${TARGET_PREFIX} \ - --sysroot=${STAGING_DIR_HOST} \ - --prefix=${prefix} \ - --with-libdir-name=${STAGING_LIBDIR} \ - --disable-opengl \ - \ - --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ - --extra-ldflags="${TARGET_LDFLAGS}" \ - ${EXTRA_MYTHTVCONF} \ -" - -do_configure() { - ${S}/configure --qmake=qmake2 ${EXTRA_OECONF} -} -do_install () { - oe_runmake install INSTALL_ROOT="${D}" - install -d ${D}${datadir}/apache2 - install -d ${D}${datadir}/apache2/htdocs - install -d ${D}/etc/apache2 - install -d ${D}/etc/apache2/extra - cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ - cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf - sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf -} - -pkg_postinst_${PN}() { - chgrp -R apache /usr/share/apache2/htdocs/data - chmod g+rw /usr/share/apache2/htdocs/data - grep mythweb.conf /etc/apache2/httpd.conf || \ - echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf - -} - - -PACKAGES =+ "mytharchive mytharchive-dbg \ - mythbrowser mythbrowser-dbg \ - mythflix mythflix-dbg \ - mythgallery mythgallery-dbg \ - mythgame mythgame-dbg \ - mythmovies mythmovies-dbg \ - mythmusic mythmusic-dbg \ - mythnews mythnews-dbg \ - mythvideo mythvideo-dbg \ - mythweather mythweather-dbg \ - mythweb \ - mythzoneminder mythzoneminder-dbg" - -FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ - ${bindir}/mytharchivehelper \ - ${datadir}/mythtv/i18n/mytharchive* \ - ${datadir}/mythtv/mytharchive/* \ - ${datadir}/mythtv/archiveformat.xml \ - ${datadir}/mythtv/archivemenu.xml \ - ${datadir}/mythtv/archiveutils.xml \ - ${datadir}/mythtv/themes/default/mytharchive-ui.xml \ - ${datadir}/mythtv/themes/default/mythburn-ui.xml \ - ${datadir}/mythtv/themes/default/mythnative-ui.xml \ - ${datadir}/mythtv/themes/default/ma_*.png \ - ${datadir}/mythtv/themes/default/mb_progressbar_background.png \ - ${datadir}/mythtv/themes/default/mb_progressbar_fill.png \ - ${datadir}/mythtv/themes/default-wide/mytharchive-ui.xml \ - ${datadir}/mythtv/themes/default-wide/mythburn-ui.xml \ - ${datadir}/mythtv/themes/default-wide/mythnative-ui.xml \ - " -FILES_mytharchive-dbg = "${bindir}/.debug/mytharchivehelper \ - ${libdir}/mythtv/plugins/.debug/libmytharchive.so" -FILES_mythbrowser = "${libdir}/mythtv/plugins/libmythbrowser.so \ - ${bindir}/mythbrowser \ - ${datadir}/mythtv/i18n/mythbrowser* \ - ${datadir}/mythtv/themes/default/browser-ui.xml \ - ${datadir}/mythtv/themes/default-wide/browser-ui.xml \ - " -FILES_mythbrowser-dbg = "${libdir}/mythtv/plugins/.debug/libmythbrowser.so" -FILES_mythflix = "${libdir}/mythtv/plugins/libmythflix.so \ - ${datadir}/mythtv/i18n/mythflix* \ - ${datadir}/mythtv/mythflix/* \ - ${datadir}/mythtv/netflix_menu.xml \ - ${datadir}/mythtv/themes/default/mythflix_background.png \ - ${datadir}/mythtv/themes/default/netflix-ui.xml \ - ${datadir}/mythtv/themes/default-wide/netflix-ui.xml \ - ${datadir}/mythtv/themes/default/title_netflix.png \ - ${datadir}/mythtv/themes/default-wide/netflix-bg.png \ - " -FILES_mythflix-dbg = "${libdir}/mythtv/plugins/.debug/libmythflix.so" -FILES_mythgallery = "${libdir}/mythtv/plugins/libmythgallery.so \ - ${datadir}/mythtv/i18n/mythgallery* \ - ${datadir}/mythtv/themes/default/gallery*.png \ - ${datadir}/mythtv/themes/default/gallery-ui.xml \ - ${datadir}/mythtv/themes/default-wide/gallery-ui.xml \ - " -FILES_mythgallery-dbg = "${libdir}/mythtv/plugins/.debug/libmythgallery.so" -FILES_mythgame = "${libdir}/mythtv/plugins/libmythgame.so \ - ${datadir}/mythtv/i18n/mythgame* \ - ${datadir}/mythtv/game_settings.xml \ - ${datadir}/mythtv/themes/default/game-ui.xml \ - ${datadir}/mythtv/themes/default-wide/game-ui.xml \ - " -FILES_mythgame-dbg = "${libdir}/mythtv/plugins/.debug/libmythgame.so" -FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \ - ${bindir}/ignyte \ - ${datadir}/mythtv/mythmovies/* \ - ${datadir}/mythtv/i18n/mythmovies* \ - ${datadir}/mythtv/themes/default/movies-ui.xml \ - ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ - " -FILES_mythmovies-dbg = "${bindir}/.debug/ignyte \ - ${libdir}/mythtv/plugins/.debug/libmythmovies.so" -FILES_mythmusic = "${libdir}/mythtv/plugins/libmythmusic.so \ - ${datadir}/mythtv/mythmusic/* \ - ${datadir}/mythtv/i18n/mythmusic* \ - ${datadir}/mythtv/music_settings.xml \ - ${datadir}/mythtv/musicmenu.xml \ - ${datadir}/mythtv/themes/default/selectionbar.png \ - ${datadir}/mythtv/themes/default/mm_browser_back_reg.png \ - ${datadir}/mythtv/themes/default/music-sel-bg.png \ - ${datadir}/mythtv/themes/default/mm_rip_banner.png \ - ${datadir}/mythtv/themes/default/mm_prev_on.png \ - ${datadir}/mythtv/themes/default/next_button_off.png \ - ${datadir}/mythtv/themes/default/mm_next_pushed.png \ - ${datadir}/mythtv/themes/default/stop_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_folder.png \ - ${datadir}/mythtv/themes/default/mm_left_arrow.png \ - ${datadir}/mythtv/themes/default/rew_button_on.png \ - ${datadir}/mythtv/themes/default/next_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_trans_background.png \ - ${datadir}/mythtv/themes/default/prev_button_off.png \ - ${datadir}/mythtv/themes/default/mm_browser_back_sel.png \ - ${datadir}/mythtv/themes/default/ff_button_off.png \ - ${datadir}/mythtv/themes/default/mm_volume_tick.png \ - ${datadir}/mythtv/themes/default/stop_button_off.png \ - ${datadir}/mythtv/themes/default/mm_progress-fg.png \ - ${datadir}/mythtv/themes/default/mm_rip_background.png \ - ${datadir}/mythtv/themes/default/rew_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_next_off.png \ - ${datadir}/mythtv/themes/default/mm_next_on.png \ - ${datadir}/mythtv/themes/default/pause_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_nothumb.png \ - ${datadir}/mythtv/themes/default/stop_button_on.png \ - ${datadir}/mythtv/themes/default/mm_blackhole_border.png \ - ${datadir}/mythtv/themes/default/mm_prev_pushed.png \ - ${datadir}/mythtv/themes/default/pause_button_on.png \ - ${datadir}/mythtv/themes/default/play_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_progress_foreground.png \ - ${datadir}/mythtv/themes/default/pause_button_off.png \ - ${datadir}/mythtv/themes/default/play_button_off.png \ - ${datadir}/mythtv/themes/default/mm_progress_background.png \ - ${datadir}/mythtv/themes/default/mm_up_arrow.png \ - ${datadir}/mythtv/themes/default/prev_button_on.png \ - ${datadir}/mythtv/themes/default/mm_volume_background.png \ - ${datadir}/mythtv/themes/default/ff_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_prev_off.png \ - ${datadir}/mythtv/themes/default/miniplayer_background.png \ - ${datadir}/mythtv/themes/default/mm_progress-bg.png \ - ${datadir}/mythtv/themes/default/track_info_background.png \ - ${datadir}/mythtv/themes/default/mm_waiting.png \ - ${datadir}/mythtv/themes/default/play_button_on.png \ - ${datadir}/mythtv/themes/default/prev_button_pushed.png \ - ${datadir}/mythtv/themes/default/mm_right_arrow.png \ - ${datadir}/mythtv/themes/default/ff_button_on.png \ - ${datadir}/mythtv/themes/default/mm_down_arrow.png \ - ${datadir}/mythtv/themes/default/next_button_on.png \ - ${datadir}/mythtv/themes/default/mm_rating.png \ - ${datadir}/mythtv/themes/default/rew_button_off.png \ - ${datadir}/mythtv/themes/default/mm-titlelines.png \ - ${datadir}/mythtv/themes/default-wide/music-sel-bg.png \ - ${datadir}/mythtv/themes/default-wide/mm_blackhole_border.png \ - ${datadir}/mythtv/themes/default-wide/mm_volume_background.png \ - ${datadir}/mythtv/themes/default-wide/mm_waiting.png \ - ${datadir}/mythtv/themes/default-wide/mm-titlelines.png \ - ${datadir}/mythtv/themes/default/music-ui.xml \ - ${datadir}/mythtv/themes/default-wide/music-ui.xml \ - " -FILES_mythmusic-dbg = "${libdir}/mythtv/plugins/.debug/libmythmusic.so" -FILES_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \ - ${datadir}/mythtv/mythnews/* \ - ${datadir}/mythtv/i18n/mythnews* \ - ${datadir}/mythtv/themes/default/enclosures.png \ - ${datadir}/mythtv/themes/default/need-download.png \ - ${datadir}/mythtv/themes/default/podcast.png \ - ${datadir}/mythtv/themes/default/news-info-bg.png \ - ${datadir}/mythtv/themes/default/news-ui.xml \ - ${datadir}/mythtv/themes/default-wide/news-ui.xml \ - " -FILES_mythnews-dbg = "${libdir}/mythtv/plugins/.debug/libmythnews.so" -FILES_mythvideo = "${libdir}/mythtv/plugins/libmythvideo.so \ - ${bindir}/mtd \ - ${datadir}/mythtv/mythvideo/* \ - ${datadir}/mythtv/i18n/mythvideo* \ - ${datadir}/mythtv/themes/default/md_progress_background.png \ - ${datadir}/mythtv/themes/default/md_rip_banner.png \ - ${datadir}/mythtv/themes/default/mv_level_none.png \ - ${datadir}/mythtv/themes/default/mv_browse_background.png \ - ${datadir}/mythtv/themes/default/mv_itemdetail_popup.png \ - ${datadir}/mythtv/themes/default/mv_filerequest.png \ - ${datadir}/mythtv/themes/default/mv_level_high.png \ - ${datadir}/mythtv/themes/default/mv_results_popup.png \ - ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ - ${datadir}/mythtv/themes/default/mv_level_low.png \ - ${datadir}/mythtv/themes/default/mv_level_lowest.png \ - ${datadir}/mythtv/themes/default/mv_level_medium.png \ - ${datadir}/mythtv/themes/default/mv_browse_selector.png \ - ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ - ${datadir}/mythtv/themes/default-wide/mv_browse_selector.png \ - ${datadir}/mythtv/themes/default-wide/mv_browse_background.png \ - ${datadir}/mythtv/themes/default-wide/mv_browse_nocover_large.png \ - ${datadir}/mythtv/themes/default-wide/mv_itemdetail_popup.png \ - ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ - ${datadir}/mythtv/themes/default/dvd-ui.xml \ - ${datadir}/mythtv/themes/default-wide/dvd-ui.xml \ - ${datadir}/mythtv/themes/default/video-ui.xml \ - ${datadir}/mythtv/themes/default-wide/video-ui.xml \ - ${datadir}/mythtv/video_settings.xml \ - ${datadir}/mythtv/videomenu.xml \ - " -FILES_mythvideo-dbg = "${bindir}/.debug/mtd \ - ${libdir}/mythtv/plugins/.debug/libmythvideo.so" -FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ - ${datadir}/mythtv/mythweather/* \ - ${datadir}/mythtv/i18n/mythweather* \ - ${datadir}/mythtv/themes/default-wide/mw-background.png \ - ${datadir}/mythtv/themes/default-wide/mw-lines.png \ - ${datadir}/mythtv/themes/default-wide/mw-map-sat.png \ - ${datadir}/mythtv/themes/default-wide/mw-map.png \ - ${datadir}/mythtv/themes/default-wide/mw-popup.png \ - ${datadir}/mythtv/themes/default-wide/weather-ui.xml \ - ${datadir}/mythtv/themes/default/cloudy.png \ - ${datadir}/mythtv/themes/default/fair.png \ - ${datadir}/mythtv/themes/default/flurries.png \ - ${datadir}/mythtv/themes/default/fog.png \ - ${datadir}/mythtv/themes/default/logo.png \ - ${datadir}/mythtv/themes/default/lshowers.png \ - ${datadir}/mythtv/themes/default/mcloudy.png \ - ${datadir}/mythtv/themes/default/mw_background.png \ - ${datadir}/mythtv/themes/default/mw_checked.png \ - ${datadir}/mythtv/themes/default/mw_checked_high.png \ - ${datadir}/mythtv/themes/default/mw_lines.png \ - ${datadir}/mythtv/themes/default/mw_map-sat.png \ - ${datadir}/mythtv/themes/default/mw_map.png \ - ${datadir}/mythtv/themes/default/mw_popup.png \ - ${datadir}/mythtv/themes/default/mw_shading.png \ - ${datadir}/mythtv/themes/default/mw_unchecked.png \ - ${datadir}/mythtv/themes/default/mw_unchecked_high.png \ - ${datadir}/mythtv/themes/default/mwmain.png \ - ${datadir}/mythtv/themes/default/pcloudy.png \ - ${datadir}/mythtv/themes/default/rainsnow.png \ - ${datadir}/mythtv/themes/default/showers.png \ - ${datadir}/mythtv/themes/default/snowshow.png \ - ${datadir}/mythtv/themes/default/sunny.png \ - ${datadir}/mythtv/themes/default/thunshowers.png \ - ${datadir}/mythtv/themes/default/unknown.png \ - ${datadir}/mythtv/themes/default/weather-ui.xml \ - ${datadir}/mythtv/weather_settings.xml \ - " -FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" - -FILES_mythweb = "${datadir}/apache2/htdocs \ - /etc/apache2/extra/mythweb.conf" - -FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \ - ${datadir}/mythtv/zonemindermenu.xml \ - ${datadir}/mythtv/i18n/mythzoneminder* \ - ${datadir}/mythtv/themes/default/zoneminder-ui.xml \ - ${datadir}/mythtv/themes/default/mz_black.png \ - ${datadir}/mythtv/themes/default/mz_browser_back_sel.png \ - ${datadir}/mythtv/themes/default/mz_browser_back_reg.png \ - ${datadir}/mythtv/themes/default/mz_function_popup.png \ - ${datadir}/mythtv/themes/default/mz_testcard.png \ - ${datadir}/mythtv/themes/default-wide/zoneminder-ui.xml \ - " -FILES_mythzoneminder-dbg = "${libdir}/mythtv/plugins/.debug/libmythzoneminder.so" diff --git a/recipes/mythtv/mythplugins_0.22.bb b/recipes/mythtv/mythplugins_0.22.bb new file mode 100644 index 0000000000..aab859c02b --- /dev/null +++ b/recipes/mythtv/mythplugins_0.22.bb @@ -0,0 +1,291 @@ +DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" +RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery mythgame \ + mythmusic mythmovies mythnews mythvideo mythweather mythweb mythzoneminder" +PV = "0.22" +PR = "r0" + +QMAKE_PROFILES = "mythplugins.pro" + +SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22.tar.bz2 \ + file://sysroot.patch;patch=1 \ + file://mythplugins_wo_qtopengl.diff;patch=1 \ + file://configure.patch;patch=1 \ + file://mytharchive.pro.patch;patch=1 \ + " + +S = "${WORKDIR}/mythplugins-0.22" + +inherit qmake2 qt4x11 + +EXTRA_OECONF = " \ + --cross-prefix=${TARGET_PREFIX} \ + --sysroot=${STAGING_DIR_HOST} \ + --prefix=${prefix} \ + --with-libdir-name=${STAGING_LIBDIR} \ + --disable-opengl \ + \ + --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ + --extra-ldflags="${TARGET_LDFLAGS}" \ + ${EXTRA_MYTHTVCONF} \ +" + +do_configure() { + ${S}/configure --qmake=qmake2 ${EXTRA_OECONF} +} +do_install () { + oe_runmake install INSTALL_ROOT="${D}" + install -d ${D}${datadir}/apache2 + install -d ${D}${datadir}/apache2/htdocs + install -d ${D}/etc/apache2 + install -d ${D}/etc/apache2/extra + cp -r ${S}/mythweb/* ${D}${datadir}/apache2/htdocs/ + cp -r ${S}/mythweb/mythweb.conf.apache ${D}/etc/apache2/extra/mythweb.conf + sed -i -e s:/var/www/html:/usr/share/apache2/htdocs:g ${D}/etc/apache2/extra/mythweb.conf +} + +pkg_postinst_${PN}() { + chgrp -R apache /usr/share/apache2/htdocs/data + chmod g+rw /usr/share/apache2/htdocs/data + grep mythweb.conf /etc/apache2/httpd.conf || \ + echo "Include /etc/apache2/extra/mythweb.conf" >>/etc/apache2/httpd.conf + +} + + +PACKAGES =+ "mytharchive mytharchive-dbg \ + mythbrowser mythbrowser-dbg \ + mythflix mythflix-dbg \ + mythgallery mythgallery-dbg \ + mythgame mythgame-dbg \ + mythmovies mythmovies-dbg \ + mythmusic mythmusic-dbg \ + mythnews mythnews-dbg \ + mythvideo mythvideo-dbg \ + mythweather mythweather-dbg \ + mythweb \ + mythzoneminder mythzoneminder-dbg" + +FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ + ${bindir}/mytharchivehelper \ + ${datadir}/mythtv/i18n/mytharchive* \ + ${datadir}/mythtv/mytharchive/* \ + ${datadir}/mythtv/archiveformat.xml \ + ${datadir}/mythtv/archivemenu.xml \ + ${datadir}/mythtv/archiveutils.xml \ + ${datadir}/mythtv/themes/default/mytharchive-ui.xml \ + ${datadir}/mythtv/themes/default/mythburn-ui.xml \ + ${datadir}/mythtv/themes/default/mythnative-ui.xml \ + ${datadir}/mythtv/themes/default/ma_*.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_background.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_fill.png \ + ${datadir}/mythtv/themes/default-wide/mytharchive-ui.xml \ + ${datadir}/mythtv/themes/default-wide/mythburn-ui.xml \ + ${datadir}/mythtv/themes/default-wide/mythnative-ui.xml \ + " +FILES_mytharchive-dbg = "${bindir}/.debug/mytharchivehelper \ + ${libdir}/mythtv/plugins/.debug/libmytharchive.so" +FILES_mythbrowser = "${libdir}/mythtv/plugins/libmythbrowser.so \ + ${bindir}/mythbrowser \ + ${datadir}/mythtv/i18n/mythbrowser* \ + ${datadir}/mythtv/themes/default/browser-ui.xml \ + ${datadir}/mythtv/themes/default-wide/browser-ui.xml \ + " +FILES_mythbrowser-dbg = "${libdir}/mythtv/plugins/.debug/libmythbrowser.so" +FILES_mythflix = "${libdir}/mythtv/plugins/libmythflix.so \ + ${datadir}/mythtv/i18n/mythflix* \ + ${datadir}/mythtv/mythflix/* \ + ${datadir}/mythtv/netflix_menu.xml \ + ${datadir}/mythtv/themes/default/mythflix_background.png \ + ${datadir}/mythtv/themes/default/netflix-ui.xml \ + ${datadir}/mythtv/themes/default-wide/netflix-ui.xml \ + ${datadir}/mythtv/themes/default/title_netflix.png \ + ${datadir}/mythtv/themes/default-wide/netflix-bg.png \ + " +FILES_mythflix-dbg = "${libdir}/mythtv/plugins/.debug/libmythflix.so" +FILES_mythgallery = "${libdir}/mythtv/plugins/libmythgallery.so \ + ${datadir}/mythtv/i18n/mythgallery* \ + ${datadir}/mythtv/themes/default/gallery*.png \ + ${datadir}/mythtv/themes/default/gallery-ui.xml \ + ${datadir}/mythtv/themes/default-wide/gallery-ui.xml \ + " +FILES_mythgallery-dbg = "${libdir}/mythtv/plugins/.debug/libmythgallery.so" +FILES_mythgame = "${libdir}/mythtv/plugins/libmythgame.so \ + ${datadir}/mythtv/i18n/mythgame* \ + ${datadir}/mythtv/game_settings.xml \ + ${datadir}/mythtv/themes/default/game-ui.xml \ + ${datadir}/mythtv/themes/default-wide/game-ui.xml \ + " +FILES_mythgame-dbg = "${libdir}/mythtv/plugins/.debug/libmythgame.so" +FILES_mythmovies = "${libdir}/mythtv/plugins/libmythmovies.so \ + ${bindir}/ignyte \ + ${datadir}/mythtv/mythmovies/* \ + ${datadir}/mythtv/i18n/mythmovies* \ + ${datadir}/mythtv/themes/default/movies-ui.xml \ + ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ + " +FILES_mythmovies-dbg = "${bindir}/.debug/ignyte \ + ${libdir}/mythtv/plugins/.debug/libmythmovies.so" +FILES_mythmusic = "${libdir}/mythtv/plugins/libmythmusic.so \ + ${datadir}/mythtv/mythmusic/* \ + ${datadir}/mythtv/i18n/mythmusic* \ + ${datadir}/mythtv/music_settings.xml \ + ${datadir}/mythtv/musicmenu.xml \ + ${datadir}/mythtv/themes/default/selectionbar.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_reg.png \ + ${datadir}/mythtv/themes/default/music-sel-bg.png \ + ${datadir}/mythtv/themes/default/mm_rip_banner.png \ + ${datadir}/mythtv/themes/default/mm_prev_on.png \ + ${datadir}/mythtv/themes/default/next_button_off.png \ + ${datadir}/mythtv/themes/default/mm_next_pushed.png \ + ${datadir}/mythtv/themes/default/stop_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_folder.png \ + ${datadir}/mythtv/themes/default/mm_left_arrow.png \ + ${datadir}/mythtv/themes/default/rew_button_on.png \ + ${datadir}/mythtv/themes/default/next_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_trans_background.png \ + ${datadir}/mythtv/themes/default/prev_button_off.png \ + ${datadir}/mythtv/themes/default/mm_browser_back_sel.png \ + ${datadir}/mythtv/themes/default/ff_button_off.png \ + ${datadir}/mythtv/themes/default/mm_volume_tick.png \ + ${datadir}/mythtv/themes/default/stop_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress-fg.png \ + ${datadir}/mythtv/themes/default/mm_rip_background.png \ + ${datadir}/mythtv/themes/default/rew_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_next_off.png \ + ${datadir}/mythtv/themes/default/mm_next_on.png \ + ${datadir}/mythtv/themes/default/pause_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_nothumb.png \ + ${datadir}/mythtv/themes/default/stop_button_on.png \ + ${datadir}/mythtv/themes/default/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default/mm_prev_pushed.png \ + ${datadir}/mythtv/themes/default/pause_button_on.png \ + ${datadir}/mythtv/themes/default/play_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_progress_foreground.png \ + ${datadir}/mythtv/themes/default/pause_button_off.png \ + ${datadir}/mythtv/themes/default/play_button_off.png \ + ${datadir}/mythtv/themes/default/mm_progress_background.png \ + ${datadir}/mythtv/themes/default/mm_up_arrow.png \ + ${datadir}/mythtv/themes/default/prev_button_on.png \ + ${datadir}/mythtv/themes/default/mm_volume_background.png \ + ${datadir}/mythtv/themes/default/ff_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_prev_off.png \ + ${datadir}/mythtv/themes/default/miniplayer_background.png \ + ${datadir}/mythtv/themes/default/mm_progress-bg.png \ + ${datadir}/mythtv/themes/default/track_info_background.png \ + ${datadir}/mythtv/themes/default/mm_waiting.png \ + ${datadir}/mythtv/themes/default/play_button_on.png \ + ${datadir}/mythtv/themes/default/prev_button_pushed.png \ + ${datadir}/mythtv/themes/default/mm_right_arrow.png \ + ${datadir}/mythtv/themes/default/ff_button_on.png \ + ${datadir}/mythtv/themes/default/mm_down_arrow.png \ + ${datadir}/mythtv/themes/default/next_button_on.png \ + ${datadir}/mythtv/themes/default/mm_rating.png \ + ${datadir}/mythtv/themes/default/rew_button_off.png \ + ${datadir}/mythtv/themes/default/mm-titlelines.png \ + ${datadir}/mythtv/themes/default-wide/music-sel-bg.png \ + ${datadir}/mythtv/themes/default-wide/mm_blackhole_border.png \ + ${datadir}/mythtv/themes/default-wide/mm_volume_background.png \ + ${datadir}/mythtv/themes/default-wide/mm_waiting.png \ + ${datadir}/mythtv/themes/default-wide/mm-titlelines.png \ + ${datadir}/mythtv/themes/default/music-ui.xml \ + ${datadir}/mythtv/themes/default-wide/music-ui.xml \ + " +FILES_mythmusic-dbg = "${libdir}/mythtv/plugins/.debug/libmythmusic.so" +FILES_mythnews = "${libdir}/mythtv/plugins/libmythnews.so \ + ${datadir}/mythtv/mythnews/* \ + ${datadir}/mythtv/i18n/mythnews* \ + ${datadir}/mythtv/themes/default/enclosures.png \ + ${datadir}/mythtv/themes/default/need-download.png \ + ${datadir}/mythtv/themes/default/podcast.png \ + ${datadir}/mythtv/themes/default/news-info-bg.png \ + ${datadir}/mythtv/themes/default/news-ui.xml \ + ${datadir}/mythtv/themes/default-wide/news-ui.xml \ + " +FILES_mythnews-dbg = "${libdir}/mythtv/plugins/.debug/libmythnews.so" +FILES_mythvideo = "${libdir}/mythtv/plugins/libmythvideo.so \ + ${bindir}/mtd \ + ${datadir}/mythtv/mythvideo/* \ + ${datadir}/mythtv/i18n/mythvideo* \ + ${datadir}/mythtv/themes/default/md_progress_background.png \ + ${datadir}/mythtv/themes/default/md_rip_banner.png \ + ${datadir}/mythtv/themes/default/mv_level_none.png \ + ${datadir}/mythtv/themes/default/mv_browse_background.png \ + ${datadir}/mythtv/themes/default/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default/mv_filerequest.png \ + ${datadir}/mythtv/themes/default/mv_level_high.png \ + ${datadir}/mythtv/themes/default/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default/mv_level_low.png \ + ${datadir}/mythtv/themes/default/mv_level_lowest.png \ + ${datadir}/mythtv/themes/default/mv_level_medium.png \ + ${datadir}/mythtv/themes/default/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_background.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_nocover_large.png \ + ${datadir}/mythtv/themes/default-wide/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ + ${datadir}/mythtv/themes/default/dvd-ui.xml \ + ${datadir}/mythtv/themes/default-wide/dvd-ui.xml \ + ${datadir}/mythtv/themes/default/video-ui.xml \ + ${datadir}/mythtv/themes/default-wide/video-ui.xml \ + ${datadir}/mythtv/video_settings.xml \ + ${datadir}/mythtv/videomenu.xml \ + " +FILES_mythvideo-dbg = "${bindir}/.debug/mtd \ + ${libdir}/mythtv/plugins/.debug/libmythvideo.so" +FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ + ${datadir}/mythtv/mythweather/* \ + ${datadir}/mythtv/i18n/mythweather* \ + ${datadir}/mythtv/themes/default-wide/mw-background.png \ + ${datadir}/mythtv/themes/default-wide/mw-lines.png \ + ${datadir}/mythtv/themes/default-wide/mw-map-sat.png \ + ${datadir}/mythtv/themes/default-wide/mw-map.png \ + ${datadir}/mythtv/themes/default-wide/mw-popup.png \ + ${datadir}/mythtv/themes/default-wide/weather-ui.xml \ + ${datadir}/mythtv/themes/default/cloudy.png \ + ${datadir}/mythtv/themes/default/fair.png \ + ${datadir}/mythtv/themes/default/flurries.png \ + ${datadir}/mythtv/themes/default/fog.png \ + ${datadir}/mythtv/themes/default/logo.png \ + ${datadir}/mythtv/themes/default/lshowers.png \ + ${datadir}/mythtv/themes/default/mcloudy.png \ + ${datadir}/mythtv/themes/default/mw_background.png \ + ${datadir}/mythtv/themes/default/mw_checked.png \ + ${datadir}/mythtv/themes/default/mw_checked_high.png \ + ${datadir}/mythtv/themes/default/mw_lines.png \ + ${datadir}/mythtv/themes/default/mw_map-sat.png \ + ${datadir}/mythtv/themes/default/mw_map.png \ + ${datadir}/mythtv/themes/default/mw_popup.png \ + ${datadir}/mythtv/themes/default/mw_shading.png \ + ${datadir}/mythtv/themes/default/mw_unchecked.png \ + ${datadir}/mythtv/themes/default/mw_unchecked_high.png \ + ${datadir}/mythtv/themes/default/mwmain.png \ + ${datadir}/mythtv/themes/default/pcloudy.png \ + ${datadir}/mythtv/themes/default/rainsnow.png \ + ${datadir}/mythtv/themes/default/showers.png \ + ${datadir}/mythtv/themes/default/snowshow.png \ + ${datadir}/mythtv/themes/default/sunny.png \ + ${datadir}/mythtv/themes/default/thunshowers.png \ + ${datadir}/mythtv/themes/default/unknown.png \ + ${datadir}/mythtv/themes/default/weather-ui.xml \ + ${datadir}/mythtv/weather_settings.xml \ + " +FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" + +FILES_mythweb = "${datadir}/apache2/htdocs \ + /etc/apache2/extra/mythweb.conf" + +FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \ + ${datadir}/mythtv/zonemindermenu.xml \ + ${datadir}/mythtv/i18n/mythzoneminder* \ + ${datadir}/mythtv/themes/default/zoneminder-ui.xml \ + ${datadir}/mythtv/themes/default/mz_black.png \ + ${datadir}/mythtv/themes/default/mz_browser_back_sel.png \ + ${datadir}/mythtv/themes/default/mz_browser_back_reg.png \ + ${datadir}/mythtv/themes/default/mz_function_popup.png \ + ${datadir}/mythtv/themes/default/mz_testcard.png \ + ${datadir}/mythtv/themes/default-wide/zoneminder-ui.xml \ + " +FILES_mythzoneminder-dbg = "${libdir}/mythtv/plugins/.debug/libmythzoneminder.so" -- cgit v1.2.3 From 6d418da29226cf7998c89641e101a149b4fb81b5 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Mar 2009 03:00:15 +0000 Subject: mtd-utils: unify recipes, move mkfs.ubifs into separate package mtd-utils package do not depend on libraries other then libc and libgcc now (ubifs depends on lzo and e2fsprogs) Signed-off-by: Marcin Juszkiewicz --- recipes/mtd/mtd-utils.inc | 83 +++++++++++++++++++++++++++++++++++ recipes/mtd/mtd-utils_1.1.0.bb | 48 +++----------------- recipes/mtd/mtd-utils_1.2.0+git.bb | 89 +++----------------------------------- 3 files changed, 95 insertions(+), 125 deletions(-) create mode 100644 recipes/mtd/mtd-utils.inc (limited to 'recipes') diff --git a/recipes/mtd/mtd-utils.inc b/recipes/mtd/mtd-utils.inc new file mode 100644 index 0000000000..dcf0e7c832 --- /dev/null +++ b/recipes/mtd/mtd-utils.inc @@ -0,0 +1,83 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib lzo" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +PR = "r0" + +SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2" + +S = "${WORKDIR}/mtd-utils-${PV}" + +EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + done + for binary in ${mtd_utils}; do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +do_install () { + install -d ${D}${bindir} + install -d ${D}${includedir}/mtd + for binary in ${mtd_utils}; do + install -m 0755 $binary ${D}${bindir} + done + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${D}${includedir}/mtd + done +} + +mtd_utils = " docfdisk \ + doc_loadbios \ + flashcp \ + flash_erase \ + flash_eraseall \ + flash_info \ + flash_lock \ + flash_otp_dump \ + flash_otp_info \ + flash_unlock \ + ftl_check \ + ftl_format \ + jffs2dump \ + mkfs.jffs2 \ + mtd_debug \ + nanddump \ + nandtest \ + nandwrite \ + nftldump \ + nftl_format \ + recv_image \ + rfddump \ + rfdformat \ + serve_image \ + sumtool \ + mkfs.ubifs/mkfs.ubifs \ + ubi-utils/bin2nand \ + ubi-utils/mkbootenv \ + ubi-utils/nand2bin \ + ubi-utils/pddcustomize \ + ubi-utils/pfi2bin \ + ubi-utils/pfiflash \ + ubi-utils/ubigen \ + ubi-utils/ubimirror \ + ubi-utils/unubi \ + ubi-utils/new-utils/ubiattach \ + ubi-utils/new-utils/ubicrc32 \ + ubi-utils/new-utils/ubidetach \ + ubi-utils/new-utils/ubiformat \ + ubi-utils/new-utils/ubimkvol \ + ubi-utils/new-utils/ubinfo \ + ubi-utils/new-utils/ubinize \ + ubi-utils/new-utils/ubirmvol \ + ubi-utils/new-utils/ubiupdatevol" + +PACKAGES =+ "mkfs-jffs mkfs-jffs2 mkfs-ubifs" +FILES_mkfs-jffs = "${bindir}/mkfs.jffs" +FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" +FILES_mkfs-ubifs = "${bindir}/mkfs.ubifs" diff --git a/recipes/mtd/mtd-utils_1.1.0.bb b/recipes/mtd/mtd-utils_1.1.0.bb index e585cf5ab8..e226391ac1 100644 --- a/recipes/mtd/mtd-utils_1.1.0.bb +++ b/recipes/mtd/mtd-utils_1.1.0.bb @@ -1,45 +1,7 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r3" +require mtd-utils.inc -SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-${PV}.tar.bz2 \ - file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x.patch;patch=1" - -S = "${WORKDIR}/mtd-utils-${PV}/" - -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump sumtool" - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" +PR = "r4" +SRC_URI += "file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ + file://fix-ignoreerrors-git.patch;patch=1 \ + file://lzo_1x.patch;patch=1" diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/mtd/mtd-utils_1.2.0+git.bb index 04b8b29ce8..06cbf1b84a 100644 --- a/recipes/mtd/mtd-utils_1.2.0+git.bb +++ b/recipes/mtd/mtd-utils_1.2.0+git.bb @@ -1,9 +1,7 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "e2fsprogs-libs zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r3" +require mtd-utils.inc + +DEPENDS += "e2fsprogs-libs" +PR = "r4" ARM_INSTRUCTION_SET = "arm" @@ -19,84 +17,11 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ S = "${WORKDIR}/git/" -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - do_configure_prepend() { for i in $(find . -name "Makefile") ; do sed -i -e s:lzo2:lzo:g $i done - sed -i -e s:lzo/::g mkfs.ubifs/compr.c -} - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done + if [ -e mkfs.ubifs/compr.c ]; then + sed -i -e s:lzo/::g mkfs.ubifs/compr.c + fi } - -mtd_utils = " docfdisk \ - doc_loadbios \ - flashcp \ - flash_erase \ - flash_eraseall \ - flash_info \ - flash_lock \ - flash_otp_dump \ - flash_otp_info \ - flash_unlock \ - ftl_check \ - ftl_format \ - jffs2dump \ - mkfs.jffs2 \ - mtd_debug \ - nanddump \ - nandtest \ - nandwrite \ - nftldump \ - nftl_format \ - recv_image \ - rfddump \ - rfdformat \ - serve_image \ - sumtool \ - mkfs.ubifs/mkfs.ubifs \ - ubi-utils/bin2nand \ - ubi-utils/mkbootenv \ - ubi-utils/nand2bin \ - ubi-utils/pddcustomize \ - ubi-utils/pfi2bin \ - ubi-utils/pfiflash \ - ubi-utils/ubigen \ - ubi-utils/ubimirror \ - ubi-utils/unubi \ - ubi-utils/new-utils/ubiattach \ - ubi-utils/new-utils/ubicrc32 \ - ubi-utils/new-utils/ubidetach \ - ubi-utils/new-utils/ubiformat \ - ubi-utils/new-utils/ubimkvol \ - ubi-utils/new-utils/ubinfo \ - ubi-utils/new-utils/ubinize \ - ubi-utils/new-utils/ubirmvol \ - ubi-utils/new-utils/ubiupdatevol" - - - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" - -- cgit v1.2.3 From c048337850312205320ab0600177fbee4921db66 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Mar 2009 03:00:16 +0000 Subject: mtd-utils-tests: update to 1.2.0+git Signed-off-by: Marcin Juszkiewicz --- recipes/mtd/mtd-utils-tests_1.0.0+git.bb | 59 -------------------------------- recipes/mtd/mtd-utils-tests_1.2.0+git.bb | 59 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 recipes/mtd/mtd-utils-tests_1.0.0+git.bb create mode 100644 recipes/mtd/mtd-utils-tests_1.2.0+git.bb (limited to 'recipes') diff --git a/recipes/mtd/mtd-utils-tests_1.0.0+git.bb b/recipes/mtd/mtd-utils-tests_1.0.0+git.bb deleted file mode 100644 index b5240009a7..0000000000 --- a/recipes/mtd/mtd-utils-tests_1.0.0+git.bb +++ /dev/null @@ -1,59 +0,0 @@ -require mtd-utils_1.0.0+git.bb - -# this can probably be integrated into the main mtd-utils package -# but I did not want to risk breakage -- but would be glad to -# integrate them if that is best -- cbrake - -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}" - -PR = "r1" - -S = "${WORKDIR}/git/tests/fs-tests" - -FILES_${PN} = "${datadir}/mtd-utils" - -do_compile () { - make || die "Make failed" -} - -do_stage () { -} - -INHIBIT_PACKAGE_STRIP = "1" - -mtd_utils_tests = " \ - help_all.sh \ - run_all.sh \ - integrity/integck \ - simple/ftrunc \ - simple/test_1 \ - simple/test_2 \ - stress/stress00.sh \ - stress/stress01.sh \ - stress/atoms/fwrite00 \ - stress/atoms/gcd_hupper \ - stress/atoms/pdfrun \ - stress/atoms/rmdir00 \ - stress/atoms/rndrm00 \ - stress/atoms/rndrm99 \ - stress/atoms/rndwrite00 \ - stress/atoms/stress_1 \ - stress/atoms/stress_2 \ - stress/atoms/stress_3 \ - utils/free_space \ - utils/fstest_monitor \ - " - -do_install () { - install -d ${D}${datadir}/mtd-utils/tests - install -d ${D}${datadir}/mtd-utils/tests/integrity - install -d ${D}${datadir}/mtd-utils/tests/simple - install -d ${D}${datadir}/mtd-utils/tests/stress - install -d ${D}${datadir}/mtd-utils/tests/stress/atoms - install -d ${D}${datadir}/mtd-utils/tests/utils - for app in ${mtd_utils_tests}; do - install -m 0755 $app ${D}${datadir}/mtd-utils/tests/$app - done -} - - diff --git a/recipes/mtd/mtd-utils-tests_1.2.0+git.bb b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb new file mode 100644 index 0000000000..7787c51f89 --- /dev/null +++ b/recipes/mtd/mtd-utils-tests_1.2.0+git.bb @@ -0,0 +1,59 @@ +require mtd-utils_1.2.0+git.bb + +# this can probably be integrated into the main mtd-utils package +# but I did not want to risk breakage -- but would be glad to +# integrate them if that is best -- cbrake + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}" + +PR = "r1" + +S = "${WORKDIR}/git/tests/fs-tests" + +FILES_${PN} = "${datadir}/mtd-utils" + +do_compile () { + make || die "Make failed" +} + +do_stage () { +} + +INHIBIT_PACKAGE_STRIP = "1" + +mtd_utils_tests = " \ + help_all.sh \ + run_all.sh \ + integrity/integck \ + simple/ftrunc \ + simple/test_1 \ + simple/test_2 \ + stress/stress00.sh \ + stress/stress01.sh \ + stress/atoms/fwrite00 \ + stress/atoms/gcd_hupper \ + stress/atoms/pdfrun \ + stress/atoms/rmdir00 \ + stress/atoms/rndrm00 \ + stress/atoms/rndrm99 \ + stress/atoms/rndwrite00 \ + stress/atoms/stress_1 \ + stress/atoms/stress_2 \ + stress/atoms/stress_3 \ + utils/free_space \ + utils/fstest_monitor \ + " + +do_install () { + install -d ${D}${datadir}/mtd-utils/tests + install -d ${D}${datadir}/mtd-utils/tests/integrity + install -d ${D}${datadir}/mtd-utils/tests/simple + install -d ${D}${datadir}/mtd-utils/tests/stress + install -d ${D}${datadir}/mtd-utils/tests/stress/atoms + install -d ${D}${datadir}/mtd-utils/tests/utils + for app in ${mtd_utils_tests}; do + install -m 0755 $app ${D}${datadir}/mtd-utils/tests/$app + done +} + + -- cgit v1.2.3 From 29efbb74780d1de0694d8cdab5527599436119dc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Mar 2009 03:00:14 +0000 Subject: mtd: dropped 1.0.0(+git) versions Signed-off-by: Marcin Juszkiewicz --- recipes/mtd/mtd-utils-native_1.0.0+git.bb | 3 -- recipes/mtd/mtd-utils-native_1.0.0.bb | 2 -- recipes/mtd/mtd-utils_1.0.0+git.bb | 51 ------------------------------- recipes/mtd/mtd-utils_1.0.0.bb | 19 ------------ 4 files changed, 75 deletions(-) delete mode 100644 recipes/mtd/mtd-utils-native_1.0.0+git.bb delete mode 100644 recipes/mtd/mtd-utils-native_1.0.0.bb delete mode 100644 recipes/mtd/mtd-utils_1.0.0+git.bb delete mode 100644 recipes/mtd/mtd-utils_1.0.0.bb (limited to 'recipes') diff --git a/recipes/mtd/mtd-utils-native_1.0.0+git.bb b/recipes/mtd/mtd-utils-native_1.0.0+git.bb deleted file mode 100644 index 6e310cb1b4..0000000000 --- a/recipes/mtd/mtd-utils-native_1.0.0+git.bb +++ /dev/null @@ -1,3 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc - diff --git a/recipes/mtd/mtd-utils-native_1.0.0.bb b/recipes/mtd/mtd-utils-native_1.0.0.bb deleted file mode 100644 index 6f9d71e10c..0000000000 --- a/recipes/mtd/mtd-utils-native_1.0.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require mtd-utils_${PV}.bb -require mtd-utils-native.inc diff --git a/recipes/mtd/mtd-utils_1.0.0+git.bb b/recipes/mtd/mtd-utils_1.0.0+git.bb deleted file mode 100644 index b325bb03d3..0000000000 --- a/recipes/mtd/mtd-utils_1.0.0+git.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib lzo" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r8" - -# This is the default package, thus we lock to a specific git version so -# upstream changes will not break builds. - -TAG = "9845d92440bd87739c89edd000fd6e0c47fab185" -# As of 2007/27/07, see http://git.infradead.org/?p=mtd-utils.git;a=shortlog - -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ - file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x.patch;patch=1" - -S = "${WORKDIR}/git/" - -EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'" - -do_stage () { - install -d ${STAGING_INCDIR}/mtd - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${STAGING_INCDIR}/mtd/ - done - for binary in ${mtd_utils}; do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ - mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \ - flashcp nandwrite jffs2dump sumtool" - -do_install () { - install -d ${D}${bindir} - install -d ${D}${includedir}/mtd - for binary in ${mtd_utils}; do - install -m 0755 $binary ${D}${bindir} - done - for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir}/mtd - done -} - -PACKAGES =+ "mkfs-jffs mkfs-jffs2" -FILES_mkfs-jffs = "${bindir}/mkfs.jffs" -FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" - diff --git a/recipes/mtd/mtd-utils_1.0.0.bb b/recipes/mtd/mtd-utils_1.0.0.bb deleted file mode 100644 index 0ebb47fb22..0000000000 --- a/recipes/mtd/mtd-utils_1.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Tools for managing memory technology devices." -SECTION = "base" -DEPENDS = "zlib" -HOMEPAGE = "http://www.linux-mtd.infradead.org/" -LICENSE = "GPLv2" -PR = "r0" - -# RP/kergoth: Builds seem to break with recent mtd-utils -# Can't pin down the exact problems -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz" -S = "${WORKDIR}/mtd-utils-${PV}" - -CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include " - -do_install() { - oe_runmake install DESTDIR=${D} -} -- cgit v1.2.3 From bea72c2fecde175add169bb55df1922b048030c8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Oct 2009 21:48:21 +0000 Subject: Start removal of layout_* variables and replace these with new mechanisms to allow nextgen SDK generation (from Poky) Signed-off-by: Richard Purdie --- recipes/gcc/gcc-configure-common.inc | 4 ++-- recipes/gcc/gcc-configure-cross.inc | 4 ++-- recipes/gcc/gcc-cross-initial.inc | 2 +- recipes/gcc/gcc-cross-intermediate.inc | 6 +++--- recipes/gcc/gcc-cross-sdk_4.1.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.4.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.4.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb | 2 +- recipes/gcc/gcc-cross-sdk_svn.bb | 2 +- recipes/gcc/gcc-cross.inc | 1 + recipes/gcc/gcc-cross_4.1.0.bb | 2 +- recipes/gcc/gcc-cross_4.1.1.bb | 2 +- recipes/gcc/gcc-cross_4.1.2.bb | 4 ++-- recipes/gcc/gcc-cross_4.2.1.bb | 4 ++-- recipes/gcc/gcc-cross_4.2.2.bb | 4 ++-- recipes/gcc/gcc-cross_4.2.3.bb | 4 ++-- recipes/gcc/gcc-cross_4.2.4.bb | 4 ++-- recipes/gcc/gcc-cross_4.3.1.bb | 4 ++-- recipes/gcc/gcc-cross_4.3.2.bb | 4 ++-- recipes/gcc/gcc-cross_4.3.3.bb | 4 ++-- recipes/gcc/gcc-cross_4.3.4.bb | 4 ++-- recipes/gcc/gcc-cross_4.4.1.bb | 4 ++-- recipes/gcc/gcc-cross_4.4.2.bb | 4 ++-- recipes/gcc/gcc-cross_csl-arm-2007q3.bb | 8 ++++---- recipes/gcc/gcc-cross_csl-arm-2008q1.bb | 8 ++++---- recipes/gcc/gcc-cross_csl-arm-2008q3.bb | 8 ++++---- recipes/gcc/gcc-cross_svn.bb | 4 ++-- recipes/gcc/gcc-native.inc | 2 +- recipes/libtool/libtool-cross_1.5.10.bb | 16 ++++++++-------- recipes/libtool/libtool-cross_1.5.22.bb | 16 ++++++++-------- recipes/libtool/libtool-cross_1.5.24.bb | 16 ++++++++-------- recipes/libtool/libtool-cross_2.2.4.bb | 18 +++++++++--------- recipes/libtool/libtool-cross_2.2.6a.bb | 18 +++++++++--------- 40 files changed, 102 insertions(+), 101 deletions(-) (limited to 'recipes') diff --git a/recipes/gcc/gcc-configure-common.inc b/recipes/gcc/gcc-configure-common.inc index a0a7dfab74..efe8ee8787 100644 --- a/recipes/gcc/gcc-configure-common.inc +++ b/recipes/gcc/gcc-configure-common.inc @@ -83,12 +83,12 @@ do_configure () { if [ "${HOST_SYS}" != "${TARGET_SYS}" ]; then # splice our idea of where the headers live into gcc's world - echo "NATIVE_SYSTEM_HEADER_DIR = ${layout_includedir}" > ${T}/t-oe + echo "NATIVE_SYSTEM_HEADER_DIR = ${target_includedir}" > ${T}/t-oe sed 's%^tmake_file=.*$%& ${T}/t-oe%' < ${S}/gcc/Makefile.in >${S}/gcc/Makefile.in.new mv ${S}/gcc/Makefile.in.new ${S}/gcc/Makefile.in cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${S}/gcc/defaults.h.new echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new - echo "#define STANDARD_INCLUDE_DIR \"${layout_includedir}\"" >> ${S}/gcc/defaults.h.new + echo "#define STANDARD_INCLUDE_DIR \"${target_includedir}\"" >> ${S}/gcc/defaults.h.new echo "#endif" >> ${S}/gcc/defaults.h.new echo "#endif /* ! GCC_DEFAULTS_H */" >> ${S}/gcc/defaults.h.new mv ${S}/gcc/defaults.h.new ${S}/gcc/defaults.h diff --git a/recipes/gcc/gcc-configure-cross.inc b/recipes/gcc/gcc-configure-cross.inc index b526ff3cc4..980f7929ff 100644 --- a/recipes/gcc/gcc-configure-cross.inc +++ b/recipes/gcc/gcc-configure-cross.inc @@ -2,8 +2,8 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ - --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \ +EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ + --with-gxx-include-dir=${STAGING_DIR_TARGET}/${target_includedir}/c++ \ --with-sysroot=${STAGING_DIR_TARGET} \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-initial.inc b/recipes/gcc/gcc-cross-initial.inc index 15e5fa62fc..a2c4445578 100644 --- a/recipes/gcc/gcc-cross-initial.inc +++ b/recipes/gcc/gcc-cross-initial.inc @@ -4,7 +4,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-newlib \ --without-headers \ --disable-shared \ diff --git a/recipes/gcc/gcc-cross-intermediate.inc b/recipes/gcc/gcc-cross-intermediate.inc index 4746140346..ccfa2b44b8 100644 --- a/recipes/gcc/gcc-cross-intermediate.inc +++ b/recipes/gcc/gcc-cross-intermediate.inc @@ -5,7 +5,7 @@ PACKAGES = "" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ --disable-multilib \ --disable-threads \ @@ -18,8 +18,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ do_stage_append () { # get rid of dummy libc.so - if [ -z "`file ${STAGING_DIR_TARGET}${layout_libdir}/libc.so | grep "ASCII C program text"`" ]; then - rm -rf ${STAGING_DIR_TARGET}${layout_libdir}/libc.so + if [ -z "`file ${STAGING_DIR_TARGET}${target_libdir}/libc.so | grep "ASCII C program text"`" ]; then + rm -rf ${STAGING_DIR_TARGET}${target_libdir}/libc.so fi } diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 9a9eb8ca56..6a7460664f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -7,4 +7,4 @@ require gcc-package-sdk.inc DEPENDS += "gmp-native mpfr-native" -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index ab52a9ae04..9c67c7e119 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \ --enable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 27a7ae0a7f..bea9839246 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 6be2538cd5..ed39d3176d 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb b/recipes/gcc/gcc-cross-sdk_4.3.4.bb index 081b3c0aab..88e26c509b 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb b/recipes/gcc/gcc-cross-sdk_4.4.1.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb b/recipes/gcc/gcc-cross-sdk_4.4.2.bb index 513cca1ddc..e1b510e58f 100644 --- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb @@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 3352e41dcb..2e4fcf25a6 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += " \ --disable-libgomp \ --disable-libunwind-exceptions \ --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix} \ + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ " #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb index 29ee187785..22937da3c4 100644 --- a/recipes/gcc/gcc-cross-sdk_svn.bb +++ b/recipes/gcc/gcc-cross-sdk_svn.bb @@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native" EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 3fa6f61f0d..3485824b8a 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -5,6 +5,7 @@ target_libdir := "${libdir}" target_includedir := "${includedir}" target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" inherit cross diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb index 9513c657f3..def05869d8 100644 --- a/recipes/gcc/gcc-cross_4.1.0.bb +++ b/recipes/gcc/gcc-cross_4.1.0.bb @@ -5,4 +5,4 @@ require gcc-cross4.inc require gcc-configure-cross.inc require gcc-package-cross.inc -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb index 08ae7a552c..e96867e682 100644 --- a/recipes/gcc/gcc-cross_4.1.1.bb +++ b/recipes/gcc/gcc-cross_4.1.1.bb @@ -7,4 +7,4 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb index 85f90b31a1..2367d196c9 100644 --- a/recipes/gcc/gcc-cross_4.1.2.bb +++ b/recipes/gcc/gcc-cross_4.1.2.bb @@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " EXTRA_OECONF_append_avr32= " --disable-libmudflap " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb index c080143517..8c7f4c50ed 100644 --- a/recipes/gcc/gcc-cross_4.2.1.bb +++ b/recipes/gcc/gcc-cross_4.2.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.2.bb +++ b/recipes/gcc/gcc-cross_4.2.2.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.3.bb +++ b/recipes/gcc/gcc-cross_4.2.3.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb index 4e7fc479d1..cf1bf6837f 100644 --- a/recipes/gcc/gcc-cross_4.2.4.bb +++ b/recipes/gcc/gcc-cross_4.2.4.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb index 398ee2ee79..acd552101a 100644 --- a/recipes/gcc/gcc-cross_4.3.1.bb +++ b/recipes/gcc/gcc-cross_4.3.1.bb @@ -7,6 +7,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.2.bb +++ b/recipes/gcc/gcc-cross_4.3.2.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb index 5eb6b5fbe8..94b98b9e63 100644 --- a/recipes/gcc/gcc-cross_4.3.3.bb +++ b/recipes/gcc/gcc-cross_4.3.3.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb index 9c59a4e5fd..71cb5e63f6 100644 --- a/recipes/gcc/gcc-cross_4.3.4.bb +++ b/recipes/gcc/gcc-cross_4.3.4.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.1.bb +++ b/recipes/gcc/gcc-cross_4.4.1.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb index 4db1b33945..11eb29d419 100644 --- a/recipes/gcc/gcc-cross_4.4.2.bb +++ b/recipes/gcc/gcc-cross_4.4.2.bb @@ -6,6 +6,6 @@ PR = "${INC_PR}.1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb index 4bd9e632a3..34bd251a12 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb index 59bfd24960..d534574c2e 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb index bbd4cdf173..ef4ef304ef 100644 --- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb +++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb @@ -7,7 +7,7 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include CFLAGS = "" @@ -16,11 +16,11 @@ LDFLAGS = "" # staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain do_compile_prepend() { - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ - ln -sf ${STAGING_DIR_TARGET}${layout_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${CROSS_DIR}/${TARGET_SYS}/lib/ + ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${CROSS_DIR}/${TARGET_SYS}/lib/ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${CROSS_DIR}/${TARGET_SYS}/lib/ sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure } -ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${layout_libdir} -isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index a7df4842b9..2186a81944 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -6,6 +6,6 @@ require gcc-package-cross.inc SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}" +ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-native.inc b/recipes/gcc/gcc-native.inc index 6fa615ffc7..63b7375e96 100644 --- a/recipes/gcc/gcc-native.inc +++ b/recipes/gcc/gcc-native.inc @@ -5,7 +5,7 @@ PROVIDES = "gcc-native-${PV}" inherit native # This is intended to be a -very- basic config -EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \ +EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \ --with-newlib \ --disable-shared \ --disable-threads \ diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb index 910ff12066..1ae9c6884d 100644 --- a/recipes/libtool/libtool-cross_1.5.10.bb +++ b/recipes/libtool/libtool-cross_1.5.10.bb @@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \ S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_configure_prepend () { @@ -34,12 +34,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb index b0cee4eebb..383261217c 100644 --- a/recipes/libtool/libtool-cross_1.5.22.bb +++ b/recipes/libtool/libtool-cross_1.5.22.bb @@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -23,12 +23,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb index 1f8527873f..211e5a3550 100644 --- a/recipes/libtool/libtool-cross_1.5.24.bb +++ b/recipes/libtool/libtool-cross_1.5.24.bb @@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -20,12 +20,12 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c config.guess ${STAGING_DATADIR}/libtool/ - install -c config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ } do_install () { diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb index 31a67f5bd1..1a60b57970 100644 --- a/recipes/libtool/libtool-cross_2.2.4.bb +++ b/recipes/libtool/libtool-cross_2.2.4.bb @@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -27,14 +27,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb index 23c16829ab..d3ea34a341 100644 --- a/recipes/libtool/libtool-cross_2.2.6a.bb +++ b/recipes/libtool/libtool-cross_2.2.6a.bb @@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" #SRC_URI_append_linux = "${DOLT_PATCH}" #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" -prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" +prefix = "${STAGING_DIR_NATIVE}${prefix_native}" +exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { @@ -25,14 +25,14 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal + install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ if [ -e ${WORKDIR}/dolt.m4 ] ; then - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ fi } -- cgit v1.2.3 From c82761833ccfd9b64347b769f059e86760fb6d99 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Nov 2009 12:29:17 -0200 Subject: linux-libc-headers: add missing unifdef.patch for 2.6.25 Signed-off-by: Otavio Salvador --- recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb index 0d4163693c..9289d390c4 100644 --- a/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb +++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.25.bb @@ -2,13 +2,14 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://reinstate-a.out.h.patch;patch=1 \ file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \ file://netfilter-include-types_h-in-userspace.patch;patch=1 \ - file://procinfo.h" + file://procinfo.h \ + file://unifdef.patch;patch=1" S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 52aea4b0c5d14a3c5f0dfaa8f24ae96286701ca6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Nov 2009 16:12:05 +0100 Subject: python-native: remove prefix and exec_prefix, native.bbclass should take care of that now --- recipes/python/python-native_2.6.1.bb | 3 --- 1 file changed, 3 deletions(-) (limited to 'recipes') diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb index 30b97c9344..9d0b0c8268 100644 --- a/recipes/python/python-native_2.6.1.bb +++ b/recipes/python/python-native_2.6.1.bb @@ -15,9 +15,6 @@ S = "${WORKDIR}/Python-${PV}" inherit native -prefix = "${STAGING_DIR_NATIVE}/${layout_prefix}" -exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" - EXTRA_OEMAKE = '\ BUILD_SYS="" \ HOST_SYS="" \ -- cgit v1.2.3 From 4c2fcc5f95e446ebeb4c59c873d517de85409ff9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 Nov 2009 17:05:04 +0000 Subject: perl-native: Fix after layout/native.bbclass changes (merged from Poky) Signed-off-by: Richard Purdie --- recipes/perl/perl-native_5.8.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index bde7638137..cac474edc4 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -66,10 +66,10 @@ do_stage_append() { # We need a hostperl link for building perl ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl # Store native config in non-versioned directory - install -d ${STAGING_DIR_HOST}/perl \ + install -d ${STAGING_DIR}/${HOST_SYS}/perl \ ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \ ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils - install config.sh ${STAGING_DIR_HOST}/perl + install config.sh ${STAGING_DIR}/${HOST_SYS}/perl # target configuration install lib/Config.pm ${STAGING_LIBDIR_NATIVE}/perl/${PV}/ install lib/ExtUtils/typemap ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/ -- cgit v1.2.3 From 2a7eb1c2810769fa80dffc1e5080658e645fbb37 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Nov 2009 18:11:08 +0100 Subject: gnome-icon-theme: as I said in my commit two weeks ago: things check for its .pc file, which gets installed in to arch-specific staging, so PACKAGE_ARCH=all breaks multimachine builds. --- recipes/gnome/gnome-icon-theme_2.28.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb index e692287820..fb7c2fa463 100644 --- a/recipes/gnome/gnome-icon-theme_2.28.0.bb +++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb @@ -5,12 +5,10 @@ DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" RDEPENDS = "hicolor-icon-theme" RRECOMMENDS = "librsvg-gtk" -PR = "r2" +PR = "r3" inherit gnome EXTRA_OECONF = "--disable-hicolor-check" -PACKAGE_ARCH = "all" - FILES_${PN} += "${datadir}/*" -- cgit v1.2.3 From 9cc704b6854e094a3cf5e977a4e2fd1938d25e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Tue, 10 Nov 2009 18:22:19 +0100 Subject: linux-2.6.31: cleanup boc01 RTC driver --- .../linux-2.6.31/boc01/005-091103-isl12024.patch | 511 --------------------- .../linux-2.6.31/boc01/005-091110-isl12024.patch | 509 ++++++++++++++++++++ recipes/linux/linux_2.6.31.bb | 2 +- 3 files changed, 510 insertions(+), 512 deletions(-) delete mode 100644 recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch create mode 100644 recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch (limited to 'recipes') diff --git a/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch deleted file mode 100644 index 9daab5acaa..0000000000 --- a/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch +++ /dev/null @@ -1,511 +0,0 @@ -Support for the ISL12024 RTC, EEPROM and unique ID. - -Signed-off-by: Jeremy Laine - -Index: linux-2.6.31/drivers/misc/eeprom/at24.c -=================================================================== ---- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-03 11:17:22.000000000 +0100 -@@ -115,6 +115,8 @@ - { "spd", AT24_DEVICE_MAGIC(2048 / 8, - AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, - { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) }, -+ /* Intersil isl12024 eeprom */ -+ { "isl12024-eeprom", AT24_DEVICE_MAGIC(4096 / 8, AT24_FLAG_ADDR16) }, - /* 24rf08 quirk is handled at i2c-core */ - { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) }, - { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, -Index: linux-2.6.31/drivers/rtc/Kconfig -=================================================================== ---- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-03 11:13:42.000000000 +0100 -@@ -193,6 +193,15 @@ - This driver can also be built as a module. If so, the module - will be called rtc-isl1208. - -+config RTC_DRV_ISL12024 -+ tristate "Intersil 12024" -+ help -+ If you say yes here you get support for the Intersil ISL12024 -+ RTC chip. This driver also exposes the chip's unique ID. -+ -+ This driver can also be built as a module. If so, the module -+ will be called rtc-isl12024. -+ - config RTC_DRV_X1205 - tristate "Xicor/Intersil X1205" - help -Index: linux-2.6.31/drivers/rtc/Makefile -=================================================================== ---- linux-2.6.31.orig/drivers/rtc/Makefile 2009-09-10 00:13:59.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Makefile 2009-11-03 11:13:42.000000000 +0100 -@@ -40,6 +40,7 @@ - obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o - obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o - obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o -+obj-$(CONFIG_RTC_DRV_ISL12024) += rtc-isl12024.o - obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o - obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t94.o - obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o -Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-03 11:14:33.000000000 +0100 -@@ -0,0 +1,457 @@ -+/* -+ * Intersil ISL12024 rtc class driver -+ * -+ * Copyright (C) 2007, CenoSYS (www.cenosys.com). -+ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). -+ * -+ * Guillaume Ligneul -+ * Sylvain Giroudon -+ * Jeremy Laine -+ * -+ * Based on rtc-x1205. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define DRV_VERSION "0.3" -+ -+/* offsets into CCR area */ -+ -+#define CCR_SEC 0 -+#define CCR_MIN 1 -+#define CCR_HOUR 2 -+#define CCR_MDAY 3 -+#define CCR_MONTH 4 -+#define CCR_YEAR 5 -+#define CCR_WDAY 6 -+#define CCR_Y2K 7 -+ -+/* alarm0 section */ -+#define ISL12024_REG_ALARM0 0x08 /* Base address of ALARM0 */ -+ -+/* device id section */ -+#define ISL12024_REG_ID 0x20 -+#define ISL12024_ID_SECTION_LEN 8 -+ -+/* rtc section */ -+#define ISL12024_REG_RTC 0x30 /* Base address of RTC */ -+#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ -+#define ISL12024_REG_HR_PM (1<<5) /* AM/PM bit in 12h mode */ -+#define ISL12024_RTC_SECTION_LEN 8 -+ -+/* control/status section */ -+#define ISL12024_REG_SR 0x3F -+#define ISL12024_REG_SR_BAT (1<<7) /* battery */ -+#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ -+#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ -+#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ -+#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ -+#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ -+#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ -+#define ISL12024_REG_INT 0x11 -+ -+#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ -+ -+static struct i2c_driver isl12024_driver; -+ -+static int -+isl12024_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[], -+ unsigned len) -+{ -+ int ret; -+ u8 dt_addr[2]; -+ -+ struct i2c_msg msgs[2] = { -+ { -+ .addr = client->addr, -+ .flags = 0, -+ .len = 2, -+ .buf = dt_addr, -+ }, -+ { -+ .addr = client->addr, -+ .flags = I2C_M_RD, -+ .len = len, -+ .buf = buf, -+ }, -+ }; -+ -+ dt_addr[0] = 0; -+ dt_addr[1] = reg; -+ -+ ret = i2c_transfer(client->adapter, msgs, 2); -+ if (ret < 0) { -+ dev_err(&client->dev, "read error (%i)\n", ret); -+ return ret; -+ } -+ return 0; -+} -+ -+static int -+isl12024_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], -+ unsigned len) -+{ -+ int ret; -+ u8 i2c_buf[10]; -+ -+ i2c_buf[0] = 0; -+ i2c_buf[1] = reg; -+ memcpy(&i2c_buf[2], &buf[0], len); -+ -+ ret = i2c_master_send(client, i2c_buf, len + 2); -+ if (ret != len + 2) { -+ dev_err(&client->dev, "write error (%d)\n", ret); -+ return -EIO; -+ } -+ return 0; -+} -+ -+static int isl12024_read_time(struct i2c_client *client, -+ struct rtc_time *tm, u8 reg_base) -+{ -+ unsigned char sr; -+ int err; -+ u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; -+ -+ if (isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, -+ sizeof(sr)) < 0) { -+ dev_err(&client->dev, "reading SR failed\n"); -+ return -EIO; -+ } -+ -+ err = isl12024_i2c_read_regs(client, reg_base, regs, -+ ISL12024_RTC_SECTION_LEN); -+ -+ if (err < 0) { -+ dev_err(&client->dev, "reading RTC section failed\n"); -+ return err; -+ } -+ -+ tm->tm_sec = bcd2bin(regs[0]); -+ tm->tm_min = bcd2bin(regs[1]); -+ -+ /* HR field has a more complex interpretation */ -+ if (regs[2] & ISL12024_REG_HR_MIL) { -+ /* 24h format */ -+ tm->tm_hour = bcd2bin(regs[2] & 0x3f); -+ } else { -+ /* 12h format */ -+ tm->tm_hour = bcd2bin(regs[2] & 0x1f); -+ if (regs[2] & ISL12024_REG_HR_PM) /* PM flag set */ -+ tm->tm_hour += 12; -+ } -+ -+ tm->tm_mday = bcd2bin(regs[3]); -+ tm->tm_mon = bcd2bin(regs[4]); -+ tm->tm_year = bcd2bin(regs[5]) + 100; -+ tm->tm_wday = bcd2bin(regs[6]); -+ -+ return rtc_valid_tm(tm); -+} -+ -+static int isl12024_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base, -+ unsigned char alm_enable) -+{ -+ int i, xfer, nbytes; -+ unsigned char buf[8]; -+ -+ static const unsigned char wel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL }; -+ -+ static const unsigned char rwel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; -+ -+ static const unsigned char diswe[3] = { 0, ISL12024_REG_SR, 0 }; -+ -+ dev_dbg(&client->dev, -+ "%s: secs=%d, mins=%d, hours=%d\n", -+ __func__, -+ tm->tm_sec, tm->tm_min, tm->tm_hour); -+ -+ buf[CCR_SEC] = bin2bcd(tm->tm_sec); -+ buf[CCR_MIN] = bin2bcd(tm->tm_min); -+ -+ /* set hour and 24hr bit */ -+ buf[CCR_HOUR] = bin2bcd(tm->tm_hour) | ISL12024_REG_HR_MIL; -+ -+ /* should we also set the date? */ -+ if (datetoo) { -+ dev_dbg(&client->dev, -+ "%s: mday=%d, mon=%d, year=%d, wday=%d\n", -+ __func__, -+ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); -+ -+ buf[CCR_MDAY] = bin2bcd(tm->tm_mday); -+ -+ /* month, 1 - 12 */ -+ buf[CCR_MONTH] = bin2bcd(tm->tm_mon); -+ -+ /* year, since the rtc epoch*/ -+ buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100); -+ buf[CCR_WDAY] = tm->tm_wday & 0x07; -+ buf[CCR_Y2K] = bin2bcd(tm->tm_year / 100); -+ } -+ -+ /* If writing alarm registers, set compare bits on registers 0-4 */ -+ if (reg_base == ISL12024_REG_ALARM0) -+ for (i = 0; i <= 4; i++) -+ buf[i] |= 0x80; -+ -+ /* this sequence is required to unlock the chip */ -+ xfer = i2c_master_send(client, wel, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); -+ return -EIO; -+ } -+ -+ xfer = i2c_master_send(client, rwel, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer); -+ return -EIO; -+ } -+ -+ /* write register's data */ -+ if (datetoo) -+ nbytes = 8; -+ else -+ nbytes = 3; -+ xfer = isl12024_i2c_set_regs(client, reg_base, buf, nbytes); -+ if (xfer < 0) -+ return xfer; -+ -+ /* If we wrote to the nonvolatile region, wait 10msec for write cycle*/ -+ if (reg_base == ISL12024_REG_ALARM0) { -+ unsigned char al0e[3] = { 0, ISL12024_REG_INT, 0 }; -+ -+ msleep(10); -+ -+ /* ...and set or clear the AL0E bit in the INT register */ -+ -+ /* Need to set RWEL again as the write has cleared it */ -+ xfer = i2c_master_send(client, rwel, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, -+ "%s: al0e rwel - %d\n", -+ __func__, -+ xfer); -+ return -EIO; -+ } -+ -+ if (alm_enable) -+ al0e[2] = ISL12024_INT_AL0E; -+ -+ xfer = i2c_master_send(client, al0e, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, -+ "%s: al0e - %d\n", -+ __func__, -+ xfer); -+ return -EIO; -+ } -+ -+ /* and wait 10msec again for this write to complete */ -+ msleep(10); -+ } -+ -+ /* disable further writes */ -+ xfer = i2c_master_send(client, diswe, 3); -+ if (xfer != 3) { -+ dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ -+static int isl12024_fix_osc(struct i2c_client *client) -+{ -+ int err; -+ struct rtc_time tm; -+ -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ -+ err = isl12024_set_datetime(client, &tm, 0, ISL12024_REG_RTC, 0); -+ if (err < 0) -+ dev_err(&client->dev, -+ "unable to restart the oscillator (%d)\n", err); -+ -+ return err; -+} -+ -+static int isl12024_rtc_read_time(struct device *dev, struct rtc_time *tm) -+{ -+ return isl12024_read_time(to_i2c_client(dev), tm, -+ ISL12024_REG_RTC); -+} -+ -+static int isl12024_rtc_set_time(struct device *dev, struct rtc_time *tm) -+{ -+ return isl12024_set_datetime(to_i2c_client(dev), tm, 1, -+ ISL12024_REG_RTC, 0); -+} -+ -+static int isl12024_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) -+{ -+ unsigned char intr; -+ int err; -+ struct i2c_client *client = to_i2c_client(dev); -+ -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_INT, &intr, -+ sizeof(intr)); -+ if (err < 0) -+ return err; -+ alrm->enabled = (intr & ISL12024_INT_AL0E) ? 1 : 0; -+ -+ return isl12024_read_time(client, &alrm->time, ISL12024_REG_ALARM0); -+} -+ -+static int isl12024_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) -+{ -+ return isl12024_set_datetime(to_i2c_client(dev), &alrm->time, 1, -+ ISL12024_REG_ALARM0, alrm->enabled); -+} -+ -+static int -+isl12024_rtc_proc(struct device *dev, struct seq_file *seq) -+{ -+ /* Nothing to do */ -+ return 0; -+} -+ -+static const struct rtc_class_ops isl12024_rtc_ops = { -+ .proc = isl12024_rtc_proc, -+ .read_time = isl12024_rtc_read_time, -+ .set_time = isl12024_rtc_set_time, -+ .read_alarm = isl12024_rtc_read_alarm, -+ .set_alarm = isl12024_rtc_set_alarm, -+}; -+ -+static ssize_t isl12024_show_id(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct i2c_client *client = to_i2c_client(dev); -+ int err; -+ ssize_t len = 0; -+ int i; -+ u8 id_buffer[ISL12024_ID_SECTION_LEN]; -+ -+ /* Read unique id from eeprom */ -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, -+ sizeof(id_buffer)); -+ if (err < 0) { -+ dev_err(&client->dev, "reading RTC section failed\n"); -+ return err; -+ } -+ -+ /* Print hexadecimal */ -+ for (i = 0; i < sizeof(id_buffer); i++) -+ len += sprintf(buf + len, "%02X", id_buffer[i]); -+ len += sprintf(buf + len, "\n"); -+ return len; -+} -+ -+static DEVICE_ATTR(id, S_IRUGO, isl12024_show_id, NULL); -+ -+static int -+isl12024_probe(struct i2c_client *client, const struct i2c_device_id *id) -+{ -+ int rc = 0; -+ unsigned char sr; -+ struct rtc_device *rtc = NULL; -+ -+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) -+ return -ENODEV; -+ -+ dev_info(&client->dev, -+ "chip found, driver version " DRV_VERSION "\n"); -+ -+ rtc = rtc_device_register(isl12024_driver.driver.name, -+ &client->dev, &isl12024_rtc_ops, -+ THIS_MODULE); -+ if (IS_ERR(rtc)) -+ return PTR_ERR(rtc); -+ -+ i2c_set_clientdata(client, rtc); -+ -+ rc = isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, sizeof(sr)); -+ if (rc < 0) { -+ dev_err(&client->dev, "reading status failed\n"); -+ goto exit_unregister; -+ } -+ -+ /* Check for power failures and enable the osc */ -+ if (sr & ISL12024_REG_SR_RTCF) { -+ dev_warn(&client->dev, "rtc power failure detected, " -+ "please set clock.\n"); -+ udelay(50); -+ isl12024_fix_osc(client); -+ } -+ -+ /* Register sysfs hooks */ -+ rc = device_create_file(&client->dev, &dev_attr_id); -+ if (rc < 0) -+ goto exit_unregister; -+ -+ return 0; -+ -+exit_unregister: -+ rtc_device_unregister(rtc); -+ -+ return rc; -+} -+ -+static int -+isl12024_remove(struct i2c_client *client) -+{ -+ struct rtc_device *rtc = i2c_get_clientdata(client); -+ -+ rtc_device_unregister(rtc); -+ device_remove_file(&client->dev, &dev_attr_id); -+ -+ return 0; -+} -+ -+static const struct i2c_device_id isl12024_id[] = { -+ { "isl12024", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, isl12024_id); -+ -+static struct i2c_driver isl12024_driver = { -+ .driver = { -+ .name = "rtc-isl12024", -+ }, -+ .probe = isl12024_probe, -+ .remove = isl12024_remove, -+ .id_table = isl12024_id, -+}; -+ -+/* module init/exit */ -+ -+static int __init isl12024_init(void) -+{ -+ return i2c_add_driver(&isl12024_driver); -+} -+ -+static void __exit isl12024_exit(void) -+{ -+ i2c_del_driver(&isl12024_driver); -+} -+ -+MODULE_AUTHOR("Guillaume Ligneul "); -+MODULE_DESCRIPTION("Intersil ISL12024 driver"); -+MODULE_LICENSE("GPL"); -+MODULE_VERSION(DRV_VERSION); -+ -+module_init(isl12024_init); -+module_exit(isl12024_exit); diff --git a/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch new file mode 100644 index 0000000000..0d0f5c42c0 --- /dev/null +++ b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch @@ -0,0 +1,509 @@ +Support for the ISL12024 RTC, EEPROM and unique ID. + +Signed-off-by: Jeremy Laine + +Index: linux-2.6.31/drivers/misc/eeprom/at24.c +=================================================================== +--- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-10 17:54:17.000000000 +0100 +@@ -115,6 +115,8 @@ + { "spd", AT24_DEVICE_MAGIC(2048 / 8, + AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, + { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) }, ++ /* Intersil isl12024 eeprom */ ++ { "isl12024-eeprom", AT24_DEVICE_MAGIC(4096 / 8, AT24_FLAG_ADDR16) }, + /* 24rf08 quirk is handled at i2c-core */ + { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) }, + { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, +Index: linux-2.6.31/drivers/rtc/Kconfig +=================================================================== +--- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-10 17:54:17.000000000 +0100 +@@ -193,6 +193,15 @@ + This driver can also be built as a module. If so, the module + will be called rtc-isl1208. + ++config RTC_DRV_ISL12024 ++ tristate "Intersil ISL12024" ++ help ++ If you say yes here you get support for the Intersil ISL12024 ++ RTC chip. This driver also exposes the chip's unique ID. ++ ++ This driver can also be built as a module. If so, the module ++ will be called rtc-isl12024. ++ + config RTC_DRV_X1205 + tristate "Xicor/Intersil X1205" + help +Index: linux-2.6.31/drivers/rtc/Makefile +=================================================================== +--- linux-2.6.31.orig/drivers/rtc/Makefile 2009-11-10 17:20:53.000000000 +0100 ++++ linux-2.6.31/drivers/rtc/Makefile 2009-11-10 17:54:17.000000000 +0100 +@@ -40,6 +40,7 @@ + obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o + obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o + obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o ++obj-$(CONFIG_RTC_DRV_ISL12024) += rtc-isl12024.o + obj-$(CONFIG_RTC_DRV_M41T80) += rtc-m41t80.o + obj-$(CONFIG_RTC_DRV_M41T94) += rtc-m41t94.o + obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o +Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-10 17:54:31.000000000 +0100 +@@ -0,0 +1,455 @@ ++/* ++ * Intersil ISL12024 rtc class driver ++ * ++ * Copyright (C) 2007, CenoSYS (www.cenosys.com). ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * ++ * Guillaume Ligneul ++ * Sylvain Giroudon ++ * Jeremy Laine ++ * ++ * Based on rtc-x1205. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define DRV_VERSION "0.3" ++ ++/* offsets into CCR area */ ++ ++#define CCR_SEC 0 ++#define CCR_MIN 1 ++#define CCR_HOUR 2 ++#define CCR_MDAY 3 ++#define CCR_MONTH 4 ++#define CCR_YEAR 5 ++#define CCR_WDAY 6 ++#define CCR_Y2K 7 ++ ++/* alarm0 section */ ++#define ISL12024_REG_ALARM0 0x08 /* Base address of ALARM0 */ ++ ++/* device id section */ ++#define ISL12024_REG_ID 0x20 ++#define ISL12024_ID_SECTION_LEN 8 ++ ++/* rtc section */ ++#define ISL12024_REG_RTC 0x30 /* Base address of RTC */ ++#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ ++#define ISL12024_REG_HR_PM (1<<5) /* AM/PM bit in 12h mode */ ++#define ISL12024_RTC_SECTION_LEN 8 ++ ++/* status section */ ++#define ISL12024_REG_SR 0x3F ++#define ISL12024_REG_SR_BAT (1<<7) /* battery */ ++#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ ++#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ ++#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ ++#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ ++#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ ++#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ ++ ++/* control section */ ++#define ISL12024_REG_INT 0x11 ++#define ISL12024_INT_AL0E (1<<5) /* Alarm 0 enable */ ++ ++static struct i2c_driver isl12024_driver; ++ ++static int ++isl12024_i2c_read_regs(struct i2c_client *client, u8 reg, u8 buf[], ++ unsigned len) ++{ ++ int ret; ++ u8 dt_addr[2]; ++ ++ struct i2c_msg msgs[2] = { ++ { ++ .addr = client->addr, ++ .flags = 0, ++ .len = 2, ++ .buf = dt_addr, ++ }, ++ { ++ .addr = client->addr, ++ .flags = I2C_M_RD, ++ .len = len, ++ .buf = buf, ++ }, ++ }; ++ ++ dt_addr[0] = 0; ++ dt_addr[1] = reg; ++ ++ ret = i2c_transfer(client->adapter, msgs, 2); ++ if (ret != 2) { ++ dev_err(&client->dev, "read error (%i)\n", ret); ++ return (ret < 0) ? ret : -EIO; ++ } ++ return 0; ++} ++ ++static int ++isl12024_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], ++ unsigned len) ++{ ++ int ret; ++ u8 i2c_buf[10]; ++ ++ i2c_buf[0] = 0; ++ i2c_buf[1] = reg; ++ memcpy(&i2c_buf[2], &buf[0], len); ++ ++ ret = i2c_master_send(client, i2c_buf, len + 2); ++ if (ret != len + 2) { ++ dev_err(&client->dev, "write error (%d)\n", ret); ++ return (ret < 0) ? ret : -EIO; ++ } ++ return 0; ++} ++ ++static int isl12024_read_time(struct i2c_client *client, ++ struct rtc_time *tm, u8 reg_base) ++{ ++ unsigned char sr; ++ int err; ++ u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; ++ ++ if (isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, ++ sizeof(sr)) < 0) { ++ dev_err(&client->dev, "reading SR failed\n"); ++ return -EIO; ++ } ++ ++ err = isl12024_i2c_read_regs(client, reg_base, regs, ++ ISL12024_RTC_SECTION_LEN); ++ ++ if (err < 0) { ++ dev_err(&client->dev, "reading RTC section failed\n"); ++ return err; ++ } ++ ++ tm->tm_sec = bcd2bin(regs[CCR_SEC]); ++ tm->tm_min = bcd2bin(regs[CCR_MIN]); ++ ++ /* HR field has a more complex interpretation */ ++ if (regs[CCR_HOUR] & ISL12024_REG_HR_MIL) { ++ /* 24h format */ ++ tm->tm_hour = bcd2bin(regs[CCR_HOUR] & 0x3f); ++ } else { ++ /* 12h format */ ++ tm->tm_hour = bcd2bin(regs[CCR_HOUR] & 0x1f); ++ if (regs[CCR_HOUR] & ISL12024_REG_HR_PM) /* PM flag set */ ++ tm->tm_hour += 12; ++ } ++ ++ tm->tm_mday = bcd2bin(regs[CCR_MDAY]); ++ tm->tm_mon = bcd2bin(regs[CCR_MONTH]) - 1; ++ tm->tm_year = bcd2bin(regs[CCR_YEAR]) ++ + (bcd2bin(regs[CCR_Y2K]) * 100) - 1900; ++ tm->tm_wday = bcd2bin(regs[CCR_WDAY]); ++ ++ return rtc_valid_tm(tm); ++} ++ ++static int isl12024_set_datetime(struct i2c_client *client, struct rtc_time *tm, ++ int datetoo, u8 reg_base, ++ unsigned char alm_enable) ++{ ++ int i, xfer, nbytes; ++ unsigned char buf[8]; ++ ++ static const unsigned char wel[3] = { 0, ISL12024_REG_SR, ++ ISL12024_REG_SR_WEL }; ++ ++ static const unsigned char rwel[3] = { 0, ISL12024_REG_SR, ++ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; ++ ++ static const unsigned char diswe[3] = { 0, ISL12024_REG_SR, 0 }; ++ ++ dev_dbg(&client->dev, ++ "%s: secs=%d, mins=%d, hours=%d\n", ++ __func__, ++ tm->tm_sec, tm->tm_min, tm->tm_hour); ++ ++ buf[CCR_SEC] = bin2bcd(tm->tm_sec); ++ buf[CCR_MIN] = bin2bcd(tm->tm_min); ++ ++ /* set hour and 24hr bit */ ++ buf[CCR_HOUR] = bin2bcd(tm->tm_hour) | ISL12024_REG_HR_MIL; ++ ++ /* should we also set the date? */ ++ if (datetoo) { ++ dev_dbg(&client->dev, ++ "%s: mday=%d, mon=%d, year=%d, wday=%d\n", ++ __func__, ++ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); ++ ++ buf[CCR_MDAY] = bin2bcd(tm->tm_mday); ++ ++ /* month, 1 - 12 */ ++ buf[CCR_MONTH] = bin2bcd(tm->tm_mon + 1); ++ ++ /* year, since the rtc epoch*/ ++ buf[CCR_YEAR] = bin2bcd(tm->tm_year % 100); ++ buf[CCR_WDAY] = tm->tm_wday & 0x07; ++ buf[CCR_Y2K] = bin2bcd(19 + tm->tm_year / 100); ++ } ++ ++ /* If writing alarm registers, set compare bits on registers 0-4 */ ++ if (reg_base == ISL12024_REG_ALARM0) ++ for (i = 0; i <= 4; i++) ++ buf[i] |= 0x80; ++ ++ /* this sequence is required to unlock the chip */ ++ xfer = i2c_master_send(client, wel, 3); ++ if (xfer != 3) { ++ dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); ++ return -EIO; ++ } ++ ++ xfer = i2c_master_send(client, rwel, 3); ++ if (xfer != 3) { ++ dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer); ++ return -EIO; ++ } ++ ++ /* write register's data */ ++ if (datetoo) ++ nbytes = 8; ++ else ++ nbytes = 3; ++ xfer = isl12024_i2c_set_regs(client, reg_base, buf, nbytes); ++ if (xfer < 0) ++ return xfer; ++ ++ /* If we wrote to the nonvolatile region, wait 10msec for write cycle*/ ++ if (reg_base == ISL12024_REG_ALARM0) { ++ unsigned char al0e[3] = { 0, ISL12024_REG_INT, 0 }; ++ ++ msleep(10); ++ ++ /* ...and set or clear the AL0E bit in the INT register */ ++ ++ /* Need to set RWEL again as the write has cleared it */ ++ xfer = i2c_master_send(client, rwel, 3); ++ if (xfer != 3) { ++ dev_err(&client->dev, "%s: al0e rwel - %d\n", ++ __func__, xfer); ++ return -EIO; ++ } ++ ++ if (alm_enable) ++ al0e[2] = ISL12024_INT_AL0E; ++ ++ xfer = i2c_master_send(client, al0e, 3); ++ if (xfer != 3) { ++ dev_err(&client->dev, "%s: al0e - %d\n", ++ __func__, xfer); ++ return -EIO; ++ } ++ ++ /* and wait 10msec again for this write to complete */ ++ msleep(10); ++ } ++ ++ /* disable further writes */ ++ xfer = i2c_master_send(client, diswe, 3); ++ if (xfer != 3) { ++ dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer); ++ return -EIO; ++ } ++ ++ return 0; ++} ++ ++static int isl12024_fix_osc(struct i2c_client *client) ++{ ++ int err; ++ struct rtc_time tm; ++ ++ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; ++ ++ err = isl12024_set_datetime(client, &tm, 0, ISL12024_REG_RTC, 0); ++ if (err < 0) ++ dev_err(&client->dev, ++ "unable to restart the oscillator (%d)\n", err); ++ ++ return err; ++} ++ ++static int isl12024_rtc_read_time(struct device *dev, struct rtc_time *tm) ++{ ++ return isl12024_read_time(to_i2c_client(dev), tm, ++ ISL12024_REG_RTC); ++} ++ ++static int isl12024_rtc_set_time(struct device *dev, struct rtc_time *tm) ++{ ++ return isl12024_set_datetime(to_i2c_client(dev), tm, 1, ++ ISL12024_REG_RTC, 0); ++} ++ ++static int isl12024_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ unsigned char intr; ++ int err; ++ struct i2c_client *client = to_i2c_client(dev); ++ ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_INT, &intr, ++ sizeof(intr)); ++ if (err < 0) ++ return err; ++ alrm->enabled = (intr & ISL12024_INT_AL0E) ? 1 : 0; ++ ++ return isl12024_read_time(client, &alrm->time, ISL12024_REG_ALARM0); ++} ++ ++static int isl12024_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ return isl12024_set_datetime(to_i2c_client(dev), &alrm->time, 1, ++ ISL12024_REG_ALARM0, alrm->enabled); ++} ++ ++static int ++isl12024_rtc_proc(struct device *dev, struct seq_file *seq) ++{ ++ /* Nothing to do */ ++ return 0; ++} ++ ++static const struct rtc_class_ops isl12024_rtc_ops = { ++ .proc = isl12024_rtc_proc, ++ .read_time = isl12024_rtc_read_time, ++ .set_time = isl12024_rtc_set_time, ++ .read_alarm = isl12024_rtc_read_alarm, ++ .set_alarm = isl12024_rtc_set_alarm, ++}; ++ ++static ssize_t isl12024_show_id(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) ++{ ++ struct i2c_client *client = to_i2c_client(dev); ++ int err; ++ ssize_t len = 0; ++ int i; ++ u8 id_buffer[ISL12024_ID_SECTION_LEN]; ++ ++ /* Read unique id from eeprom */ ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, ++ sizeof(id_buffer)); ++ if (err < 0) { ++ dev_err(&client->dev, "reading ID section failed\n"); ++ return err; ++ } ++ ++ /* Print hexadecimal */ ++ for (i = 0; i < sizeof(id_buffer); i++) ++ len += sprintf(buf + len, "%02X", id_buffer[i]); ++ len += sprintf(buf + len, "\n"); ++ return len; ++} ++ ++static DEVICE_ATTR(id, S_IRUGO, isl12024_show_id, NULL); ++ ++static int ++isl12024_probe(struct i2c_client *client, const struct i2c_device_id *id) ++{ ++ int rc = 0; ++ unsigned char sr; ++ struct rtc_device *rtc = NULL; ++ ++ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) ++ return -ENODEV; ++ ++ dev_info(&client->dev, ++ "chip found, driver version " DRV_VERSION "\n"); ++ ++ rtc = rtc_device_register(isl12024_driver.driver.name, ++ &client->dev, &isl12024_rtc_ops, ++ THIS_MODULE); ++ if (IS_ERR(rtc)) ++ return PTR_ERR(rtc); ++ ++ i2c_set_clientdata(client, rtc); ++ ++ rc = isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, sizeof(sr)); ++ if (rc < 0) { ++ dev_err(&client->dev, "reading status failed\n"); ++ goto exit_unregister; ++ } ++ ++ /* Check for power failures and enable the osc */ ++ if (sr & ISL12024_REG_SR_RTCF) { ++ dev_warn(&client->dev, "rtc power failure detected, " ++ "please set clock.\n"); ++ udelay(50); ++ isl12024_fix_osc(client); ++ } ++ ++ /* Register sysfs hooks */ ++ rc = device_create_file(&client->dev, &dev_attr_id); ++ if (rc < 0) ++ goto exit_unregister; ++ ++ return 0; ++ ++exit_unregister: ++ rtc_device_unregister(rtc); ++ ++ return rc; ++} ++ ++static int ++isl12024_remove(struct i2c_client *client) ++{ ++ struct rtc_device *rtc = i2c_get_clientdata(client); ++ ++ rtc_device_unregister(rtc); ++ device_remove_file(&client->dev, &dev_attr_id); ++ ++ return 0; ++} ++ ++static const struct i2c_device_id isl12024_id[] = { ++ { "isl12024", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, isl12024_id); ++ ++static struct i2c_driver isl12024_driver = { ++ .driver = { ++ .name = "rtc-isl12024", ++ }, ++ .probe = isl12024_probe, ++ .remove = isl12024_remove, ++ .id_table = isl12024_id, ++}; ++ ++/* module init/exit */ ++ ++static int __init isl12024_init(void) ++{ ++ return i2c_add_driver(&isl12024_driver); ++} ++ ++static void __exit isl12024_exit(void) ++{ ++ i2c_del_driver(&isl12024_driver); ++} ++ ++MODULE_AUTHOR("Guillaume Ligneul "); ++MODULE_DESCRIPTION("Intersil ISL12024 driver"); ++MODULE_LICENSE("GPL"); ++MODULE_VERSION(DRV_VERSION); ++ ++module_init(isl12024_init); ++module_exit(isl12024_exit); diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index 21ebe2cc95..845909c76c 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -26,7 +26,7 @@ SRC_URI_append_boc01 = "\ file://boc01.dts \ file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ - file://005-091103-isl12024.patch;patch=1 \ + file://005-091110-isl12024.patch;patch=1 \ file://007-091005-lm73.patch;patch=1 \ file://011-091028-gpio.patch;patch=1 \ file://012-091019-capsense.patch;patch=1 \ -- cgit v1.2.3 From 5d5e4d623fb72a069b820f4f36f57637eef6e675 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 21:06:53 +0100 Subject: perl: added libhtml-treebuilder-perl and libhtml-treebuilder-perl-native recipes --- recipes/perl/libhtml-treebuilder-perl-native_3.23.bb | 6 ++++++ recipes/perl/libhtml-treebuilder-perl_3.23.bb | 9 +++++++++ 2 files changed, 15 insertions(+) create mode 100644 recipes/perl/libhtml-treebuilder-perl-native_3.23.bb create mode 100644 recipes/perl/libhtml-treebuilder-perl_3.23.bb (limited to 'recipes') diff --git a/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb b/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb new file mode 100644 index 0000000000..2fb32baa70 --- /dev/null +++ b/recipes/perl/libhtml-treebuilder-perl-native_3.23.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libhtml-treebuilder-perl_${PV}.bb + +inherit native + diff --git a/recipes/perl/libhtml-treebuilder-perl_3.23.bb b/recipes/perl/libhtml-treebuilder-perl_3.23.bb new file mode 100644 index 0000000000..c18fc54ec5 --- /dev/null +++ b/recipes/perl/libhtml-treebuilder-perl_3.23.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "HTML::TreeBUilder - Class is for HTML syntax trees that get built out of HTML source" +SECTION = "libs" +LICENSE = "Artistic|GPL" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-${PV}.tar.gz" + +S = "${WORKDIR}/HTML-Tree-${PV}" + +inherit cpan -- cgit v1.2.3 From 09ebc69351c7e28b57ded8c95ee0d27b065e36a1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 10 Nov 2009 22:16:43 +0100 Subject: perl: complete config.sh fix --- recipes/perl/perl-native_5.8.8.bb | 2 +- recipes/perl/perl.inc | 4 ++-- recipes/perl/perl_5.8.8.bb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index cac474edc4..ba05406eb0 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -88,7 +88,7 @@ do_stage_append() { } do_stage_append_nylon() { # get rid of definitions not supported by the gcc version we use for nylon... - for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR_HOST}/perl/config.sh; do + for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR}/${HOST_SYS}/perl/config.sh; do perl -pi -e 's/-Wdeclaration-after-statement //g' ${i} done } diff --git a/recipes/perl/perl.inc b/recipes/perl/perl.inc index 00184a9dac..9e20ae63e6 100644 --- a/recipes/perl/perl.inc +++ b/recipes/perl/perl.inc @@ -36,8 +36,8 @@ do_install() { } do_stage() { - install -d ${STAGING_DIR_HOST}/perl/ - install config.sh ${STAGING_DIR_HOST}/perl/ + install -d ${STAGING_DIR}/${HOST_SYS}/perl/ + install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ } PACKAGES_DYNAMIC = "perl-module-*" diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb index 2508719736..35fcc83ccc 100644 --- a/recipes/perl/perl_5.8.8.bb +++ b/recipes/perl/perl_5.8.8.bb @@ -141,12 +141,12 @@ do_install() { fi } do_stage() { - install -d ${STAGING_DIR_HOST}/perl \ + install -d ${STAGING_DIR}/${HOST_SYS}/perl \ ${STAGING_LIBDIR_NATIVE}/perl/${PV} \ ${STAGING_LIBDIR}/perl/${PV}/CORE \ ${STAGING_DATADIR}/perl/${PV}/ExtUtils # target config, used by cpan.bbclass to extract version information - install config.sh ${STAGING_DIR_HOST}/perl/ + install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ # target configuration, used by native perl when cross-compiling install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl # target configuration -- cgit v1.2.3 From 545767da2e0edfc595dc1acd9b3b17083d984c62 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 22:48:03 +0100 Subject: libhtml-parser-perl-native: new recipe --- recipes/perl/libhtml-parser-perl-native_3.60.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/perl/libhtml-parser-perl-native_3.60.bb (limited to 'recipes') diff --git a/recipes/perl/libhtml-parser-perl-native_3.60.bb b/recipes/perl/libhtml-parser-perl-native_3.60.bb new file mode 100644 index 0000000000..3760a422fa --- /dev/null +++ b/recipes/perl/libhtml-parser-perl-native_3.60.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libhtml-parser-perl_${PV}.bb + +inherit native + -- cgit v1.2.3 From 99f12bb3ac6f33d747e5def8644cba7ff01f382f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Tue, 10 Nov 2009 22:48:35 +0100 Subject: libhtml-tagset-perl-native: new recipe --- recipes/perl/libhtml-tagset-perl-native_3.20.bb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 recipes/perl/libhtml-tagset-perl-native_3.20.bb (limited to 'recipes') diff --git a/recipes/perl/libhtml-tagset-perl-native_3.20.bb b/recipes/perl/libhtml-tagset-perl-native_3.20.bb new file mode 100644 index 0000000000..8e83220a4d --- /dev/null +++ b/recipes/perl/libhtml-tagset-perl-native_3.20.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libhtml-tagset-perl_${PV}.bb -- cgit v1.2.3 From f5fbf1ff3ebbb35bdc6935decdd86f11ec415ff1 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 11 Nov 2009 02:34:21 +0100 Subject: libnl2: new recipe; netlink support library v2 --- recipes/libnl/libnl2_git.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes/libnl/libnl2_git.bb (limited to 'recipes') diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb new file mode 100644 index 0000000000..02010dc58d --- /dev/null +++ b/recipes/libnl/libnl2_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://people.suug.ch/~tgr/libnl" +PV = "1.0+gitr${SRCREV}" +PR = "r0" + +inherit autotools pkgconfig + +#CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' + +SRC_URI = "git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git" +S = "${WORKDIR}/git" + +do_stage () { + autotools_stage_all prefix=${prefix} +} + +PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl" +FILES_${PN}-route = "${libdir}/libnl-route.so.*" +FILES_${PN}-nf = "${libdir}/libnl-nfd.so.*" +FILES_${PN}-genl = "${libdir}/libnl-genl.so.*" + -- cgit v1.2.3 From 229d8eda157005d2d9f52daabacd3ea8d6ae548e Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 11 Nov 2009 02:34:51 +0100 Subject: freesmartphone: misc-vapi is gone; remove traces --- recipes/freesmartphone/cornucopia.inc | 4 ++-- recipes/freesmartphone/fsonetworkd_git.bb | 3 ++- recipes/freesmartphone/libfsobasics_git.bb | 1 - recipes/freesmartphone/libfsoframework_git.bb | 2 +- recipes/freesmartphone/libfsotransport_git.bb | 1 - recipes/freesmartphone/misc-vapi_git.bb | 4 ---- 6 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 recipes/freesmartphone/misc-vapi_git.bb (limited to 'recipes') diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc index 17da17cb08..bfc461edbc 100644 --- a/recipes/freesmartphone/cornucopia.inc +++ b/recipes/freesmartphone/cornucopia.inc @@ -3,9 +3,9 @@ AUTHOR = "Team FSO" LICENSE = "LGPL" SECTION = "devel" DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee" -DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics misc-vapi'.split())]}" +DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}" PV = "invalid, please override" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" S = "${WORKDIR}/git/${PN}" diff --git a/recipes/freesmartphone/fsonetworkd_git.bb b/recipes/freesmartphone/fsonetworkd_git.bb index 4a14b25aef..002624fc2b 100644 --- a/recipes/freesmartphone/fsonetworkd_git.bb +++ b/recipes/freesmartphone/fsonetworkd_git.bb @@ -1,4 +1,5 @@ require cornucopia.inc inherit fso-plugin -PV = "0.0.1.0+gitr${SRCREV}" +DEPENDS += "libnl2" +PV = "0.1.0.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsobasics_git.bb b/recipes/freesmartphone/libfsobasics_git.bb index 5c4867a699..3a268105d7 100644 --- a/recipes/freesmartphone/libfsobasics_git.bb +++ b/recipes/freesmartphone/libfsobasics_git.bb @@ -1,6 +1,5 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi" PV = "0.8.2.0+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb index 7c70da4fb9..fd2eb2e19f 100644 --- a/recipes/freesmartphone/libfsoframework_git.bb +++ b/recipes/freesmartphone/libfsoframework_git.bb @@ -1,6 +1,6 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org support library" -DEPENDS += "misc-vapi libfsobasics" +DEPENDS += "libfsobasics" PV = "0.2.0.0+gitr${SRCREV}" PR = "${INC_PR}.1" diff --git a/recipes/freesmartphone/libfsotransport_git.bb b/recipes/freesmartphone/libfsotransport_git.bb index c23896ee24..a87fe6cf49 100644 --- a/recipes/freesmartphone/libfsotransport_git.bb +++ b/recipes/freesmartphone/libfsotransport_git.bb @@ -1,5 +1,4 @@ require cornucopia.inc DESCRIPTION = "freesmartphone.org transport library" -DEPENDS += "misc-vapi" PV = "0.9.4+gitr${SRCREV}" PR = "${INC_PR}.0" diff --git a/recipes/freesmartphone/misc-vapi_git.bb b/recipes/freesmartphone/misc-vapi_git.bb deleted file mode 100644 index 8c4a22f5d9..0000000000 --- a/recipes/freesmartphone/misc-vapi_git.bb +++ /dev/null @@ -1,4 +0,0 @@ -require cornucopia.inc -DEPENDS = "alsa-lib" -PV = "0.2.0+git${SRCREV}" -PR = "${INC_PR}.0" -- cgit v1.2.3 From 899811059a2147532aeb026ca3e01fa1fe5436ba Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Nov 2009 07:56:56 +0100 Subject: libextutils-makemaker-perl: added recipe, also -native --- recipes/perl/libextutils-makemaker-perl-native_6.54.bb | 5 +++++ recipes/perl/libextutils-makemaker-perl_6.54.bb | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 recipes/perl/libextutils-makemaker-perl-native_6.54.bb create mode 100644 recipes/perl/libextutils-makemaker-perl_6.54.bb (limited to 'recipes') diff --git a/recipes/perl/libextutils-makemaker-perl-native_6.54.bb b/recipes/perl/libextutils-makemaker-perl-native_6.54.bb new file mode 100644 index 0000000000..93fc4cf13d --- /dev/null +++ b/recipes/perl/libextutils-makemaker-perl-native_6.54.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libextutils-makemaker-perl_${PV}.bb diff --git a/recipes/perl/libextutils-makemaker-perl_6.54.bb b/recipes/perl/libextutils-makemaker-perl_6.54.bb new file mode 100644 index 0000000000..c480aa2daa --- /dev/null +++ b/recipes/perl/libextutils-makemaker-perl_6.54.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ExtUtils::PkgConfig - makefile generation" +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-${PV}.tar.gz" + +S = "${WORKDIR}/ExtUtils-MakeMaker-${PV}" + +inherit cpan -- cgit v1.2.3 From bb9bf844e5060713652bf3990b06d4563a961b5d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Nov 2009 07:58:10 +0100 Subject: libhtml-treebuilder-perl: added DEPENDS still need to check out RDEPENDS --- recipes/perl/libhtml-treebuilder-perl_3.23.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'recipes') diff --git a/recipes/perl/libhtml-treebuilder-perl_3.23.bb b/recipes/perl/libhtml-treebuilder-perl_3.23.bb index c18fc54ec5..ea572eb577 100644 --- a/recipes/perl/libhtml-treebuilder-perl_3.23.bb +++ b/recipes/perl/libhtml-treebuilder-perl_3.23.bb @@ -1,6 +1,10 @@ DESCRIPTION = "HTML::TreeBUilder - Class is for HTML syntax trees that get built out of HTML source" SECTION = "libs" LICENSE = "Artistic|GPL" +PR = "r1" + +DEPENDS = "libextutils-makemaker-perl-native" +#RDEPENDS = "libextutils-makemaker-perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETEK/HTML-Tree-${PV}.tar.gz" -- cgit v1.2.3 From 7e35ee58bba13381869e2e67d107b7d0c0e9d584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 08:42:35 +0100 Subject: cups: fix do_package, do_stage is still broken --- recipes/cups/cups.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 006e6a3250..642595d48f 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -61,8 +61,8 @@ do_stage () { python do_package_append() { # Change permissions back the way they were, they probably had a reason... - workdir = bb.data.getVar('WORKDIR', d, 1) - os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } do_stage_append() { -- cgit v1.2.3 From caec0ee3d05082277c1af4863b6d653109f5714e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 08:58:25 +0100 Subject: cups: switch to new style binconfig (un)Mangling --- recipes/cups/cups.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/cups/cups.inc b/recipes/cups/cups.inc index 642595d48f..db4475cd5c 100644 --- a/recipes/cups/cups.inc +++ b/recipes/cups/cups.inc @@ -65,11 +65,13 @@ python do_package_append() { os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle" + +cups_config_mangle() { # Undo mangle of cups_datadir and cups_serverbin sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \ -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \ - -i ${STAGING_BINDIR_CROSS}/cups-config + -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config } PACKAGES =+ "${PN}-lib ${PN}-libimage" -- cgit v1.2.3 From e21989e2f2c2cc954a8245a6faba7e7bd6a65144 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 11 Nov 2009 09:56:25 +0100 Subject: elmdentica: port elmdentica_svn.bb from shr/merge branch Signed-off-by: Sebastian Spaeth --- recipes/e17/elmdentica_svn.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes/e17/elmdentica_svn.bb (limited to 'recipes') diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb new file mode 100644 index 0000000000..977bc6d842 --- /dev/null +++ b/recipes/e17/elmdentica_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A indenti.ca client for E" +DEPENDS = "glib-2.0 gconf libxml2 curl elementary sqlite3-native" +LICENSE = "GPLv3+" +SECTION = "e/apps" +HOMEPAGE = "http://elmdentica.googlecode.com" +AUTHOR = "seabra" +PV = "0.7.0+svnr${SRCREV}" +PR = "r0" + + +SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http" + +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig -- cgit v1.2.3 From d4e6786d4c4e4cc1ee2b92caf3d67b399d4294f4 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 11 Nov 2009 10:09:42 +0100 Subject: Revert "elmdentica: port elmdentica_svn.bb from shr/merge branch" (it uses SRCREV var in recipe which is not universally set, of course....) This reverts commit e21989e2f2c2cc954a8245a6faba7e7bd6a65144. --- recipes/e17/elmdentica_svn.bb | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 recipes/e17/elmdentica_svn.bb (limited to 'recipes') diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb deleted file mode 100644 index 977bc6d842..0000000000 --- a/recipes/e17/elmdentica_svn.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "A indenti.ca client for E" -DEPENDS = "glib-2.0 gconf libxml2 curl elementary sqlite3-native" -LICENSE = "GPLv3+" -SECTION = "e/apps" -HOMEPAGE = "http://elmdentica.googlecode.com" -AUTHOR = "seabra" -PV = "0.7.0+svnr${SRCREV}" -PR = "r0" - - -SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http" - -S = "${WORKDIR}/trunk" - -inherit autotools pkgconfig -- cgit v1.2.3 From b043fd916d4e8ab4a823b0ebd4eb5ab336ff2baf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 14:11:12 +0000 Subject: recipes: Fix recipes using do_stage_append or do_stage_prepend directly against base.bbclass Signed-off-by: Richard Purdie --- recipes/blackbox/blackbox_0.70.1.bb | 3 ++- recipes/freesmartphone/fso-term_git.bb | 4 ++++ recipes/gcc/mingw-gcc-build.inc | 2 +- recipes/gob2/gob2_2.0.14.bb | 2 +- recipes/perl/libhtml-mason-perl_1.35.bb | 4 ++++ recipes/perl/liblog-dispatch-perl_2.13.bb | 4 ++++ recipes/perl/libmodule-build-perl_0.2805.bb | 4 ++++ recipes/pkgconfig/pkgconfig.inc | 2 +- 8 files changed, 21 insertions(+), 4 deletions(-) (limited to 'recipes') diff --git a/recipes/blackbox/blackbox_0.70.1.bb b/recipes/blackbox/blackbox_0.70.1.bb index 05010f97bb..0376f99980 100644 --- a/recipes/blackbox/blackbox_0.70.1.bb +++ b/recipes/blackbox/blackbox_0.70.1.bb @@ -16,6 +16,7 @@ EXTRA_OECONF = "--disable-i18n --without-imlib --with-xpm --with-gnome-menus" do_install_append() { sed -i s#${STAGING_LIBDIR}#${libdir}#g ${D}/${libdir}/pkgconfig/libbt.pc } -do_stage_append () { + +do_stage () { sed -i s#${STAGING_LIBDIR}#${libdir}#g ${STAGING_LIBDIR}/pkgconfig/libbt.pc } diff --git a/recipes/freesmartphone/fso-term_git.bb b/recipes/freesmartphone/fso-term_git.bb index e3f674d7cb..acb20cdb05 100644 --- a/recipes/freesmartphone/fso-term_git.bb +++ b/recipes/freesmartphone/fso-term_git.bb @@ -12,6 +12,10 @@ SRC_URI = "\ " S = "${WORKDIR}/git" +do_stage() { + : +} + inherit autotools vala FILES_${PN} += "${datadir}" diff --git a/recipes/gcc/mingw-gcc-build.inc b/recipes/gcc/mingw-gcc-build.inc index 4d7440f6d5..b79aab4a6a 100644 --- a/recipes/gcc/mingw-gcc-build.inc +++ b/recipes/gcc/mingw-gcc-build.inc @@ -34,7 +34,7 @@ do_configure () { oe_runconf } -do_stage_append () { +do_stage () { # Fixup various .la files sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libsupc++.la || true sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libstdc++.la || true diff --git a/recipes/gob2/gob2_2.0.14.bb b/recipes/gob2/gob2_2.0.14.bb index eca8d13795..86f2f0979e 100644 --- a/recipes/gob2/gob2_2.0.14.bb +++ b/recipes/gob2/gob2_2.0.14.bb @@ -12,6 +12,6 @@ do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's~-I$(includedir)~-I${STAGING_INCDIR}~g' } -do_stage_append() { +do_stage() { install -m 0644 ${S}/gob2.m4 ${STAGING_DATADIR}/aclocal } diff --git a/recipes/perl/libhtml-mason-perl_1.35.bb b/recipes/perl/libhtml-mason-perl_1.35.bb index 71e96005e8..dfc6f3cc87 100644 --- a/recipes/perl/libhtml-mason-perl_1.35.bb +++ b/recipes/perl/libhtml-mason-perl_1.35.bb @@ -16,6 +16,10 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-${PV}. S = "${WORKDIR}/HTML-Mason-${PV}" +do_stage() { + : +} + inherit cpan_build do_install_append () { diff --git a/recipes/perl/liblog-dispatch-perl_2.13.bb b/recipes/perl/liblog-dispatch-perl_2.13.bb index ee4a2198c1..643deda664 100644 --- a/recipes/perl/liblog-dispatch-perl_2.13.bb +++ b/recipes/perl/liblog-dispatch-perl_2.13.bb @@ -7,4 +7,8 @@ SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Log-Dispatch-${PV S = "${WORKDIR}/Log-Dispatch-${PV}" +do_stage() { + : +} + inherit cpan_build diff --git a/recipes/perl/libmodule-build-perl_0.2805.bb b/recipes/perl/libmodule-build-perl_0.2805.bb index 8a7ce9fa04..b7819fdebc 100644 --- a/recipes/perl/libmodule-build-perl_0.2805.bb +++ b/recipes/perl/libmodule-build-perl_0.2805.bb @@ -12,4 +12,8 @@ PR = "r5" S = "${WORKDIR}/Module-Build-${PV}" +do_stage() { + : +} + inherit cpan_build diff --git a/recipes/pkgconfig/pkgconfig.inc b/recipes/pkgconfig/pkgconfig.inc index 495403eaf5..cb6bd0256e 100644 --- a/recipes/pkgconfig/pkgconfig.inc +++ b/recipes/pkgconfig/pkgconfig.inc @@ -21,6 +21,6 @@ do_configure_prepend () { install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.*/ } -do_stage_prepend() { +do_stage() { install -d -m 0755 ${STAGING_LIBDIR}/pkgconfig } -- cgit v1.2.3 From d3d76c149b8fba3d1ef6d803d7a3b6fcfca58b2f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 16:24:35 +0100 Subject: mysql: adopt to new style sysroot stuff --- recipes/mysql/mysql_4.1.22.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 9e5ff885f9..1dacff6781 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -38,9 +38,11 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } -do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config +SYSROOT_PREPROCESS_FUNCS += "mysqlmangle" + +mysqlmangle() { + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config } do_install() { -- cgit v1.2.3 From 59ae038eec20833a9d07c43ddd9f0109f8bc3a74 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 15:29:00 +0000 Subject: module-init-tools: Split into a .inc file for use by -cross so bindir and sbindir aren't clobbered (from Poky) Signed-off-by: Richard Purdie --- .../module-init-tools-cross_3.2.2.bb | 4 ++-- recipes/module-init-tools/module-init-tools.inc | 25 ++++++++++++++++++++++ .../module-init-tools/module-init-tools_3.2.1.bb | 18 +--------------- .../module-init-tools/module-init-tools_3.2.2.bb | 25 +--------------------- recipes/module-init-tools/module-init-tools_3.4.bb | 19 +--------------- 5 files changed, 30 insertions(+), 61 deletions(-) create mode 100644 recipes/module-init-tools/module-init-tools.inc (limited to 'recipes') diff --git a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb index eb2027b384..c8a35c766b 100644 --- a/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -1,5 +1,5 @@ -LICENSE = "GPL" -require module-init-tools_${PV}.bb + +require module-init-tools.inc inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" diff --git a/recipes/module-init-tools/module-init-tools.inc b/recipes/module-init-tools/module-init-tools.inc new file mode 100644 index 0000000000..59e93d4533 --- /dev/null +++ b/recipes/module-init-tools/module-init-tools.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ +removing kernel modules for Linux (versions 2.5.48 and above). It serves \ +the same function that the modutils package serves for Linux 2.4." +LICENSE = "GPL" +SECTION = "base" +PR = "r5" + +PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" +RDEPENDS_${PN} += "module-init-tools-depmod" + +FILES_module-init-tools-depmod = "${sbindir}/depmod.26" +FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ + file://ignore_arch_directory;patch=1 \ + file://modutils_extension;patch=1 \ + file://no_man_rebuild;patch=1 \ + file://manpagesopt;patch=1 \ + file://module-init-tools-remove-index.patch;patch=1 " +S = "${WORKDIR}/module-init-tools-${PV}" + +EXTRA_OECONF = "--disable-manpages" + + +inherit autotools diff --git a/recipes/module-init-tools/module-init-tools_3.2.1.bb b/recipes/module-init-tools/module-init-tools_3.2.1.bb index 91c0efcd64..6481913ca7 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.1.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.1.bb @@ -1,30 +1,14 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://ignore_arch_directory;patch=1 \ file://modutils_extension;patch=1 \ file://no_man_rebuild;patch=1 \ file://manpagesopt;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.2.2.bb b/recipes/module-init-tools/module-init-tools_3.2.2.bb index a56bac7a82..4e2cba8d6f 100644 --- a/recipes/module-init-tools/module-init-tools_3.2.2.bb +++ b/recipes/module-init-tools/module-init-tools_3.2.2.bb @@ -1,31 +1,8 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" -PR = "r5" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://module-init-tools-remove-index.patch;patch=1 " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" +require module-init-tools.inc bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_install() { autotools_do_install for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do diff --git a/recipes/module-init-tools/module-init-tools_3.4.bb b/recipes/module-init-tools/module-init-tools_3.4.bb index caea00d194..1dd30707ee 100644 --- a/recipes/module-init-tools/module-init-tools_3.4.bb +++ b/recipes/module-init-tools/module-init-tools_3.4.bb @@ -1,29 +1,12 @@ -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -LICENSE = "GPL" -SECTION = "base" - -PR = "r1" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" +require module-init.tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://modutils_extension;patch=1 \ " -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" bindir = "/bin" sbindir = "/sbin" -inherit autotools - do_configure_prepend() { sed -i -e /MAN5\ =/d -e /MAN8\ =/d Makefile.am } -- cgit v1.2.3 From 81bdf9133524e76c3239f155dca9539e68032658 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 15:36:52 +0000 Subject: classes: Drop some random import bb/os statements Signed-off-by: Richard Purdie --- recipes/addons/devshell.bb | 3 --- 1 file changed, 3 deletions(-) (limited to 'recipes') diff --git a/recipes/addons/devshell.bb b/recipes/addons/devshell.bb index 9ac6821e0e..5921125d12 100644 --- a/recipes/addons/devshell.bb +++ b/recipes/addons/devshell.bb @@ -11,9 +11,6 @@ do_configure() { def devshell_emit_env(o, d, all=False, funcwhitelist=None): """Emits all items in the data store in a format such that it can be sourced by a shell.""" - import bb - import bb.data - env = bb.data.keys(d) for e in env: -- cgit v1.2.3 From 793e106014ef219e49d6d921ba97cade04c9bbf4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 15:41:03 +0000 Subject: module-init-tools-3.4: Fix typo Signed-off-by: Richard Purdie --- recipes/module-init-tools/module-init-tools_3.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/module-init-tools/module-init-tools_3.4.bb b/recipes/module-init-tools/module-init-tools_3.4.bb index 1dd30707ee..0b94c3b317 100644 --- a/recipes/module-init-tools/module-init-tools_3.4.bb +++ b/recipes/module-init-tools/module-init-tools_3.4.bb @@ -1,4 +1,4 @@ -require module-init.tools.inc +require module-init-tools.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ file://modutils_extension;patch=1 \ -- cgit v1.2.3 From 3d7d24cfdca0a906e1063e417dd6be8c3d9533b1 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 3 Nov 2009 09:15:53 +0000 Subject: glibc: added glibc-2.10.1 Acked-by: Phil Blundell Signed-off-by: Liam Girdwood --- .../glibc-2.9-enable-binutils-2.2.patch | 35 +++++ recipes/glibc/glibc-initial_2.10.1.bb | 6 + recipes/glibc/glibc_2.10.1.bb | 151 +++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch create mode 100644 recipes/glibc/glibc-initial_2.10.1.bb create mode 100644 recipes/glibc/glibc_2.10.1.bb (limited to 'recipes') diff --git a/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch new file mode 100644 index 0000000000..09200dd43b --- /dev/null +++ b/recipes/glibc/glibc-2.10.1/glibc-2.9-enable-binutils-2.2.patch @@ -0,0 +1,35 @@ +--- glibc-2.9.orig/configure.in 2009-10-22 15:38:13.000000000 +0200 ++++ glibc-2.9/configure.in 2009-10-22 15:37:33.000000000 +0200 +@@ -844,10 +844,10 @@ + # Accept binutils 2.13 or newer. + AC_CHECK_PROG_VER(AS, $AS, --version, + [GNU assembler.* \([0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") ++ [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as") + AC_CHECK_PROG_VER(LD, $LD, --version, + [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], +- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") ++ [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld") + + # We need the physical current working directory. We cannot use the + # "pwd -P" shell builtin since that's not portable. Instead we try to +--- glibc-2.9.orig/configure 2009-02-26 22:28:17.000000000 +0100 ++++ glibc-2.9/configure 2009-10-22 15:43:11.000000000 +0200 +@@ -4531,7 +4531,7 @@ + ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + +@@ -4594,7 +4594,7 @@ + ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; +- 2.1[3-9]*) ++ 2.1[3-9]* | 2.2*) + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + diff --git a/recipes/glibc/glibc-initial_2.10.1.bb b/recipes/glibc/glibc-initial_2.10.1.bb new file mode 100644 index 0000000000..d66297090f --- /dev/null +++ b/recipes/glibc/glibc-initial_2.10.1.bb @@ -0,0 +1,6 @@ +require glibc_${PV}.bb +require glibc-initial.inc + +do_configure_prepend () { + unset CFLAGS +} diff --git a/recipes/glibc/glibc_2.10.1.bb b/recipes/glibc/glibc_2.10.1.bb new file mode 100644 index 0000000000..27fbef5222 --- /dev/null +++ b/recipes/glibc/glibc_2.10.1.bb @@ -0,0 +1,151 @@ +require glibc.inc + +ARM_INSTRUCTION_SET = "arm" + +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" + +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" +TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" + + +FILESPATHPKG =. "glibc-2.4:" + +GLIBC_ADDONS ?= "ports,nptl,libidn" + +GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN" + +# +# For now, we will skip building of a gcc package if it is a uclibc one +# and our build is not a uclibc one, and we skip a glibc one if our build +# is a uclibc build. +# +# See the note in gcc/gcc_3.4.0.oe +# + +python __anonymous () { + import bb, re + uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise bb.parse.SkipPackage("incompatible with target %s" % + bb.data.getVar('TARGET_OS', d, 1)) +} + +RDEPENDS_${PN}-dev = "linux-libc-headers-dev" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://nscd-init.patch;patch=1;pnum=0 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://ldd-unbash.patch;patch=1 \ + file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ + file://march-i686.patch;patch=1;pnum=0 \ + file://arm-lowlevellock-include-tls.patch;patch=1 \ + file://glibc-2.9-enable-binutils-2.2.patch;patch=1 \ + file://armv4t-interworking.patch;patch=1 \ + " + +# Build fails on sh3 and sh4 without additional patches +SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" +SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" + +#powerpc patches to add support for soft-float +SRC_URI_append_powerpc= " file://powerpc-sqrt-hack.diff;patch=1" + +S = "${WORKDIR}/glibc-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + +EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF}" + +EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" + +do_munge() { + # Integrate ports and libidn into tree + mv ${WORKDIR}/glibc-ports-${PV} ${S}/ports + mv ${WORKDIR}/glibc-libidn-${PV} ${S}/libidn + + # Ports isn't really working... Fix it + # Some of this is rather dirty, but it seems to be the only + # quick way to get this cruft to compile + rm -rf ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + ln -s nptl ${S}/ports/sysdeps/unix/sysv/linux/arm/linuxthreads + cp ${S}/nptl/sysdeps/pthread/bits/sigthread.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${S}/sysdeps/wordsize-32/bits/wordsize.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + cp ${WORKDIR}/generic-bits_select.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/select.h + cp ${WORKDIR}/generic-bits_types.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/types.h + cp ${WORKDIR}/generic-bits_typesizes.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/typesizes.h + cp ${WORKDIR}/generic-bits_time.h ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/time.h + # Copy in generic stuff for not yet implemented headers + for i in ${S}/bits/*.h; do + F=`basename $i` + [ "$F" = "local_lim.h" ] && continue + [ "$F" = "errno.h" ] && continue + test -e ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/$F || test -e ${S}/ports/sysdeps/arm/bits/$F || test -e ${S}/sysdeps/unix/sysv/linux/bits/$F || test -e ${S}/sysdeps/ieee754/bits/$F || cp $i ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/ + done + # This is harmful; we need to get the one from nptl/sysdeps/pthreads + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/libc-lock.h + # Obsoleted by sysdeps/arm/{fpu,eabi}/bits/fenv.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/fenv.h + # Obsoleted by sysdeps/gnu/bits/utmp.h + rm -f ${S}/ports/sysdeps/unix/sysv/linux/arm/bits/utmp.h +} + +addtask munge before do_patch after do_unpack + + +do_configure () { +# /var/db was not included to FHS + sed -i s:/var/db/nscd:/var/run/nscd: ${S}/nscd/nscd.h +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now +# don't pass CPPFLAGS into configure, since it upsets the kernel-headers +# version check and doesn't really help with anything + if [ -z "`which rpcgen`" ]; then + echo "rpcgen not found. Install glibc-devel." + exit 1 + fi + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + CPPFLAGS="" oe_runconf +} + +rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \ + yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \ + rusers.x spray.x nfs_prot.x rquota.x key_prot.x" + +do_compile () { + # -Wl,-rpath-link /lib in LDFLAGS can cause breakage if another glibc is in staging + unset LDFLAGS + base_do_compile + ( + cd ${S}/sunrpc/rpcsvc + for r in ${rpcsvc}; do + h=`echo $r|sed -e's,\.x$,.h,'` + rpcgen -h $r -o $h || oewarn "unable to generate header for $r" + done + ) +} + +require glibc-stage.inc + +require glibc-package.bbclass -- cgit v1.2.3 From 369ec69e5e703942ad5ec7e85d0356a4781efeab Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 11 Nov 2009 21:28:21 +0100 Subject: libxml-parser-perl-native: updated to 2.36 --- recipes/perl/libxml-parser-perl-native_2.36.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/perl/libxml-parser-perl-native_2.36.bb (limited to 'recipes') diff --git a/recipes/perl/libxml-parser-perl-native_2.36.bb b/recipes/perl/libxml-parser-perl-native_2.36.bb new file mode 100644 index 0000000000..64758ad5f2 --- /dev/null +++ b/recipes/perl/libxml-parser-perl-native_2.36.bb @@ -0,0 +1,6 @@ +SECTION = "libs" + +require libxml-parser-perl_${PV}.bb + +inherit native + -- cgit v1.2.3 From 25db6767cbf1b00a4e8dbf746d2d16458c3696ea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 21:01:47 +0000 Subject: perl: Move config.sh to STAGING_LIBDIR rather than trying to be clever with staging variables and losing Signed-off-by: Richard Purdie --- recipes/perl/perl-native_5.8.8.bb | 9 ++++----- recipes/perl/perl.inc | 4 ++-- recipes/perl/perl_5.8.4.bb | 2 +- recipes/perl/perl_5.8.7.bb | 2 +- recipes/perl/perl_5.8.8.bb | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) (limited to 'recipes') diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb index ba05406eb0..60a5cf5b0f 100644 --- a/recipes/perl/perl-native_5.8.8.bb +++ b/recipes/perl/perl-native_5.8.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.perl.org/" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/db-native gdbm-native" -PR = "r14" +PR = "r15" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}" @@ -66,10 +66,9 @@ do_stage_append() { # We need a hostperl link for building perl ln -sf ${STAGING_BINDIR_NATIVE}/perl${PV} ${STAGING_BINDIR_NATIVE}/hostperl # Store native config in non-versioned directory - install -d ${STAGING_DIR}/${HOST_SYS}/perl \ - ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \ + install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV}/CORE \ ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils - install config.sh ${STAGING_DIR}/${HOST_SYS}/perl + install config.sh ${STAGING_LIBDIR}/perl # target configuration install lib/Config.pm ${STAGING_LIBDIR_NATIVE}/perl/${PV}/ install lib/ExtUtils/typemap ${STAGING_DATADIR_NATIVE}/perl/${PV}/ExtUtils/ @@ -88,7 +87,7 @@ do_stage_append() { } do_stage_append_nylon() { # get rid of definitions not supported by the gcc version we use for nylon... - for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_DIR}/${HOST_SYS}/perl/config.sh; do + for i in ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy.pl ${STAGING_LIBDIR}/perl/config.sh; do perl -pi -e 's/-Wdeclaration-after-statement //g' ${i} done } diff --git a/recipes/perl/perl.inc b/recipes/perl/perl.inc index 9e20ae63e6..15ae55cf17 100644 --- a/recipes/perl/perl.inc +++ b/recipes/perl/perl.inc @@ -36,8 +36,8 @@ do_install() { } do_stage() { - install -d ${STAGING_DIR}/${HOST_SYS}/perl/ - install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ + install -d ${STAGING_LIBDIR}/perl/ + install config.sh ${STAGING_LIBDIR}/perl/ } PACKAGES_DYNAMIC = "perl-module-*" diff --git a/recipes/perl/perl_5.8.4.bb b/recipes/perl/perl_5.8.4.bb index 10a871c8dd..881a2acee5 100644 --- a/recipes/perl/perl_5.8.4.bb +++ b/recipes/perl/perl_5.8.4.bb @@ -1,6 +1,6 @@ require perl.inc -PR = "r5" +PR = "r6" SRC_URI += "file://uclibc.patch;patch=1 \ file://config.sh-mipsel-linux \ diff --git a/recipes/perl/perl_5.8.7.bb b/recipes/perl/perl_5.8.7.bb index 6589180ff2..5891670394 100644 --- a/recipes/perl/perl_5.8.7.bb +++ b/recipes/perl/perl_5.8.7.bb @@ -26,7 +26,7 @@ SRC_URI_append_powerpc += " ${GCCLINK_SRC}" PARALLEL_MAKE = "" -PR = "r22" +PR = "r23" do_configure() { ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb index 35fcc83ccc..02ad7bf376 100644 --- a/recipes/perl/perl_5.8.8.bb +++ b/recipes/perl/perl_5.8.8.bb @@ -141,12 +141,11 @@ do_install() { fi } do_stage() { - install -d ${STAGING_DIR}/${HOST_SYS}/perl \ - ${STAGING_LIBDIR_NATIVE}/perl/${PV} \ + install -d ${STAGING_LIBDIR_NATIVE}/perl/${PV} \ ${STAGING_LIBDIR}/perl/${PV}/CORE \ ${STAGING_DATADIR}/perl/${PV}/ExtUtils # target config, used by cpan.bbclass to extract version information - install config.sh ${STAGING_DIR}/${HOST_SYS}/perl/ + install config.sh ${STAGING_LIBDIR}/perl/ # target configuration, used by native perl when cross-compiling install lib/Config_heavy.pl ${STAGING_LIBDIR_NATIVE}/perl/${PV}/Config_heavy-target.pl # target configuration -- cgit v1.2.3 From e614930c63c23d27b85fe5c23c97b72b8d6b9604 Mon Sep 17 00:00:00 2001 From: Stuart Gray Date: Tue, 10 Nov 2009 15:32:32 +0100 Subject: cdparanoia 9.8alpha: run recipe through oe-stylize.py cdparanoia 10.2: add new recipe --- recipes/cdparanoia/cdparanoia/Makefile.in.patch | 13 + recipes/cdparanoia/cdparanoia/Makefile.patch | 19 + .../cdparanoia-III-10.2-privatefix.patch | 561 +++++++++++++++++++++ recipes/cdparanoia/cdparanoia/fixes.patch | 63 +++ recipes/cdparanoia/cdparanoia/fixes10.patch | 25 + .../cdparanoia/interface_Makefile.in.patch | 11 + .../cdparanoia/paranoia_Makefile.in.patch | 11 + recipes/cdparanoia/cdparanoia_10.2.bb | 36 +- recipes/cdparanoia/cdparanoia_9.8alpha.bb | 34 +- recipes/cdparanoia/files/Makefile.in.patch | 13 - recipes/cdparanoia/files/Makefile.patch | 19 - recipes/cdparanoia/files/fixes.patch | 63 --- recipes/cdparanoia/files/fixes10.patch | 25 - .../cdparanoia/files/interface_Makefile.in.patch | 11 - .../cdparanoia/files/paranoia_Makefile.in.patch | 11 - 15 files changed, 736 insertions(+), 179 deletions(-) create mode 100644 recipes/cdparanoia/cdparanoia/Makefile.in.patch create mode 100644 recipes/cdparanoia/cdparanoia/Makefile.patch create mode 100644 recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch create mode 100644 recipes/cdparanoia/cdparanoia/fixes.patch create mode 100644 recipes/cdparanoia/cdparanoia/fixes10.patch create mode 100644 recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch create mode 100644 recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch delete mode 100644 recipes/cdparanoia/files/Makefile.in.patch delete mode 100644 recipes/cdparanoia/files/Makefile.patch delete mode 100644 recipes/cdparanoia/files/fixes.patch delete mode 100644 recipes/cdparanoia/files/fixes10.patch delete mode 100644 recipes/cdparanoia/files/interface_Makefile.in.patch delete mode 100644 recipes/cdparanoia/files/paranoia_Makefile.in.patch (limited to 'recipes') diff --git a/recipes/cdparanoia/cdparanoia/Makefile.in.patch b/recipes/cdparanoia/cdparanoia/Makefile.in.patch new file mode 100644 index 0000000000..40cf4ad516 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/Makefile.in.patch @@ -0,0 +1,13 @@ +--- cdparanoia-III-10.2/Makefile.in.orig 2009-01-27 23:32:15.000000000 +0100 ++++ cdparanoia-III-10.2/Makefile.in 2009-01-27 23:32:53.000000000 +0100 +@@ -87,8 +87,9 @@ + $(LIBDIR)/libcdda_paranoia.so + + cdparanoia: $(OFILES) $(LIBDEP) +- $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ ++ $(LD) $(CFLAGS) \ + -L$(PWD)/paranoia -L$(PWD)/interface \ ++ $(LDFLAGS) $(OFILES) \ + -o cdparanoia $(LIBS) + + .c.o: diff --git a/recipes/cdparanoia/cdparanoia/Makefile.patch b/recipes/cdparanoia/cdparanoia/Makefile.patch new file mode 100644 index 0000000000..798ccf9003 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/Makefile.patch @@ -0,0 +1,19 @@ +*** cdparanoia-III-alpha9.8/Makefile.in- Mon Mar 27 23:09:24 2006 +--- cdparanoia-III-alpha9.8/Makefile.in Mon Mar 27 23:09:56 2006 +*************** +*** 44,50 **** + cd interface && $(MAKE) all + cd paranoia && $(MAKE) all + $(MAKE) cdparanoia CFLAGS="$(OPT)" +! strip cdparanoia + + debug: + cd interface && $(MAKE) debug +--- 44,50 ---- + cd interface && $(MAKE) all + cd paranoia && $(MAKE) all + $(MAKE) cdparanoia CFLAGS="$(OPT)" +! $(STRIP) cdparanoia + + debug: + cd interface && $(MAKE) debug diff --git a/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch b/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch new file mode 100644 index 0000000000..55f39b26da --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/cdparanoia-III-10.2-privatefix.patch @@ -0,0 +1,561 @@ +diff -ru cdparanoia-III-10.2/interface/cdda_interface.h cdparanoia-III-10.2-mod/interface/cdda_interface.h +--- cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/cdda_interface.h 2009-09-08 16:08:37.000000000 +0100 +@@ -84,7 +84,7 @@ + int is_atapi; + int is_mmc; + +- cdda_private_data_t *private; ++ cdda_private_data_t *impl; + void *reserved; + unsigned char inqbytes[4]; + +diff -ru cdparanoia-III-10.2/interface/cooked_interface.c cdparanoia-III-10.2-mod/interface/cooked_interface.c +--- cdparanoia-III-10.2/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/cooked_interface.c 2009-09-08 16:09:35.000000000 +0100 +@@ -13,13 +13,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->impl->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->impl->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +diff -ru cdparanoia-III-10.2/interface/interface.c cdparanoia-III-10.2-mod/interface/interface.c +--- cdparanoia-III-10.2/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/interface.c 2009-09-08 16:09:50.000000000 +0100 +@@ -39,9 +39,9 @@ + if(d->drive_model)free(d->drive_model); + if(d->cdda_fd!=-1)close(d->cdda_fd); + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->impl){ ++ if(d->impl->sg_hd)free(d->impl->sg_hd); ++ free(d->impl); + } + + free(d); +@@ -127,7 +127,7 @@ + } + } + } +- if(ms)*ms=d->private->last_milliseconds; ++ if(ms)*ms=d->impl->last_milliseconds; + return(sectors); + } + +diff -ru cdparanoia-III-10.2/interface/scan_devices.c cdparanoia-III-10.2-mod/interface/scan_devices.c +--- cdparanoia-III-10.2/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/scan_devices.c 2009-09-08 16:09:17.000000000 +0100 +@@ -264,11 +264,11 @@ + d->interface=COOKED_IOCTL; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->impl->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); + return(d); +@@ -674,15 +674,15 @@ + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; + d->messagedest = messagedest; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + { + /* goddamnit */ + struct timespec tv; +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); ++ d->impl->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); + } + if(use_sgio){ + d->interface=SGIO_SCSI; +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); ++ d->impl->sg_buffer=(unsigned char *)(d->impl->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); + g_fd=d->cdda_fd=dup(d->ioctl_fd); + }else{ + version=verify_SG_version(d,messagedest,messages); +@@ -696,8 +696,8 @@ + } + + /* malloc our big buffer for scsi commands */ +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->impl->sg_hd=malloc(MAX_BIG_BUFF_SIZE); ++ d->impl->sg_buffer=((unsigned char *)d->impl->sg_hd)+SG_OFF; + } + + { +@@ -772,9 +772,9 @@ + if(i_fd!=-1)close(i_fd); + if(g_fd!=-1)close(g_fd); + if(d){ +- if(d->private){ +- if(d->private->sg_hd)free(d->private->sg_hd); +- free(d->private); ++ if(d->impl){ ++ if(d->impl->sg_hd)free(d->impl->sg_hd); ++ free(d->impl); + } + free(d); + } +@@ -821,7 +821,7 @@ + d->interface=TEST_INTERFACE; + d->bigendianp=-1; /* We don't know yet... */ + d->nsectors=-1; +- d->private=calloc(1,sizeof(*d->private)); ++ d->impl=calloc(1,sizeof(*d->impl)); + d->drive_model=copystring("File based test interface"); + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); + +diff -ru cdparanoia-III-10.2/interface/scsi_interface.c cdparanoia-III-10.2-mod/interface/scsi_interface.c +--- cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 ++++ cdparanoia-III-10.2-mod/interface/scsi_interface.c 2009-09-08 16:10:30.000000000 +0100 +@@ -15,13 +15,13 @@ + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ + struct timespec tv1; + struct timespec tv2; +- int ret1=clock_gettime(d->private->clock,&tv1); ++ int ret1=clock_gettime(d->impl->clock,&tv1); + int ret2=ioctl(fd, command,arg); +- int ret3=clock_gettime(d->private->clock,&tv2); ++ int ret3=clock_gettime(d->impl->clock,&tv2); + if(ret1<0 || ret3<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; + } + return ret2; + } +@@ -96,7 +96,7 @@ + static void clear_garbage(cdrom_drive *d){ + fd_set fdset; + struct timeval tv; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->impl->sg_hd; + int flag=0; + + /* clear out any possibly preexisting garbage */ +@@ -185,7 +185,7 @@ + struct timespec tv2; + int tret1,tret2; + int status = 0; +- struct sg_header *sg_hd=d->private->sg_hd; ++ struct sg_header *sg_hd=d->impl->sg_hd; + long writebytes=SG_OFF+cmd_len+in_size; + + /* generic scsi device services */ +@@ -195,7 +195,7 @@ + + memset(sg_hd,0,sizeof(sg_hd)); + memset(sense_buffer,0,SG_MAX_SENSE); +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); ++ memcpy(d->impl->sg_buffer,cmd,cmd_len+in_size); + sg_hd->twelve_byte = cmd_len == 12; + sg_hd->result = 0; + sg_hd->reply_len = SG_OFF + out_size; +@@ -209,7 +209,7 @@ + tell if the command failed. Scared yet? */ + + if(bytecheck && out_size>in_size){ +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); ++ memset(d->impl->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); + /* the size does not remove cmd_len due to the way the kernel + driver copies buffers */ + writebytes+=(out_size-in_size); +@@ -243,7 +243,7 @@ + } + + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); +- tret1=clock_gettime(d->private->clock,&tv1); ++ tret1=clock_gettime(d->impl->clock,&tv1); + errno=0; + status = write(d->cdda_fd, sg_hd, writebytes ); + +@@ -289,7 +289,7 @@ + } + } + +- tret2=clock_gettime(d->private->clock,&tv2); ++ tret2=clock_gettime(d->impl->clock,&tv2); + errno=0; + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); +@@ -313,7 +313,7 @@ + if(bytecheck && in_size+cmd_lenprivate->sg_buffer[i]!=bytefill){ ++ if(d->impl->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -326,9 +326,9 @@ + + errno=0; + if(tret1<0 || tret2<0){ +- d->private->last_milliseconds=-1; ++ d->impl->last_milliseconds=-1; + }else{ +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; ++ d->impl->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; + } + return(0); + } +@@ -347,7 +347,7 @@ + + memset(&hdr,0,sizeof(hdr)); + memset(sense,0,sizeof(sense)); +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); ++ memcpy(d->impl->sg_buffer,cmd+cmd_len,in_size); + + hdr.cmdp = cmd; + hdr.cmd_len = cmd_len; +@@ -355,7 +355,7 @@ + hdr.mx_sb_len = SG_MAX_SENSE; + hdr.timeout = 50000; + hdr.interface_id = 'S'; +- hdr.dxferp = d->private->sg_buffer; ++ hdr.dxferp = d->impl->sg_buffer; + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ + + /* scary buffer fill hack */ +@@ -400,7 +400,7 @@ + if(bytecheck && in_sizeprivate->sg_buffer[i]!=bytefill){ ++ if(d->impl->sg_buffer[i]!=bytefill){ + flag=1; + break; + } +@@ -412,7 +412,7 @@ + } + + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ +- /* d->private->last_milliseconds = hdr.duration; */ ++ /* d->impl->last_milliseconds = hdr.duration; */ + + errno = 0; + return 0; +@@ -445,9 +445,9 @@ + + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); + +- key = d->private->sg_buffer[2] & 0xf; +- ASC = d->private->sg_buffer[12]; +- ASCQ = d->private->sg_buffer[13]; ++ key = d->impl->sg_buffer[2] & 0xf; ++ ASC = d->impl->sg_buffer[12]; ++ ASCQ = d->impl->sg_buffer[13]; + + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; + return 1; +@@ -492,7 +492,7 @@ + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); + + { +- unsigned char *b=d->private->sg_buffer; ++ unsigned char *b=d->impl->sg_buffer; + if(b[0])return(1); /* Handles only up to 256 bytes */ + if(b[6])return(1); /* Handles only up to 256 bytes */ + +@@ -604,8 +604,8 @@ + static unsigned int get_orig_sectorsize(cdrom_drive *d){ + if(mode_sense(d,12,0x01))return(-1); + +- d->orgdens = d->private->sg_buffer[4]; +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); ++ d->orgdens = d->impl->sg_buffer[4]; ++ return(d->orgsize = ((int)(d->impl->sg_buffer[10])<<8)+d->impl->sg_buffer[11]); + } + + /* switch CDROM scsi drives to given sector size */ +@@ -664,8 +664,8 @@ + return(-4); + } + +- first=d->private->sg_buffer[2]; +- last=d->private->sg_buffer[3]; ++ first=d->impl->sg_buffer[2]; ++ last=d->impl->sg_buffer[3]; + tracks=last-first+1; + + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { +@@ -683,7 +683,7 @@ + return(-5); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->impl->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=i; +@@ -704,7 +704,7 @@ + return(-2); + } + { +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); ++ scsi_TOC *toc=(scsi_TOC *)(d->impl->sg_buffer+4); + + d->disc_toc[i-first].bFlags=toc->bFlags; + d->disc_toc[i-first].bTrack=0xAA; +@@ -738,7 +738,7 @@ + } + + /* copy to our structure and convert start sector */ +- tracks = d->private->sg_buffer[1]; ++ tracks = d->impl->sg_buffer[1]; + if (tracks > MAXTRK) { + cderror(d,"003: CDROM reporting illegal number of tracks\n"); + return(-3); +@@ -754,33 +754,33 @@ + return(-5); + } + +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; ++ d->disc_toc[i].bFlags = d->impl->sg_buffer[10]; + d->disc_toc[i].bTrack = i + 1; + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- (((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5])); ++ (((signed char)(d->impl->sg_buffer[2])<<24) | ++ (d->impl->sg_buffer[3]<<16)| ++ (d->impl->sg_buffer[4]<<8)| ++ (d->impl->sg_buffer[5])); + } + + d->disc_toc[i].bFlags = 0; + d->disc_toc[i].bTrack = i + 1; +- memcpy (&foo, d->private->sg_buffer+2, 4); +- memcpy (&bar, d->private->sg_buffer+6, 4); ++ memcpy (&foo, d->impl->sg_buffer+2, 4); ++ memcpy (&bar, d->impl->sg_buffer+6, 4); + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + + be32_to_cpu(bar)); + + d->disc_toc[i].dwStartSector= d->adjust_ssize * +- ((((signed char)(d->private->sg_buffer[2])<<24) | +- (d->private->sg_buffer[3]<<16)| +- (d->private->sg_buffer[4]<<8)| +- (d->private->sg_buffer[5]))+ ++ ((((signed char)(d->impl->sg_buffer[2])<<24) | ++ (d->impl->sg_buffer[3]<<16)| ++ (d->impl->sg_buffer[4]<<8)| ++ (d->impl->sg_buffer[5]))+ + +- ((((signed char)(d->private->sg_buffer[6])<<24) | +- (d->private->sg_buffer[7]<<16)| +- (d->private->sg_buffer[8]<<8)| +- (d->private->sg_buffer[9])))); ++ ((((signed char)(d->impl->sg_buffer[6])<<24) | ++ (d->impl->sg_buffer[7]<<16)| ++ (d->impl->sg_buffer[8]<<8)| ++ (d->impl->sg_buffer[9])))); + + + d->cd_extra = FixupTOC(d,tracks+1); +@@ -817,7 +817,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -836,7 +836,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -854,7 +854,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -872,7 +872,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -890,7 +890,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -908,7 +908,7 @@ + cmd[9] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -922,7 +922,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -936,7 +936,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -950,7 +950,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -964,7 +964,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -978,7 +978,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -992,7 +992,7 @@ + cmd[8] = sectors; + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1026,7 +1026,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1039,7 +1039,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1052,7 +1052,7 @@ + + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) + return(ret); +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); ++ if(p)memcpy(p,d->impl->sg_buffer,sectors*CD_FRAMESIZE_RAW); + return(0); + } + +@@ -1275,7 +1275,7 @@ + static int count_2352_bytes(cdrom_drive *d){ + long i; + for(i=2351;i>=0;i--) +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') ++ if(d->impl->sg_buffer[i]!=(unsigned char)'\177') + return(((i+3)>>2)<<2); + + return(0); +@@ -1284,7 +1284,7 @@ + static int verify_nonzero(cdrom_drive *d){ + long i,flag=0; + for(i=0;i<2352;i++) +- if(d->private->sg_buffer[i]!=0){ ++ if(d->impl->sg_buffer[i]!=0){ + flag=1; + break; + } +@@ -1625,7 +1625,7 @@ + d->is_mmc=0; + if(mode_sense(d,22,0x2A)==0){ + +- b=d->private->sg_buffer; ++ b=d->impl->sg_buffer; + b+=b[3]+4; + + if((b[0]&0x3F)==0x2A){ +@@ -1673,7 +1673,7 @@ + cderror(d,"008: Unable to identify CDROM model\n"); + return(NULL); + } +- return (d->private->sg_buffer); ++ return (d->impl->sg_buffer); + } + + int scsi_init_drive(cdrom_drive *d){ +@@ -1742,8 +1742,8 @@ + check_cache(d); + + d->error_retry=1; +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; ++ d->impl->sg_hd=realloc(d->impl->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); ++ d->impl->sg_buffer=((unsigned char *)d->impl->sg_hd)+SG_OFF; + d->report_all=1; + return(0); + } diff --git a/recipes/cdparanoia/cdparanoia/fixes.patch b/recipes/cdparanoia/cdparanoia/fixes.patch new file mode 100644 index 0000000000..6ffc8a6af9 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/fixes.patch @@ -0,0 +1,63 @@ +--- cdparanoia-III-alpha9.8/configure.in 2000-03-26 00:33:22.000000000 -0700 ++++ cdparanoia-III-alpha9.8.new/configure.in 2004-12-23 16:34:04.072846728 -0700 +@@ -1,7 +1,7 @@ + AC_INIT(interface/interface.c) + +-cp $srcdir/configure.guess $srcdir/config.guess +-cp $srcdir/configure.sub $srcdir/config.sub ++#cp $srcdir/configure.guess $srcdir/config.guess ++#cp $srcdir/configure.sub $srcdir/config.sub + + AC_CANONICAL_HOST + +--- cdparanoia-III-alpha9.8/interface/utils.h 2000-04-19 15:41:04.000000000 -0700 ++++ cdparanoia-III-alpha9.8.new/interface/utils.h 2004-12-23 16:37:11.126410264 -0700 +@@ -111,7 +111,7 @@ + d->errorbuf=catstring(d->errorbuf,s); + break; + case CDDA_MESSAGE_FORGETIT: +- default: ++ default: ; + } + } + } +@@ -126,7 +126,7 @@ + d->messagebuf=catstring(d->messagebuf,s); + break; + case CDDA_MESSAGE_FORGETIT: +- default: ++ default: ; + } + } + } +@@ -168,7 +168,7 @@ + } + break; + case CDDA_MESSAGE_FORGETIT: +- default: ++ default: ; + } + } + if(malloced)free(buffer); +@@ -204,7 +204,7 @@ + } + break; + case CDDA_MESSAGE_FORGETIT: +- default: ++ default: ; + } + } + if(malloced)free(buffer); +--- cdparanoia-III-alpha9.8/interface/scan_devices.c 2001-03-25 22:44:01.000000000 -0700 ++++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c 2004-12-23 16:38:47.128815680 -0700 +@@ -19,6 +19,10 @@ + #include "common_interface.h" + #include "utils.h" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #define MAX_DEV_LEN 20 /* Safe because strings only come from below */ + /* must be absolute paths! */ + static char *scsi_cdrom_prefixes[]={ diff --git a/recipes/cdparanoia/cdparanoia/fixes10.patch b/recipes/cdparanoia/cdparanoia/fixes10.patch new file mode 100644 index 0000000000..414ff3944d --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/fixes10.patch @@ -0,0 +1,25 @@ +--- cdparanoia-III-alpha9.8/configure.in 2000-03-26 00:33:22.000000000 -0700 ++++ cdparanoia-III-alpha9.8.new/configure.in 2004-12-23 16:34:04.072846728 -0700 +@@ -1,7 +1,7 @@ + AC_INIT(interface/interface.c) + +-cp $srcdir/configure.guess $srcdir/config.guess +-cp $srcdir/configure.sub $srcdir/config.sub ++#cp $srcdir/configure.guess $srcdir/config.guess ++#cp $srcdir/configure.sub $srcdir/config.sub + + AC_CANONICAL_HOST + +--- cdparanoia-III-alpha9.8/interface/scan_devices.c 2001-03-25 22:44:01.000000000 -0700 ++++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c 2004-12-23 16:38:47.128815680 -0700 +@@ -19,6 +19,10 @@ + #include "common_interface.h" + #include "utils.h" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + #define MAX_DEV_LEN 20 /* Safe because strings only come from below */ + /* must be absolute paths! */ + static char *scsi_cdrom_prefixes[]={ diff --git a/recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch b/recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch new file mode 100644 index 0000000000..4dbd2bb19a --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/interface_Makefile.in.patch @@ -0,0 +1,11 @@ +--- cdparanoia-III-10.2/interface/Makefile.in.orig 2009-01-27 23:52:42.000000000 +0100 ++++ cdparanoia-III-10.2/interface/Makefile.in 2009-01-27 23:53:27.000000000 +0100 +@@ -46,7 +46,7 @@ + $(RANLIB) libcdda_interface.a + + libcdda_interface.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) ++ $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 + [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + diff --git a/recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch b/recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch new file mode 100644 index 0000000000..962a43a634 --- /dev/null +++ b/recipes/cdparanoia/cdparanoia/paranoia_Makefile.in.patch @@ -0,0 +1,11 @@ +--- cdparanoia-III-10.2/paranoia/Makefile.in.orig 2009-01-27 23:54:45.000000000 +0100 ++++ cdparanoia-III-10.2/paranoia/Makefile.in 2009-01-27 23:55:05.000000000 +0100 +@@ -44,7 +44,7 @@ + $(RANLIB) libcdda_paranoia.a + + libcdda_paranoia.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface ++ $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + diff --git a/recipes/cdparanoia/cdparanoia_10.2.bb b/recipes/cdparanoia/cdparanoia_10.2.bb index 2a220336fd..9ae4b7ed02 100644 --- a/recipes/cdparanoia/cdparanoia_10.2.bb +++ b/recipes/cdparanoia/cdparanoia_10.2.bb @@ -1,33 +1,31 @@ # cdparanoia OE build file # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +LICENSE = "GPL" -PR ="r0" -LICENSE="GPL" +SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \ + file://fixes10.patch;patch=1 \ + file://Makefile.in.patch;patch=1 \ + file://interface_Makefile.in.patch;patch=1 \ + file://paranoia_Makefile.in.patch;patch=1 \ + file://cdparanoia-III-10.2-privatefix.patch;patch=1 " -SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \ - file://fixes10.patch;patch=1 \ - file://Makefile.in.patch;patch=1 \ - file://interface_Makefile.in.patch;patch=1 \ - file://paranoia_Makefile.in.patch;patch=1 " +S = "${WORKDIR}/cdparanoia-III-10.2" -S="${WORKDIR}/cdparanoia-III-10.2" +inherit autotools PARALLEL_MAKE = "" -inherit autotools - do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } do_stage() { - install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - - install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} - install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} - - oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} - oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} } + diff --git a/recipes/cdparanoia/cdparanoia_9.8alpha.bb b/recipes/cdparanoia/cdparanoia_9.8alpha.bb index 8c1bbd446f..2305ec7d83 100644 --- a/recipes/cdparanoia/cdparanoia_9.8alpha.bb +++ b/recipes/cdparanoia/cdparanoia_9.8alpha.bb @@ -1,31 +1,29 @@ # cdparanoia OE build file # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +LICENSE = "GPL" -PR ="r2" -LICENSE="GPL" +PR = "r3" -SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ - file://fixes.patch;patch=1 \ - file://Makefile.patch;patch=1" +SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \ + file://fixes.patch;patch=1 \ + file://Makefile.patch;patch=1" -S="${WORKDIR}/cdparanoia-III-alpha9.8" - -PARALLEL_MAKE = "" +S = "${WORKDIR}/cdparanoia-III-alpha9.8" inherit autotools +PARALLEL_MAKE = "" + do_install() { - oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ - INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install + oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \ + INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install } - do_stage() { - install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} - - install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} - install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} - - oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} - oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR} ${STAGING_LIBDIR} + install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR} + install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR} + oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR} + oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR} } + diff --git a/recipes/cdparanoia/files/Makefile.in.patch b/recipes/cdparanoia/files/Makefile.in.patch deleted file mode 100644 index 40cf4ad516..0000000000 --- a/recipes/cdparanoia/files/Makefile.in.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- cdparanoia-III-10.2/Makefile.in.orig 2009-01-27 23:32:15.000000000 +0100 -+++ cdparanoia-III-10.2/Makefile.in 2009-01-27 23:32:53.000000000 +0100 -@@ -87,8 +87,9 @@ - $(LIBDIR)/libcdda_paranoia.so - - cdparanoia: $(OFILES) $(LIBDEP) -- $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \ -+ $(LD) $(CFLAGS) \ - -L$(PWD)/paranoia -L$(PWD)/interface \ -+ $(LDFLAGS) $(OFILES) \ - -o cdparanoia $(LIBS) - - .c.o: diff --git a/recipes/cdparanoia/files/Makefile.patch b/recipes/cdparanoia/files/Makefile.patch deleted file mode 100644 index 798ccf9003..0000000000 --- a/recipes/cdparanoia/files/Makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** cdparanoia-III-alpha9.8/Makefile.in- Mon Mar 27 23:09:24 2006 ---- cdparanoia-III-alpha9.8/Makefile.in Mon Mar 27 23:09:56 2006 -*************** -*** 44,50 **** - cd interface && $(MAKE) all - cd paranoia && $(MAKE) all - $(MAKE) cdparanoia CFLAGS="$(OPT)" -! strip cdparanoia - - debug: - cd interface && $(MAKE) debug ---- 44,50 ---- - cd interface && $(MAKE) all - cd paranoia && $(MAKE) all - $(MAKE) cdparanoia CFLAGS="$(OPT)" -! $(STRIP) cdparanoia - - debug: - cd interface && $(MAKE) debug diff --git a/recipes/cdparanoia/files/fixes.patch b/recipes/cdparanoia/files/fixes.patch deleted file mode 100644 index 6ffc8a6af9..0000000000 --- a/recipes/cdparanoia/files/fixes.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- cdparanoia-III-alpha9.8/configure.in 2000-03-26 00:33:22.000000000 -0700 -+++ cdparanoia-III-alpha9.8.new/configure.in 2004-12-23 16:34:04.072846728 -0700 -@@ -1,7 +1,7 @@ - AC_INIT(interface/interface.c) - --cp $srcdir/configure.guess $srcdir/config.guess --cp $srcdir/configure.sub $srcdir/config.sub -+#cp $srcdir/configure.guess $srcdir/config.guess -+#cp $srcdir/configure.sub $srcdir/config.sub - - AC_CANONICAL_HOST - ---- cdparanoia-III-alpha9.8/interface/utils.h 2000-04-19 15:41:04.000000000 -0700 -+++ cdparanoia-III-alpha9.8.new/interface/utils.h 2004-12-23 16:37:11.126410264 -0700 -@@ -111,7 +111,7 @@ - d->errorbuf=catstring(d->errorbuf,s); - break; - case CDDA_MESSAGE_FORGETIT: -- default: -+ default: ; - } - } - } -@@ -126,7 +126,7 @@ - d->messagebuf=catstring(d->messagebuf,s); - break; - case CDDA_MESSAGE_FORGETIT: -- default: -+ default: ; - } - } - } -@@ -168,7 +168,7 @@ - } - break; - case CDDA_MESSAGE_FORGETIT: -- default: -+ default: ; - } - } - if(malloced)free(buffer); -@@ -204,7 +204,7 @@ - } - break; - case CDDA_MESSAGE_FORGETIT: -- default: -+ default: ; - } - } - if(malloced)free(buffer); ---- cdparanoia-III-alpha9.8/interface/scan_devices.c 2001-03-25 22:44:01.000000000 -0700 -+++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c 2004-12-23 16:38:47.128815680 -0700 -@@ -19,6 +19,10 @@ - #include "common_interface.h" - #include "utils.h" - -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif -+ - #define MAX_DEV_LEN 20 /* Safe because strings only come from below */ - /* must be absolute paths! */ - static char *scsi_cdrom_prefixes[]={ diff --git a/recipes/cdparanoia/files/fixes10.patch b/recipes/cdparanoia/files/fixes10.patch deleted file mode 100644 index 414ff3944d..0000000000 --- a/recipes/cdparanoia/files/fixes10.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- cdparanoia-III-alpha9.8/configure.in 2000-03-26 00:33:22.000000000 -0700 -+++ cdparanoia-III-alpha9.8.new/configure.in 2004-12-23 16:34:04.072846728 -0700 -@@ -1,7 +1,7 @@ - AC_INIT(interface/interface.c) - --cp $srcdir/configure.guess $srcdir/config.guess --cp $srcdir/configure.sub $srcdir/config.sub -+#cp $srcdir/configure.guess $srcdir/config.guess -+#cp $srcdir/configure.sub $srcdir/config.sub - - AC_CANONICAL_HOST - ---- cdparanoia-III-alpha9.8/interface/scan_devices.c 2001-03-25 22:44:01.000000000 -0700 -+++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c 2004-12-23 16:38:47.128815680 -0700 -@@ -19,6 +19,10 @@ - #include "common_interface.h" - #include "utils.h" - -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif -+ - #define MAX_DEV_LEN 20 /* Safe because strings only come from below */ - /* must be absolute paths! */ - static char *scsi_cdrom_prefixes[]={ diff --git a/recipes/cdparanoia/files/interface_Makefile.in.patch b/recipes/cdparanoia/files/interface_Makefile.in.patch deleted file mode 100644 index 4dbd2bb19a..0000000000 --- a/recipes/cdparanoia/files/interface_Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cdparanoia-III-10.2/interface/Makefile.in.orig 2009-01-27 23:52:42.000000000 +0100 -+++ cdparanoia-III-10.2/interface/Makefile.in 2009-01-27 23:53:27.000000000 +0100 -@@ -46,7 +46,7 @@ - $(RANLIB) libcdda_interface.a - - libcdda_interface.so: $(OFILES) -- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) -+ $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) - [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 - [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so - diff --git a/recipes/cdparanoia/files/paranoia_Makefile.in.patch b/recipes/cdparanoia/files/paranoia_Makefile.in.patch deleted file mode 100644 index 962a43a634..0000000000 --- a/recipes/cdparanoia/files/paranoia_Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cdparanoia-III-10.2/paranoia/Makefile.in.orig 2009-01-27 23:54:45.000000000 +0100 -+++ cdparanoia-III-10.2/paranoia/Makefile.in 2009-01-27 23:55:05.000000000 +0100 -@@ -44,7 +44,7 @@ - $(RANLIB) libcdda_paranoia.a - - libcdda_paranoia.so: $(OFILES) -- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface -+ $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface - [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 - [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so - -- cgit v1.2.3 From 9461aa6dbb7de848ce3b598db98501b64e8ed31b Mon Sep 17 00:00:00 2001 From: Stuart Gray Date: Tue, 10 Nov 2009 15:44:12 +0100 Subject: libdiscid: add 0.2.2 --- recipes/libdiscid/libdiscid.inc | 20 ++++++++++++++++++++ recipes/libdiscid/libdiscid_0.2.2.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 recipes/libdiscid/libdiscid.inc create mode 100644 recipes/libdiscid/libdiscid_0.2.2.bb (limited to 'recipes') diff --git a/recipes/libdiscid/libdiscid.inc b/recipes/libdiscid/libdiscid.inc new file mode 100644 index 0000000000..01d3c3d851 --- /dev/null +++ b/recipes/libdiscid/libdiscid.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ +It allows you to access the data held on the MusicBrainz server." + +HOMEPAGE = "http://musicbrainz.org" +LICENSE = "LGPL" +DEPENDS = "cmake-native" + +SRC_URI = "http://musicbrainz.org/doc/libdiscid/libdiscid-${PV}.tar.gz" + +inherit cmake pkgconfig + +# Fight a compiler/link bug that leaks too many c++ symbols +TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib " + +S = "${WORKDIR}/${PN}" + +do_stage() { + autotools_stage_all +} + diff --git a/recipes/libdiscid/libdiscid_0.2.2.bb b/recipes/libdiscid/libdiscid_0.2.2.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/recipes/libdiscid/libdiscid_0.2.2.bb @@ -0,0 +1 @@ +require ${PN}.inc -- cgit v1.2.3 From 1f27311675fd86dc78da439245241638fc887fbf Mon Sep 17 00:00:00 2001 From: Stuart Gray Date: Tue, 10 Nov 2009 15:53:42 +0100 Subject: libmusicbrainz: add depends, clean up inc file --- recipes/musicbrainz/libmusicbrainz.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc index 64a7f50794..dfd96fabbb 100644 --- a/recipes/musicbrainz/libmusicbrainz.inc +++ b/recipes/musicbrainz/libmusicbrainz.inc @@ -1,10 +1,9 @@ -DEFAULT_PREFERENCE = "-1" - DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \ It allows you to access the data held on the MusicBrainz server." HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" -DEPENDS = "expat neon" + +DEPENDS = "expat neon libdiscid" SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" -- cgit v1.2.3 From dc3d69b22b6b2a8906dc80ff0b2421ef2d429d71 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 21:38:33 +0000 Subject: icu: Fix class ordering problem by converting to use SYSROOT_PREPROCESS_FUNCS Signed-off-by: Richard Purdie --- recipes/icu/icu_3.6.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/icu/icu_3.6.bb b/recipes/icu/icu_3.6.bb index 3eccfb53d9..ae79ce7be6 100644 --- a/recipes/icu/icu_3.6.bb +++ b/recipes/icu/icu_3.6.bb @@ -37,8 +37,10 @@ do_stage() { autotools_stage_all } -# We need to append this so it runs *after* binconfig.do_stage -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "icu_sysroot_preprocess" + +# We need to append this so it runs *after* binconfig's preprocess function +icu_sysroot_preprocess () { sed -i -e s:^prefix=:prefix=\"${STAGING_DIR_TARGET}/usr\": ${STAGING_BINDIR_CROSS}/icu-config } -- cgit v1.2.3 From a2abd65b42088b2c5cbbc6fb5f13a56415e59d4f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 21:38:47 +0000 Subject: mysql5: Fix class ordering problem by converting to use SYSROOT_PREPROCESS_FUNCS Signed-off-by: Richard Purdie --- recipes/mysql/mysql5_5.1.40.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc index aa69831397..28716747e6 100644 --- a/recipes/mysql/mysql5_5.1.40.inc +++ b/recipes/mysql/mysql5_5.1.40.inc @@ -41,7 +41,10 @@ do_stage() { oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} } -do_stage_append() { +SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" + +# We need to append this so it runs *after* binconfig's preprocess function +mysql5_sysroot_preprocess () { sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config } -- cgit v1.2.3 From 8764c29e88079486f96ab5232565e6aeb26c9189 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Nov 2009 22:53:00 +0100 Subject: ilibdiscid: update SRC_URI --- recipes/libdiscid/libdiscid.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/libdiscid/libdiscid.inc b/recipes/libdiscid/libdiscid.inc index 01d3c3d851..9f5f1ce9b5 100644 --- a/recipes/libdiscid/libdiscid.inc +++ b/recipes/libdiscid/libdiscid.inc @@ -3,9 +3,8 @@ It allows you to access the data held on the MusicBrainz server." HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" -DEPENDS = "cmake-native" -SRC_URI = "http://musicbrainz.org/doc/libdiscid/libdiscid-${PV}.tar.gz" +SRC_URI = "http://users.musicbrainz.org/~matt/libdiscid-${PV}.tar.gz" inherit cmake pkgconfig -- cgit v1.2.3 From f0472370387a85f19b6d69a0aa4420621082998a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 22:00:03 +0000 Subject: perl: Bump the remaining PRs so the last changes take effect Signed-off-by: Richard Purdie --- recipes/perl/perl-native_5.8.4.bb | 2 +- recipes/perl/perl-native_5.8.7.bb | 2 +- recipes/perl/perl_5.8.8.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/perl/perl-native_5.8.4.bb b/recipes/perl/perl-native_5.8.4.bb index 69555e0fac..d3ecb67863 100644 --- a/recipes/perl/perl-native_5.8.4.bb +++ b/recipes/perl/perl-native_5.8.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r3" +PR = "r4" SECTION = "libs" inherit native diff --git a/recipes/perl/perl-native_5.8.7.bb b/recipes/perl/perl-native_5.8.7.bb index ebb10e5580..d8ccd0c33d 100644 --- a/recipes/perl/perl-native_5.8.7.bb +++ b/recipes/perl/perl-native_5.8.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" LICENSE = "Artistic|GPL" -PR = "r5" +PR = "r6" SECTION = "libs" inherit native diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb index 02ad7bf376..13e44556be 100644 --- a/recipes/perl/perl_5.8.8.bb +++ b/recipes/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r29" +PR = "r30" # Major part of version PVM = "5.8" -- cgit v1.2.3 From 0276ace5fdb67a51ec17172c4535248b16d43420 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 11 Nov 2009 22:56:20 +0100 Subject: povray: fix boost includes and std::exceptions * bump PR --- .../povray/povray-3.6.1+3.7.0-beta25b/boost.patch | 82 ++++++++++++++++++++++ recipes/povray/povray_3.6.1+3.7.0-beta25b.bb | 3 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch (limited to 'recipes') diff --git a/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch new file mode 100644 index 0000000000..bd2ba46d2f --- /dev/null +++ b/recipes/povray/povray-3.6.1+3.7.0-beta25b/boost.patch @@ -0,0 +1,82 @@ +Index: povray-3.7.0.beta.25b/source/backend/support/taskqueue.h +=================================================================== +--- povray-3.7.0.beta.25b.orig/source/backend/support/taskqueue.h 2009-11-11 21:18:50.066527987 +0100 ++++ povray-3.7.0.beta.25b/source/backend/support/taskqueue.h 2009-11-11 21:20:14.249441749 +0100 +@@ -98,6 +98,7 @@ + + #include + #include ++#include + + #include "base/povmscpp.h" + #include "backend/support/task.h" +Index: povray-3.7.0.beta.25b/source/backend/support/task.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/source/backend/support/task.cpp 2009-11-11 21:21:32.645269202 +0100 ++++ povray-3.7.0.beta.25b/source/backend/support/task.cpp 2009-11-11 21:22:52.322759257 +0100 +@@ -241,7 +241,7 @@ + FatalErrorHandler(e); + failed = e.code(kUncategorizedError); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + failed = kUncategorizedError; +@@ -266,7 +266,7 @@ + FatalErrorHandler(e); + failed = e.code(kUncategorizedError); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + failed = kUncategorizedError; +@@ -291,7 +291,7 @@ + { + FatalErrorHandler(e); + } +- catch(exception& e) ++ catch(std::exception& e) + { + FatalErrorHandler(POV_EXCEPTION_STRING(e.what())); + } +Index: povray-3.7.0.beta.25b/vfe/vfesession.h +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfesession.h 2009-11-11 21:24:05.381913997 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfesession.h 2009-11-11 21:27:19.715316358 +0100 +@@ -94,6 +94,8 @@ + #ifndef __VFESESSION_H__ + #define __VFESESSION_H__ + ++#include ++ + namespace vfe + { + using namespace pov_frontend; +Index: povray-3.7.0.beta.25b/vfe/vfecontrol.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfecontrol.cpp 2009-11-11 21:27:33.098560840 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfecontrol.cpp 2009-11-11 21:28:18.396060074 +0100 +@@ -430,7 +430,7 @@ + if (!m_Frontend->Start (m_RenderOptions.m_Options)) + return (m_LastError = vfeFailedToSendRenderStart) ; + } +- catch (exception& e) ++ catch (std::exception& e) + { + if (dynamic_cast (&e) != NULL) + m_RenderErrorCode = dynamic_cast (&e)->code() ; +Index: povray-3.7.0.beta.25b/vfe/vfesession.cpp +=================================================================== +--- povray-3.7.0.beta.25b.orig/vfe/vfesession.cpp 2009-11-11 21:29:12.798555641 +0100 ++++ povray-3.7.0.beta.25b/vfe/vfesession.cpp 2009-11-11 21:30:29.119796942 +0100 +@@ -695,7 +695,7 @@ + m_Failed = true; + m_LastError = vfeCaughtException; + } +- catch (exception&) ++ catch (std::exception&) + { + m_Failed = true; + m_LastError = vfeCaughtException; diff --git a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb index 5ca797cef6..82eacaee7c 100644 --- a/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb +++ b/recipes/povray/povray_3.6.1+3.7.0-beta25b.bb @@ -4,12 +4,13 @@ SECTION = "console/graphics" LICENSE = "povray" DEPENDS = "virtual/libx11 boost zlib jpeg libpng tiff" -PR = "r1" +PR = "r2" #We apply a patch that subverts the checks for jpeg, zlib, png and tiff because we know OE has the required versions, but it is still a hack. SRC_URI = "http://www.povray.org/redirect/www.povray.org/beta/source/povray-src-3.7.0.beta.25b.tar.bz2 \ file://configure-cross-hack.patch;patch=1 \ file://gcc43.diff;patch=1 \ + file://boost.patch;patch=1 \ " S = "${WORKDIR}/povray-3.7.0.beta.25b" -- cgit v1.2.3 From 140929089dcaa82c1c322314bb82af786e12afab Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 11 Nov 2009 22:59:51 +0100 Subject: boost-1.36.0: fix compiling with gcc-4.4 * bump PR --- recipes/boost/boost_1.36.0.bb | 5 +- recipes/boost/files/gcc-44.diff | 304 +++++++++++++++++++++++++++++++++++++++ recipes/boost/files/sscanf.patch | 13 ++ 3 files changed, 321 insertions(+), 1 deletion(-) create mode 100644 recipes/boost/files/gcc-44.diff create mode 100644 recipes/boost/files/sscanf.patch (limited to 'recipes') diff --git a/recipes/boost/boost_1.36.0.bb b/recipes/boost/boost_1.36.0.bb index 898d1b1603..f4fad8ced4 100644 --- a/recipes/boost/boost_1.36.0.bb +++ b/recipes/boost/boost_1.36.0.bb @@ -1,12 +1,15 @@ include boost-36.inc -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ file://01-no-serialization-test.patch;patch=1 \ file://02-atomic-count-pthreads-on-arm.patch;patch=1 \ file://03-exception-clone-destructor-fix.patch;patch=1 \ + file://gcc-44.diff;patch=1 \ + file://uclibc.patch;patch=1 \ + file://sscanf.patch;patch=1 \ " BJAM_OPTS = '${BJAM_TOOLS} \ diff --git a/recipes/boost/files/gcc-44.diff b/recipes/boost/files/gcc-44.diff new file mode 100644 index 0000000000..ae072e06d5 --- /dev/null +++ b/recipes/boost/files/gcc-44.diff @@ -0,0 +1,304 @@ +Index: /boost/python/call.hpp +=================================================================== +--- /boost/python/call.hpp (revision 24055) ++++ /boost/python/call.hpp (revision 48960) +@@ -39,5 +39,8 @@ + # endif // CALL_DWA2002411_HPP + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -77,3 +80,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/object/value_holder.hpp +=================================================================== +--- /boost/python/object/value_holder.hpp (revision 32284) ++++ /boost/python/object/value_holder.hpp (revision 48960) +@@ -118,5 +118,8 @@ + // --------------- value_holder --------------- + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1 + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -164,3 +167,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/object/make_holder.hpp +=================================================================== +--- /boost/python/object/make_holder.hpp (revision 39191) ++++ /boost/python/object/make_holder.hpp (revision 48960) +@@ -48,5 +48,8 @@ + # endif // MAKE_HOLDER_DWA20011215_HPP + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -103,3 +106,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/object/pointer_holder.hpp +=================================================================== +--- /boost/python/object/pointer_holder.hpp (revision 41521) ++++ /boost/python/object/pointer_holder.hpp (revision 48960) +@@ -171,5 +171,8 @@ + + /* --------------- pointer_holder --------------- */ +-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1 + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -213,3 +216,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/call_method.hpp +=================================================================== +--- /boost/python/call_method.hpp (revision 24614) ++++ /boost/python/call_method.hpp (revision 48960) +@@ -38,5 +38,8 @@ + # endif // CALL_METHOD_DWA2002411_HPP + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -77,3 +80,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/python/detail/target.hpp +=================================================================== +--- /boost/python/detail/target.hpp (revision 24614) ++++ /boost/python/detail/target.hpp (revision 48960) +@@ -38,5 +38,8 @@ + + /* --------------- function pointers --------------- */ +-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -80,3 +83,4 @@ + # undef Q + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/detail/result.hpp +=================================================================== +--- /boost/python/detail/result.hpp (revision 43799) ++++ /boost/python/detail/result.hpp (revision 48960) +@@ -87,5 +87,8 @@ + + /* --------------- function pointers --------------- */ +-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER + # if !(BOOST_WORKAROUND(__MWERKS__, > 0x3100) \ + && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3201))) +@@ -129,3 +132,4 @@ + # undef Q + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif +Index: /boost/python/signature.hpp +=================================================================== +--- /boost/python/signature.hpp (revision 24055) ++++ /boost/python/signature.hpp (revision 48960) +@@ -114,5 +114,8 @@ + # endif // SIGNATURE_JDG20020813_HPP + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING) ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING) + + # define N BOOST_PP_ITERATION() +@@ -177,3 +180,4 @@ + # undef N + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // !defined(BOOST_PP_IS_ITERATING) +Index: /boost/mpl/aux_/numeric_op.hpp +=================================================================== +--- /boost/mpl/aux_/numeric_op.hpp (revision 30670) ++++ /boost/mpl/aux_/numeric_op.hpp (revision 48960) +@@ -288,5 +288,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + + # define i_ BOOST_PP_FRAME_ITERATION(1) +@@ -309,3 +312,4 @@ + # undef i_ + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/aux_/advance_backward.hpp +=================================================================== +--- /boost/mpl/aux_/advance_backward.hpp (revision 24874) ++++ /boost/mpl/aux_/advance_backward.hpp (revision 48960) +@@ -80,5 +80,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + #define i_ BOOST_PP_FRAME_ITERATION(1) + +@@ -122,3 +125,4 @@ + # undef AUX778076_ITER_0 + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/aux_/full_lambda.hpp +=================================================================== +--- /boost/mpl/aux_/full_lambda.hpp (revision 24896) ++++ /boost/mpl/aux_/full_lambda.hpp (revision 48960) +@@ -228,5 +228,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + #define i_ BOOST_PP_FRAME_ITERATION(1) + +@@ -348,3 +351,4 @@ + + #undef i_ ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/aux_/advance_forward.hpp +=================================================================== +--- /boost/mpl/aux_/advance_forward.hpp (revision 24874) ++++ /boost/mpl/aux_/advance_forward.hpp (revision 48960) +@@ -80,5 +80,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + #define i_ BOOST_PP_FRAME_ITERATION(1) + +@@ -121,3 +124,4 @@ + # undef AUX778076_ITER_0 + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/unpack_args.hpp +=================================================================== +--- /boost/mpl/unpack_args.hpp (revision 24874) ++++ /boost/mpl/unpack_args.hpp (revision 48960) +@@ -112,5 +112,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + + # define i_ BOOST_PP_FRAME_ITERATION(1) +@@ -144,3 +147,4 @@ + # undef i_ + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/bind.hpp +=================================================================== +--- /boost/mpl/bind.hpp (revision 25875) ++++ /boost/mpl/bind.hpp (revision 48960) +@@ -362,5 +362,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + + # define i_ BOOST_PP_FRAME_ITERATION(1) +@@ -545,3 +548,4 @@ + # undef j_ + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/apply.hpp +=================================================================== +--- /boost/mpl/apply.hpp (revision 24874) ++++ /boost/mpl/apply.hpp (revision 48960) +@@ -136,5 +136,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + + # define i_ BOOST_PP_FRAME_ITERATION(1) +@@ -223,3 +226,4 @@ + # undef i_ + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING +Index: /boost/mpl/apply_wrap.hpp +=================================================================== +--- /boost/mpl/apply_wrap.hpp (revision 24892) ++++ /boost/mpl/apply_wrap.hpp (revision 48960) +@@ -79,5 +79,8 @@ + ///// iteration, depth == 1 + +-#elif BOOST_PP_ITERATION_DEPTH() == 1 ++// For gcc 4.4 compatability, we must include the ++// BOOST_PP_ITERATION_DEPTH test inside an #else clause. ++#else // BOOST_PP_IS_ITERATING ++#if BOOST_PP_ITERATION_DEPTH() == 1 + + # define i_ BOOST_PP_FRAME_ITERATION(1) +@@ -198,3 +201,4 @@ + # undef j_ + ++#endif // BOOST_PP_ITERATION_DEPTH() + #endif // BOOST_PP_IS_ITERATING diff --git a/recipes/boost/files/sscanf.patch b/recipes/boost/files/sscanf.patch new file mode 100644 index 0000000000..11d1c96a47 --- /dev/null +++ b/recipes/boost/files/sscanf.patch @@ -0,0 +1,13 @@ +Index: boost_1_36_0/boost/test/impl/debug.ipp +=================================================================== +--- boost_1_36_0.orig/boost/test/impl/debug.ipp 2009-11-11 22:45:05.239343879 +0100 ++++ boost_1_36_0/boost/test/impl/debug.ipp 2009-11-11 22:45:11.981848731 +0100 +@@ -277,7 +277,7 @@ + while( *name_end && *name_end != ')' ) + ++name_end; + +- std::sscanf( name_end+1, "%*s%d", &m_parent_pid ); ++ sscanf( name_end+1, "%*s%d", &m_parent_pid ); + + m_binary_name.assign( name_beg+1, name_end ); + -- cgit v1.2.3 From 5793e93f71db384b6671d4293614b71334161e52 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 11 Nov 2009 23:03:31 +0100 Subject: libsdl-mixer: update to version 1.2.10 * don't made it the default yet --- recipes/libsdl/libsdl-mixer_1.2.10.bb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 recipes/libsdl/libsdl-mixer_1.2.10.bb (limited to 'recipes') diff --git a/recipes/libsdl/libsdl-mixer_1.2.10.bb b/recipes/libsdl/libsdl-mixer_1.2.10.bb new file mode 100644 index 0000000000..1a9e808c52 --- /dev/null +++ b/recipes/libsdl/libsdl-mixer_1.2.10.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Simple DirectMedia Layer mixer library." +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "virtual/libsdl libmikmod libvorbis" +LICENSE = "LGPL" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz" +S = "${WORKDIR}/SDL_mixer-${PV}" + +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + +inherit autotools_stage + +EXTRA_OECONF = "--disable-music-mp3" +# although we build smpeg... need to find out how +# to deal with optional dependencies + +do_compile() { + # Override SDL_LIBS to include a linker rpath so the linker + # can find the correct libdl.so when it links playwave to + # libSDL_mixer.so. + oe_runmake SDL_LIBS="$(pkg-config sdl --libs) -Wl,-rpath-link,${STAGING_LIBDIR}" +} -- cgit v1.2.3 From 98c4cef80ccac7e109e8479ac3902b6ef24ff16f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Nov 2009 22:09:48 +0000 Subject: zaurus-updater: Fix task order for packaged-staging. PARALLEL_MAKE is pointless since we don't call make Signed-off-by: Richard Purdie --- recipes/zaurus-utils/zaurus-updater.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/zaurus-utils/zaurus-updater.bb b/recipes/zaurus-utils/zaurus-updater.bb index ab32d7fe29..62707a994d 100644 --- a/recipes/zaurus-utils/zaurus-updater.bb +++ b/recipes/zaurus-utils/zaurus-updater.bb @@ -34,5 +34,6 @@ do_deploy() { esac } -addtask deploy before do_build after do_compile -PARALLEL_MAKE = "" +# package_stagefile_shell need to run before populate_staging for packaged-staging +addtask deploy before do_populate_staging after do_compile + -- cgit v1.2.3