From 79187def07f6d015fa2affb2f3a6c964aae520e7 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Wed, 26 Jul 2006 21:22:37 +0000 Subject: Found out that gcc that comes with mandriva 2006.0 will barf on compiling glibc if these two patches are not applied. These patches are backports from glibc 2.3.6. --- .../glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch | 11 +++++++++++ packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch | 15 +++++++++++++++ packages/glibc/glibc_2.3.5+cvs20050627.bb | 4 +++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch create mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch (limited to 'packages') diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch new file mode 100644 index 0000000000..bf2f31e479 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch @@ -0,0 +1,11 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700 +@@ -123,5 +123,7 @@ + #endif + + PSEUDO_END (__socket) +- ++ ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch new file mode 100644 index 0000000000..0097ff94d3 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch @@ -0,0 +1,15 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700 +@@ -32,7 +32,11 @@ + The .S files for the other calls just #define socket and #include this. */ + + #ifndef __socket +-#define __socket P(__,socket) ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + #define PUSHARGS_1 str a1, [sp, $-4]! diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index fc5abcc266..fbab2d7afc 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell " FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r7" +PR = "r8" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" @@ -55,6 +55,8 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat file://ldsocache-varrun.patch;patch=1 \ file://5090_all_stubs-rule-fix.patch;patch=1 \ file://raise.patch;patch=1 \ + file://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \ + file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" -- cgit v1.2.3 From 469410c81b3d651f54cbf399de4e8e8f139922f7 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 28 Jul 2006 23:47:13 +0000 Subject: This commit adds the necessary bitbake recipes for the newer 2.4 kernel versions in the hh.org cvs repo. --- .../.mtn2git_empty | 0 .../defconfig-h3900 | 1627 ++++++++++++++++++++ .../.mtn2git_empty | 0 .../defconfig-h3900 | 1627 ++++++++++++++++++++ .../linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb | 76 + .../linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb | 74 + 6 files changed, 3404 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/.mtn2git_empty create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/defconfig-h3900 create mode 100644 packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb create mode 100644 packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41.1/defconfig-h3900 @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# 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_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/.mtn2git_empty b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/defconfig-h3900 b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/defconfig-h3900 new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh41/defconfig-h3900 @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# 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_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb new file mode 100644 index 0000000000..f278af0185 --- /dev/null +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb @@ -0,0 +1,76 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." +MAINTAINER = "Phil Blundell " +LICENSE = "GPL" +PR = "r2" + + +KERNEL_CCSUFFIX = "-3.3.4" +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig-${PACKAGE_ARCH} \ + file://ipaq-hal.init \ + file://linux-2.4-mmc-debugging.patch;patch=1 \ + file://linux-2.4-usb-gadget.patch;patch=1 \ + file://usb-gadget-ether-compat.patch;patch=1 \ + file://linux-2.4-no-short-loads.patch;patch=1 \ + file://linux-2.4-cpufreq.patch;patch=1" + +S = "${WORKDIR}/kernel" + +KERNEL_PRESERVE_HH_MINOR_VER = "1" + +inherit kernel update-rc.d + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +RMKV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}" +PXAV = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}" + +module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic" +module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic" +module_conf_pxa_ir = "alias irda0 pxa_ir" +module_conf_i2c-algo-pxa = "options i2c-algo-pxa pxa_scan=0" +module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1" +module_conf_ppp_async = "alias ppp0 ppp_async" +module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1" +module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1" +module_conf_hidp = "alias bt-prot-5 hidp" + +module_autoload_h3600_ts = "h3600_ts" +module_autoload_apm = "apm" +module_autoload_af_packet = "af_packet" +module_autoload_usb-ohci-h5400 = "usb-ohci-h5400" +module_autoload_ppp_async = "ppp_async" +module_autoload_usb-eth = "usb-eth" +module_autoload_h5400_buzzer = "h5400_buzzer" +# breaks booting on first install of h3900 handhelds +#module_autoload_mmc_asic3 = "mmc_asic3" +module_autoload_mmc_h5400 = "mmc_h5400" +module_autoload_h5400-audio = "h5400-audio" +module_autoload_h3900-uda1380 = "h3900-uda1380" +module_autoload_sa1100-rtc = "sa1100-rtc" +module_autoload_ak4535 = "ak4535" +module_autoload_i2c-adap-pxa = "i2c-adap-pxa" + +FILES_kernel += "/etc/init.d/ipaq-hal" +INITSCRIPT_NAME = "ipaq-hal" +INITSCRIPT_PARAMS = "start 21 S ." + +# extra depends +RDEPENDS_kernel-module-h5400-audio = "kernel-module-ak4535 kernel-module-i2c-adap-pxa" +RDEPENDS_kernel-module-h3900-uda1380 = "kernel-module-uda1380 kernel-module-i2c-adap-pxa" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal +} diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb new file mode 100644 index 0000000000..bed92aa6ea --- /dev/null +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb @@ -0,0 +1,74 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." +MAINTAINER = "Phil Blundell " +LICENSE = "GPL" +PR = "r1" + + +KERNEL_CCSUFFIX = "-3.3.4" +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig-${PACKAGE_ARCH} \ + file://ipaq-hal.init \ + file://linux-2.4-mmc-debugging.patch;patch=1 \ + file://linux-2.4-usb-gadget.patch;patch=1 \ + file://usb-gadget-ether-compat.patch;patch=1 \ + file://linux-2.4-no-short-loads.patch;patch=1 \ + file://linux-2.4-cpufreq.patch;patch=1" + +S = "${WORKDIR}/kernel" + +inherit kernel update-rc.d + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +RMKV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}" +PXAV = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}" + +module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic" +module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic" +module_conf_pxa_ir = "alias irda0 pxa_ir" +module_conf_i2c-algo-pxa = "options i2c-algo-pxa pxa_scan=0" +module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1" +module_conf_ppp_async = "alias ppp0 ppp_async" +module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1" +module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1" +module_conf_hidp = "alias bt-prot-5 hidp" + +module_autoload_h3600_ts = "h3600_ts" +module_autoload_apm = "apm" +module_autoload_af_packet = "af_packet" +module_autoload_usb-ohci-h5400 = "usb-ohci-h5400" +module_autoload_ppp_async = "ppp_async" +module_autoload_usb-eth = "usb-eth" +module_autoload_h5400_buzzer = "h5400_buzzer" +# breaks booting on first install of h3900 handhelds +#module_autoload_mmc_asic3 = "mmc_asic3" +module_autoload_mmc_h5400 = "mmc_h5400" +module_autoload_h5400-audio = "h5400-audio" +module_autoload_h3900-uda1380 = "h3900-uda1380" +module_autoload_sa1100-rtc = "sa1100-rtc" +module_autoload_ak4535 = "ak4535" +module_autoload_i2c-adap-pxa = "i2c-adap-pxa" + +FILES_kernel += "/etc/init.d/ipaq-hal" +INITSCRIPT_NAME = "ipaq-hal" +INITSCRIPT_PARAMS = "start 21 S ." + +# extra depends +RDEPENDS_kernel-module-h5400-audio = "kernel-module-ak4535 kernel-module-i2c-adap-pxa" +RDEPENDS_kernel-module-h3900-uda1380 = "kernel-module-uda1380 kernel-module-i2c-adap-pxa" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal +} -- cgit v1.2.3 From 94af751f34a2a2af1c0bc5c4e3aeb8c30b9dcb53 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 27 Aug 2006 22:57:00 +0000 Subject: alda-utils: speaker-test doesn't really work without alsa-conf. --- packages/alsa/alsa-utils_1.0.11.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/alsa/alsa-utils_1.0.11.bb b/packages/alsa/alsa-utils_1.0.11.bb index 10ebacee9b..d2acfe1995 100644 --- a/packages/alsa/alsa-utils_1.0.11.bb +++ b/packages/alsa/alsa-utils_1.0.11.bb @@ -40,7 +40,7 @@ FILES_alsa-utils-alsactl = "${sbindir}/alsactl" DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" -#DESCRIPTION_alsa-utils-speaker-test= "??" +DESCRIPTION_alsa-utils-speaker-test = "speaker test tone generator for ALSA" DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" @@ -50,5 +50,6 @@ DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configura RDEPENDS_alsa-utils-aplay += "alsa-conf" RDEPENDS_alsa-utils-amixer += "alsa-conf" RDEPENDS_alsa-utils-alsamixer += "alsa-conf" +RDEPENDS_alsa-utils-speaker-test += "alsa-conf" ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3 From 75f70c90ab0d00a1d1d13af9e873aa2dd350210e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Aug 2006 09:42:23 +0000 Subject: tslib 1.0: use tarball instead of svn and fix packaging * CONFFILES = /etc/ts.conf has been removed --- packages/tslib/tslib_1.0.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index 660d7d5e27..ddd6c5ad6d 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -5,9 +5,8 @@ SECTION = "base" LICENSE = "LGPL" PR = "r0" -SRCDATE_tslib = "now" -SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};proto=http \ +SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ file://ts.conf \ file://ts-2.6.conf \ file://ts.conf-h3600-2.4 \ @@ -17,7 +16,6 @@ SRC_URI = "svn://svn.berlios.de/svnroot/repos/tslib/tags/tslib;module=${PV};prot file://tslib.sh" SRC_URI_append_mnci += " file://devfs.patch;patch=1" SRC_URI_append_mnci += " file://event1.patch;patch=1" -S = "${WORKDIR}/${PV}" inherit autotools pkgconfig @@ -71,7 +69,6 @@ do_install_append() { } SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" RDEPENDS_tslib-conf_h1940 = "detect-stylus" RDEPENDS_tslib-conf_h2200 = "detect-stylus" @@ -86,12 +83,17 @@ RDEPENDS_tslib-conf_h4000 = "detect-stylus" PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" -PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" +PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate" +DEBIAN_NOAUTONAME_tslib-conf = "1" +DEBIAN_NOAUTONAME_tslib-tests = "1" +DEBIAN_NOAUTONAME_tslib-calibrate = "1" -RDEPENDS_libts = "tslib-conf" +RDEPENDS_${PN} = "tslib-conf" + +FILES_${PN}-dbg += "${libdir}/ts/.debug*" FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_libts = "${libdir}/*.so.* ${libdir}/ts/*.so*" +FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" FILES_libts-dev = "${FILES_tslib-dev}" FILES_tslib-calibrate += "${bindir}/ts_calibrate" FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" -- cgit v1.2.3 From 9181dc0009b00b49de7c8c236427e728776ea1cb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Aug 2006 15:48:37 +0000 Subject: dbus-glib: depend on dbus to get dbus.h --- packages/dbus/dbus-glib_0.71.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/dbus/dbus-glib_0.71.bb b/packages/dbus/dbus-glib_0.71.bb index 6bb69ba316..80a9ae44d6 100644 --- a/packages/dbus/dbus-glib_0.71.bb +++ b/packages/dbus/dbus-glib_0.71.bb @@ -3,7 +3,7 @@ PR = "r0" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native" +DEPENDS = "expat glib-2.0 virtual/libintl dbus" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ -- cgit v1.2.3 From 3a1667fe6b2aa742ab876ba5cca09670689bee96 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 28 Aug 2006 16:01:58 +0000 Subject: dbus-native-0.92: do_stage: create dir before putting files to it --- packages/dbus/dbus-native_0.92.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/dbus/dbus-native_0.92.bb b/packages/dbus/dbus-native_0.92.bb index db2d7014ef..d7823889cd 100644 --- a/packages/dbus/dbus-native_0.92.bb +++ b/packages/dbus/dbus-native_0.92.bb @@ -23,5 +23,6 @@ do_stage () { autotools_stage_all # for dbus-glib-native introspection generation + install -d ${STAGING_DATADIR}/dbus install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf } -- cgit v1.2.3 From e862cffe7647e7b07450d5cf7c4211ebe534661e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 28 Aug 2006 17:11:04 +0000 Subject: dbus-glib-0.71: depend on dbus-glib-native for binding header generation --- packages/dbus/dbus-glib_0.71.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/dbus/dbus-glib_0.71.bb b/packages/dbus/dbus-glib_0.71.bb index 80a9ae44d6..26bc851098 100644 --- a/packages/dbus/dbus-glib_0.71.bb +++ b/packages/dbus/dbus-glib_0.71.bb @@ -3,7 +3,7 @@ PR = "r0" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl dbus" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ -- cgit v1.2.3 From 537ed75a23b6d1e2ef3f8138e891b4b1b0bfbd49 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 28 Aug 2006 17:46:08 +0000 Subject: libnss-mdns: remove avahi-daemon recommendation to avoid circular dependency --- packages/libnss-mdns/libnss-mdns_0.6.bb | 2 +- packages/libnss-mdns/libnss-mdns_0.7.bb | 2 +- packages/libnss-mdns/libnss-mdns_0.8.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/libnss-mdns/libnss-mdns_0.6.bb b/packages/libnss-mdns/libnss-mdns_0.6.bb index fc1941fc23..5de9df567c 100644 --- a/packages/libnss-mdns/libnss-mdns_0.6.bb +++ b/packages/libnss-mdns/libnss-mdns_0.6.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -RRECOMMENDS_${PN} = "avahi-daemon zeroconf" +RRECOMMENDS_${PN} = "zeroconf" PR = "r1" EXTRA_OECONF = "--libdir=/lib" diff --git a/packages/libnss-mdns/libnss-mdns_0.7.bb b/packages/libnss-mdns/libnss-mdns_0.7.bb index 306adb0ee6..98ab50f07f 100644 --- a/packages/libnss-mdns/libnss-mdns_0.7.bb +++ b/packages/libnss-mdns/libnss-mdns_0.7.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -RRECOMMENDS_${PN} = "avahi-daemon zeroconf" +RRECOMMENDS_${PN} = "zeroconf" PR = "r0" EXTRA_OECONF = "--libdir=/lib" diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb index 997daf43b0..475297cd63 100644 --- a/packages/libnss-mdns/libnss-mdns_0.8.bb +++ b/packages/libnss-mdns/libnss-mdns_0.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs" PRIORITY = "optional" -RRECOMMENDS_${PN} = "avahi-daemon zeroconf" +RRECOMMENDS_${PN} = "zeroconf" PR = "r0" EXTRA_OECONF = "--libdir=/lib" -- cgit v1.2.3 From 7f2a9d67a3f3d0c3c4194f1790686ec219cdb82a Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 28 Aug 2006 20:29:19 +0000 Subject: packages/glib-2.0/glib-2.0_2.12.0: Fixes broken URL --- packages/glib-2.0/glib-2.0_2.12.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0_2.12.0.bb b/packages/glib-2.0/glib-2.0_2.12.0.bb index 2082e4ca6b..0dce9a6db7 100644 --- a/packages/glib-2.0/glib-2.0_2.12.0.bb +++ b/packages/glib-2.0/glib-2.0_2.12.0.bb @@ -17,7 +17,7 @@ FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.12/glib-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.gtk.org/pub/glib/2.12/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" -- cgit v1.2.3 From 98d2a57db6b822014361aabad9486fd426d88eaa Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 28 Aug 2006 20:26:01 +0000 Subject: linux-omap1_2.6.x+git, omap5912osk: Add bb file to build kernel from omap git * Build kernel from omap git repository, use most recent version * Change omap5912osk machine to use this kernel * The depmod command is failing at the moment --- packages/linux/linux-omap1_2.6.x+git.bb | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 packages/linux/linux-omap1_2.6.x+git.bb (limited to 'packages') diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb new file mode 100644 index 0000000000..9e499c7687 --- /dev/null +++ b/packages/linux/linux-omap1_2.6.x+git.bb @@ -0,0 +1,44 @@ +PR = "r0" +SECTION = "kernel" +DESCRIPTION = "Linux kernel for OMAP processors" +LICENSE = "GPL" + +SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git" + +S = "${WORKDIR}/git" + +KERNEL_IMAGETYPE = "vmlinux" +KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" +#KERNEL_CCSUFFIX = "-4.1.1" + +DEPENDS = "u-boot" + +inherit kernel + +# GIT does not have the UTS_RELEASE in version.h used to find the kernel version +KERNEL_RELEASE = "2.6.17" + +COMPATIBLE_HOST = 'arm.*-linux' + +do_configure_prepend() { + if [ "${MACHINE}" == "omap5912osk" ] ; then + make omap_osk_5912_defconfig + fi + + oe_runmake oldconfig +} + +do_deploy() { + if [ "${MACHINE}" == "omap5912osk" ]; then + install -d ${DEPLOY_DIR_IMAGE} + arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin + gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin + mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin + rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz + fi +} + + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From d3c0ca658f75bf8f2aa96c51126712eb8d45c875 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 28 Aug 2006 20:30:14 +0000 Subject: Merge from poky: Rework the way patches are handled. There are now two abstract base classes, initialized in patch.bbclass. One for patchset operations on a directory, and another for patch failure resolution. Currently includes 'patch' and 'quilt' concrete PatchSet classes, and a 'user' resolver class, which simply drops you into a shell in the source tree to fix the rejects. --- packages/gawk/gawk-native_3.1.4.bb | 4 +--- packages/patcher/patcher-native_20040913.bb | 4 +--- packages/quilt/quilt-native.inc | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/gawk/gawk-native_3.1.4.bb b/packages/gawk/gawk-native_3.1.4.bb index ba8efd1af7..0a33f71684 100644 --- a/packages/gawk/gawk-native_3.1.4.bb +++ b/packages/gawk/gawk-native_3.1.4.bb @@ -4,9 +4,7 @@ require gawk_${PV}.bb inherit native DEPENDS = "" -PATCH_DEPENDS = "" -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHTOOL = "patch" S = "${WORKDIR}/gawk-${PV}" diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index 833ca21a53..7da61e91c2 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -14,9 +14,7 @@ SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 " S = "${WORKDIR}/patcher" -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" -PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file"" +PATCHTOOL = "patch" do_stage() { install -m 0755 patcher.py ${STAGING_BINDIR}/patcher diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc index d19d864904..c8bbdc8e07 100644 --- a/packages/quilt/quilt-native.inc +++ b/packages/quilt/quilt-native.inc @@ -8,8 +8,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1" inherit autotools native -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHTOOL = "patch" EXTRA_OECONF = "--disable-nls" do_configure () { -- cgit v1.2.3 From c50a5743b3273d97db8957915d084de01fef7c59 Mon Sep 17 00:00:00 2001 From: Patrick Steiner Date: Mon, 28 Aug 2006 20:56:11 +0000 Subject: gobby: add gobby + supportlibs --- packages/gobby/gobby_0.4.1.bb | 8 ++++++++ packages/gobby/gtksourceview_1.7.2.bb | 10 ++++++++++ packages/gobby/libxml++_2.14.0.bb | 10 ++++++++++ packages/gobby/net6_1.2.2.bb | 8 +++++++- packages/gobby/net6_1.3.1.bb | 15 +++++++++++++++ packages/gobby/obby_0.4.1.bb | 19 +++++++++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 packages/gobby/gobby_0.4.1.bb create mode 100644 packages/gobby/gtksourceview_1.7.2.bb create mode 100644 packages/gobby/libxml++_2.14.0.bb create mode 100644 packages/gobby/net6_1.3.1.bb create mode 100644 packages/gobby/obby_0.4.1.bb (limited to 'packages') diff --git a/packages/gobby/gobby_0.4.1.bb b/packages/gobby/gobby_0.4.1.bb new file mode 100644 index 0000000000..8b7ccad199 --- /dev/null +++ b/packages/gobby/gobby_0.4.1.bb @@ -0,0 +1,8 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/" +MAINTAINER = "Patrick Steiner " + +DEPENDS = "net6 gtkmm obby gtksourceview libxml++" +inherit autotools pkgconfig + +SRC_URI = "http://releases.0x539.de/gobby/gobby-${PV}.tar.gz" diff --git a/packages/gobby/gtksourceview_1.7.2.bb b/packages/gobby/gtksourceview_1.7.2.bb new file mode 100644 index 0000000000..084af175f7 --- /dev/null +++ b/packages/gobby/gtksourceview_1.7.2.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +MAINTAINER = "Patrick Steiner " + +DEPENDS = "gtk+ libgnomeprint" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/gobby/libxml++_2.14.0.bb b/packages/gobby/libxml++_2.14.0.bb new file mode 100644 index 0000000000..6eb296c8c2 --- /dev/null +++ b/packages/gobby/libxml++_2.14.0.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +MAINTAINER = "Patrick Steiner " + +DEPENDS = "gtk+" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} diff --git a/packages/gobby/net6_1.2.2.bb b/packages/gobby/net6_1.2.2.bb index daa7e9b5b9..f9154fcca9 100644 --- a/packages/gobby/net6_1.2.2.bb +++ b/packages/gobby/net6_1.2.2.bb @@ -7,4 +7,10 @@ inherit autotools pkgconfig SRC_URI = "http://releases.0x539.de/${PN}/${P}.tar.gz" - +do_stage() { + autotools_stage_all + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/net6 + install -m 644 inc/*.hpp ${STAGING_INCDIR}/net6 + install -m 755 .libs/*so* ${STAGING_LIBDIR}/ +} diff --git a/packages/gobby/net6_1.3.1.bb b/packages/gobby/net6_1.3.1.bb new file mode 100644 index 0000000000..3bcf8811d9 --- /dev/null +++ b/packages/gobby/net6_1.3.1.bb @@ -0,0 +1,15 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/" +MAINTAINER = "Koen Kooi " + +DEPENDS = "libsigc++-2.0 gnutls" +inherit autotools pkgconfig + +SRC_URI = "http://releases.0x539.de/${PN}/${P}.tar.gz" + +do_stage() { + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/net6 + install -m 644 inc/*.hpp ${STAGING_INCDIR}/net6 + install -m 755 .libs/*so* ${STAGING_LIBDIR}/ +} diff --git a/packages/gobby/obby_0.4.1.bb b/packages/gobby/obby_0.4.1.bb new file mode 100644 index 0000000000..adf3a72571 --- /dev/null +++ b/packages/gobby/obby_0.4.1.bb @@ -0,0 +1,19 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://darcs.0x539.de/trac/obby/cgi-bin/trac.cgi/wiki/" +MAINTAINER = "Patrick Steiner " + +DEPENDS = "net6 gtkmm gmp" +inherit autotools pkgconfig + +SRC_URI = "http://releases.0x539.de/obby/obby-${PV}.tar.gz" + +EXTRA_OECONF += " --with-libgmp-prefix=${STAGING_LIBDIR}" + +do_stage() { + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/obby + install -d ${STAGING_INCDIR}/obby/serialise + install -m 644 inc/*.hpp ${STAGING_INCDIR}/obby + install -m 644 inc/serialise/*.hpp ${STAGING_INCDIR}/obby/serialise + install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/ +} -- cgit v1.2.3 From 81b3eb8ab803587093d026de254dd40082913035 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Aug 2006 21:00:03 +0000 Subject: libxml++: move to correct subdir --- packages/gobby/libxml++_2.14.0.bb | 10 ---------- packages/libxml/libxml++_2.14.0.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 packages/gobby/libxml++_2.14.0.bb create mode 100644 packages/libxml/libxml++_2.14.0.bb (limited to 'packages') diff --git a/packages/gobby/libxml++_2.14.0.bb b/packages/gobby/libxml++_2.14.0.bb deleted file mode 100644 index 6eb296c8c2..0000000000 --- a/packages/gobby/libxml++_2.14.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -LICENSE = "GPL" -MAINTAINER = "Patrick Steiner " - -DEPENDS = "gtk+" - -inherit gnome pkgconfig - -do_stage() { -autotools_stage_all -} diff --git a/packages/libxml/libxml++_2.14.0.bb b/packages/libxml/libxml++_2.14.0.bb new file mode 100644 index 0000000000..6eb296c8c2 --- /dev/null +++ b/packages/libxml/libxml++_2.14.0.bb @@ -0,0 +1,10 @@ +LICENSE = "GPL" +MAINTAINER = "Patrick Steiner " + +DEPENDS = "gtk+" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} -- cgit v1.2.3 From fe776c91a3769970513c59e4106b7e675fe92f0e Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 28 Aug 2006 21:15:31 +0000 Subject: New package for libesmtp 1.0.4 Closes bug #1346 --- packages/libesmtp/libesmtp_1.0.4.bb | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/libesmtp/libesmtp_1.0.4.bb b/packages/libesmtp/libesmtp_1.0.4.bb index 294333c579..baff0d8931 100644 --- a/packages/libesmtp/libesmtp_1.0.4.bb +++ b/packages/libesmtp/libesmtp_1.0.4.bb @@ -1,19 +1,22 @@ -DESCRIPTION = "LibESMTP is a library to manage posting \ -(or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." LICENSE = "GPL" -SECTION = "libs/network" +SECTION = "libs" DEPENDS = "openssl" -PR = "r1" +DESCRIPTION = "LibESMTP is a library to manage posting \ +(or submission of) electronic mail using SMTP to a \ +preconfigured Mail Transport Agent (MTA) such as Exim." +FILES_libesmtp_append = " ${libdir}/esmtp-plugins" SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2" -inherit autotools binconfig +inherit autotools EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." -do_stage() { - autotools_stage_all -} +do_stage () { + oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" + install -d ${STAGING_INCDIR} + install -m 644 auth-client.h ${STAGING_INCDIR} + install -m 644 auth-plugin.h ${STAGING_INCDIR} + install -m 644 libesmtp.h ${STAGING_INCDIR} +} -- cgit v1.2.3 From fef0035db932ea55dc0783e175aa6ee359bffb84 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 28 Aug 2006 21:31:21 +0000 Subject: esmtp 0.5.1 patch for uclibc --- packages/esmtp/esmtp-0.5.1/.mtn2git_empty | 0 packages/esmtp/esmtp-0.5.1/configure.patch | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 packages/esmtp/esmtp-0.5.1/.mtn2git_empty create mode 100644 packages/esmtp/esmtp-0.5.1/configure.patch (limited to 'packages') diff --git a/packages/esmtp/esmtp-0.5.1/.mtn2git_empty b/packages/esmtp/esmtp-0.5.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/esmtp/esmtp-0.5.1/configure.patch b/packages/esmtp/esmtp-0.5.1/configure.patch new file mode 100644 index 0000000000..ef6244a935 --- /dev/null +++ b/packages/esmtp/esmtp-0.5.1/configure.patch @@ -0,0 +1,22 @@ +--- /orig-configure.ac 2005-02-15 18:43:40.000000000 +0200 ++++ /configure.ac 2006-08-19 13:05:52.000000000 +0300 +@@ -29,16 +29,9 @@ + LDFLAGS="$LDFLAGS -L$with_libesmtp/lib" + AC_CHECK_HEADER(libesmtp.h, ,[AC_MSG_ERROR([libesmtp.h not found in $with_libesmtp])]) + fi +-AC_MSG_CHECKING(for libESMTP) +-if libesmtp-config --version > /dev/null 2>&1 +-then +- AC_MSG_RESULT(yes) +- CFLAGS="$CFLAGS `libesmtp-config --cflags`" +- LIBS="$LIBS `libesmtp-config --libs`" +-else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(libESMTP library not found) +-fi ++ ++ CFLAGS="$CFLAGS" ++ LIBS="$LIBS -lesmtp -lssl -lcrypto -ldl" + + AC_SUBST( sysconfdir ) + -- cgit v1.2.3 From 6346207824a03f13f4915618729814f30ecc816f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Aug 2006 21:54:46 +0000 Subject: scummvm 0.9.0: enable all engines to get rid of undefined symbols* * and be able to play more games --- packages/scummvm/scummvm_0.9.0.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'packages') diff --git a/packages/scummvm/scummvm_0.9.0.bb b/packages/scummvm/scummvm_0.9.0.bb index 7cfd6ac0d0..9719ee200e 100644 --- a/packages/scummvm/scummvm_0.9.0.bb +++ b/packages/scummvm/scummvm_0.9.0.bb @@ -2,6 +2,11 @@ require scummvm.inc DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib libmpeg2" SRC_URI += "file://sh3-arch-0.9.0+.patch;patch=1" +EXTRA_OECONF += "--enable-lure \ + --enable-agi \ + --enable-cine \ + " + do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" -- cgit v1.2.3 From 12cd6ac5f22b09038542f066633367bf60513bed Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 28 Aug 2006 22:04:47 +0000 Subject: scummvm.inc: remove Troll technology --- packages/scummvm/scummvm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index e39397be06..313b8e3d51 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL." +DESCRIPTION = "Virtual Machine for LucasArts Adventures" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -- cgit v1.2.3 From 4696a83bd6aad71f56e72afb10fbb5488d337266 Mon Sep 17 00:00:00 2001 From: Carsten Schneider Date: Tue, 29 Aug 2006 06:25:15 +0000 Subject: zsafe: added 2.1.3 - close #1370 applied changes from 26de4ae1a5a4cc78e31a35514476c8f83392d32e (.oz354x) through 704acabcb81bc6c3e644c6c18bb730c30a8d882c --- packages/zsafe/.mtn2git_empty | 0 packages/zsafe/zsafe_2.1.3.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 packages/zsafe/.mtn2git_empty create mode 100644 packages/zsafe/zsafe_2.1.3.bb (limited to 'packages') diff --git a/packages/zsafe/.mtn2git_empty b/packages/zsafe/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zsafe/zsafe_2.1.3.bb b/packages/zsafe/zsafe_2.1.3.bb new file mode 100644 index 0000000000..f4b9d0c5ab --- /dev/null +++ b/packages/zsafe/zsafe_2.1.3.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Password manager" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Carsten Schneider " +LICENSE = "GPL" +RCONFLICTS = "opie-zsafe" +APPNAME = "zsafe" +APPTYPE = "binary" +APPDESKTOP = "${WORKDIR}" +SRC_URI = "http://z-soft.z-portal.info/zsafe/zsafe_2.1.3.tgz" +S = "${WORKDIR}" + +inherit opie + +QMAKE_PROFILES = "zsafe.pro" + +export OE_QMAKE_LINK="${CXX}" + +#FILES bin/zsafe apps/Applications/zsafe.desktop pics/zsafe/zsafe.png + +FILES_zsafe = "zsafe" + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.xpm ${D}${palmtopdir}/pics/${APPNAME}/ + install -m 0644 ${WORKDIR}/zsafe.png ${D}${palmtopdir}/pics/ +} -- cgit v1.2.3 From 309314ba7cc3c5947c897d61c06309bdb9c9efa7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 29 Aug 2006 06:34:52 +0000 Subject: libxine: add libpng to DEPENDS - close #1357 --- packages/libxine/libxine-fb_1.0.bb | 2 +- packages/libxine/libxine-x11_1.0.bb | 2 +- packages/libxine/libxine_1.1.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/libxine/libxine-fb_1.0.bb b/packages/libxine/libxine-fb_1.0.bb index fd9baee512..d0f58303fa 100644 --- a/packages/libxine/libxine-fb_1.0.bb +++ b/packages/libxine/libxine-fb_1.0.bb @@ -3,7 +3,7 @@ This version is configured for the usage with framebuffer based environments" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg tremor libmad libmodplug" +DEPENDS = "zlib libogg tremor libmad libmodplug libpng" PROVIDES = "virtual/libxine" PR = "r1" diff --git a/packages/libxine/libxine-x11_1.0.bb b/packages/libxine/libxine-x11_1.0.bb index dfce1d32ec..692c55cf9f 100644 --- a/packages/libxine/libxine-x11_1.0.bb +++ b/packages/libxine/libxine-x11_1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" PR = "r0" diff --git a/packages/libxine/libxine_1.1.0.bb b/packages/libxine/libxine_1.1.0.bb index 8f172f23a7..b4ab063063 100644 --- a/packages/libxine/libxine_1.1.0.bb +++ b/packages/libxine/libxine_1.1.0.bb @@ -3,7 +3,7 @@ This version is configued for the usage with X11" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext" +DEPENDS = "zlib libogg libvorbis tremor libmad libmodplug esound-gpe virtual/libx11 libxext libpng" PROVIDES = "virtual/libxine" PR = "r0" -- cgit v1.2.3 From b0915887c4f041c2004f5fcb286eba5b42e02d84 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 08:58:56 +0000 Subject: samba: fix -dbg packaging for 3.0.14a and 3.0.20 --- packages/samba/samba_3.0.14a.bb | 3 ++- packages/samba/samba_3.0.20.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/samba/samba_3.0.14a.bb b/packages/samba/samba_3.0.14a.bb index 4daf98bfc8..ddd08c80b7 100644 --- a/packages/samba/samba_3.0.14a.bb +++ b/packages/samba/samba_3.0.14a.bb @@ -1,4 +1,4 @@ -PR = "r14" +PR = "r15" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -49,6 +49,7 @@ PACKAGES =+ "swat" FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" +FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so" # # bug fix for samba.inc: FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb index 7f5bd3dffa..088c167cb1 100644 --- a/packages/samba/samba_3.0.20.bb +++ b/packages/samba/samba_3.0.20.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -49,6 +49,7 @@ PACKAGES =+ "swat" FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" +FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so" # # bug fix for samba.inc: FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" -- cgit v1.2.3 From 1ed378b6258e7df0a51fe7082ceded34581245a9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 29 Aug 2006 08:59:28 +0000 Subject: libesmtp: correct damage done by previous commit --- packages/libesmtp/libesmtp_1.0.4.bb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/libesmtp/libesmtp_1.0.4.bb b/packages/libesmtp/libesmtp_1.0.4.bb index baff0d8931..294333c579 100644 --- a/packages/libesmtp/libesmtp_1.0.4.bb +++ b/packages/libesmtp/libesmtp_1.0.4.bb @@ -1,22 +1,19 @@ -LICENSE = "GPL" -SECTION = "libs" -DEPENDS = "openssl" DESCRIPTION = "LibESMTP is a library to manage posting \ (or submission of) electronic mail using SMTP to a \ -preconfigured Mail Transport Agent (MTA) such as Exim." -FILES_libesmtp_append = " ${libdir}/esmtp-plugins" +preconfigured Mail Transport Agent (MTA) such as Exim or PostFix." +LICENSE = "GPL" +SECTION = "libs/network" +DEPENDS = "openssl" +PR = "r1" SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.." -do_stage () { - oe_libinstall -a -so libesmtp ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR} - install -m 644 auth-client.h ${STAGING_INCDIR} - install -m 644 auth-plugin.h ${STAGING_INCDIR} - install -m 644 libesmtp.h ${STAGING_INCDIR} +do_stage() { + autotools_stage_all } + +FILES_libesmtp_append = " ${libdir}/esmtp-plugins" -- cgit v1.2.3 From bb4b9a807fd9ff8a3dc37e26303c805a358f3085 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Aug 2006 09:03:15 +0000 Subject: linux-ezx: update to ezx7 and add 2 patches for gcc4-isms --- packages/linux/linux-ezx/pxa-serial-gcc4.diff | 11 ++++++++ packages/linux/linux-ezx/sa1100-rtc-gcc4.diff | 11 ++++++++ packages/linux/linux-ezx_2.6.16.13.bb | 36 ++++++--------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 packages/linux/linux-ezx/pxa-serial-gcc4.diff create mode 100644 packages/linux/linux-ezx/sa1100-rtc-gcc4.diff (limited to 'packages') diff --git a/packages/linux/linux-ezx/pxa-serial-gcc4.diff b/packages/linux/linux-ezx/pxa-serial-gcc4.diff new file mode 100644 index 0000000000..7f827965e9 --- /dev/null +++ b/packages/linux/linux-ezx/pxa-serial-gcc4.diff @@ -0,0 +1,11 @@ +--- /tmp/pxa.c 2006-08-29 10:51:57.000000000 +0200 ++++ linux-2.6.16/drivers/serial/pxa.c 2006-08-29 10:52:38.545780000 +0200 +@@ -241,7 +241,7 @@ + /* + * This handles the interrupt from one port. + */ +-static inline irqreturn_t ++inline irqreturn_t + serial_pxa_irq(int irq, void *dev_id, struct pt_regs *regs) + { + struct uart_pxa_port *up = (struct uart_pxa_port *)dev_id; diff --git a/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff b/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff new file mode 100644 index 0000000000..6fd54ece3a --- /dev/null +++ b/packages/linux/linux-ezx/sa1100-rtc-gcc4.diff @@ -0,0 +1,11 @@ +--- /tmp/sa1100-rtc.c 2006-08-29 10:51:48.000000000 +0200 ++++ linux-2.6.16/drivers/char/sa1100-rtc.c 2006-08-29 10:52:14.995780000 +0200 +@@ -126,7 +126,7 @@ + tval->tm_mday = days + 1; + } + +-static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) + { + unsigned int rtsr = RTSR; + diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb index f326321217..6da8a32a21 100644 --- a/packages/linux/linux-ezx_2.6.16.13.bb +++ b/packages/linux/linux-ezx_2.6.16.13.bb @@ -5,8 +5,8 @@ HOMEPAGE = "http://www.openezx.org" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS += "quilt-native" -EZX = "ezx6" -PR = "${EZX}-r13" +EZX = "ezx7" +PR = "${EZX}-r0" inherit kernel @@ -17,33 +17,12 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # source and patches # SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ - http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-exz6-symlink-fix.tar.bz2 \ + http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \ \ - ${RPSRC}/led_core-r15.patch;patch=1 \ - ${RPSRC}/led_triggers-r14.patch;patch=1 \ - ${RPSRC}/led_trig_timer-r8.patch;patch=1 \ - ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \ - ${RPSRC}/led_zaurus-r10.patch;patch=1 \ - ${RPSRC}/led_locomo-r7.patch;patch=1 \ - ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \ - ${RPSRC}/led_tosa-r5.patch;patch=1 \ - ${RPSRC}/led_ide-r6.patch;patch=1 \ - ${RPSRC}/led_nand-r3.patch;patch=1 \ - ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \ - ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \ - ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1 \ - \ - file://touchscreen-fix-r0.patch;patch=1 \ - \ - file://e680-disable-boomer-HACK.patch;patch=1 \ - \ - file://e680-leds-r1.patch;patch=1 \ - file://a780-leds-r0.patch;patch=1 \ - file://ezx-backlight-r1.patch;patch=1 \ - file://e680-fix-keypad.patch;patch=1 \ - file://pxakbd-fix-directkeys.patch;patch=1 \ - \ - file://logo_linux_clut224.ppm \ + file://sa1100-rtc-gcc4.diff;patch=1 \ + file://pxa-serial-gcc4.diff;patch=1 \ + \ + file://logo_linux_clut224.ppm \ file://defconfig-a780 \ file://defconfig-e680" S = "${WORKDIR}/linux-2.6.16" @@ -79,7 +58,6 @@ do_ezxpatch() { } do_configure() { - mv ${S}/.config harald.config install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then -- cgit v1.2.3 From 821b2af1e0caa9464fd030dfc34841607e5863be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Aug 2006 09:13:31 +0000 Subject: linux-ezx: remove outdated patches --- packages/linux/linux-ezx/a780-leds-r0.patch | 185 ---------- .../linux/linux-ezx/e680-disable-boomer-HACK.patch | 16 - packages/linux/linux-ezx/e680-fix-keypad.patch | 152 --------- packages/linux/linux-ezx/e680-leds-r0.patch | 336 ------------------ packages/linux/linux-ezx/e680-leds-r1.patch | 374 --------------------- packages/linux/linux-ezx/ezx-backlight-r0.patch | 212 ------------ packages/linux/linux-ezx/ezx-backlight-r1.patch | 277 --------------- .../linux/linux-ezx/pxakbd-fix-directkeys.patch | 83 ----- packages/linux/linux-ezx/touchscreen-fix-r0.patch | 19 -- 9 files changed, 1654 deletions(-) delete mode 100644 packages/linux/linux-ezx/a780-leds-r0.patch delete mode 100644 packages/linux/linux-ezx/e680-disable-boomer-HACK.patch delete mode 100644 packages/linux/linux-ezx/e680-fix-keypad.patch delete mode 100644 packages/linux/linux-ezx/e680-leds-r0.patch delete mode 100644 packages/linux/linux-ezx/e680-leds-r1.patch delete mode 100644 packages/linux/linux-ezx/ezx-backlight-r0.patch delete mode 100644 packages/linux/linux-ezx/ezx-backlight-r1.patch delete mode 100644 packages/linux/linux-ezx/pxakbd-fix-directkeys.patch delete mode 100644 packages/linux/linux-ezx/touchscreen-fix-r0.patch (limited to 'packages') diff --git a/packages/linux/linux-ezx/a780-leds-r0.patch b/packages/linux/linux-ezx/a780-leds-r0.patch deleted file mode 100644 index 31fdfc635b..0000000000 --- a/packages/linux/linux-ezx/a780-leds-r0.patch +++ /dev/null @@ -1,185 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/drivers/leds/Kconfig~a780-leds-r0.patch 2006-06-05 18:05:32.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Kconfig 2006-06-05 18:05:32.000000000 +0200 -@@ -66,6 +66,13 @@ - This options enables support for the LEDs on the - Motorola E680(i) GSM Phone. - -+config LEDS_A780 -+ tristate "LED Support for the Motorola A780 GSM Phone" -+ depends LEDS_CLASS && PXA_EZX_A780 -+ help -+ This option enables support for the LEDs on the -+ Motorola A780 GSM Phone. -+ - config LEDS_TRIGGER_TIMER - tristate "LED Timer Trigger" - depends LEDS_TRIGGERS ---- linux-2.6.16/drivers/leds/Makefile~a780-leds-r0.patch 2006-06-05 18:05:32.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Makefile 2006-06-05 18:05:32.000000000 +0200 -@@ -11,6 +11,7 @@ - obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.o - obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o - obj-$(CONFIG_LEDS_E680) += leds-e680.o -+obj-$(CONFIG_LEDS_A780) += leds-a780.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~a780-leds-r0.patch 2006-06-05 18:05:32.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-05 18:05:32.000000000 +0200 -@@ -367,6 +367,15 @@ - }; - #endif - -+#ifdef CONFIG_PXA_EZX_A780 -+/* -+ * A780 LEDs -+ */ -+static struct platform_device a780led_device = { -+ .name = "a780-led", -+ .id = -1, -+}; -+#endif - - /* keyboard */ - -@@ -780,6 +789,9 @@ - #ifdef CONFIG_PXA_EZX_E680 - &e680led_device, - #endif -+#ifdef CONFIG_PXA_EZX_A780 -+ &a780led_device, -+#endif - }; - - static void __init ---- /dev/null 2006-06-05 13:59:28.329930680 +0200 -+++ linux-2.6.16/drivers/leds/leds-a780.c 2006-06-05 18:27:13.000000000 +0200 -@@ -0,0 +1,123 @@ -+/* -+ * EZX Platform LED Driver for the Motorola A780 GSM Phone -+ * -+ * Copyright 2006 Vanille-Media -+ * -+ * Author: Michael Lauer -+ * -+ * Based on keylight.c by Motorola and leds-corgi.c by Richard Purdie -+ * -+ * 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 -+ -+static void a780led_main_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if ( value > 31 ) value = 31; -+ printk( KERN_DEBUG "a780led_main_set: %d\n", value ); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL0, value & 0x01); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL1, value & 0x02); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL2, value & 0x04); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL3, value & 0x08); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL_CTRL4, value & 0x10); -+} -+ -+static void a780led_aux_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if ( value > 31 ) value = 31; -+ printk( KERN_DEBUG "a780led_aux_set: %d\n", value ); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL0, value & 0x01); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL1, value & 0x02); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL2, value & 0x04); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL3, value & 0x08); -+ ezx_pcap_bit_set(SSP_PCAP_ADJ_BIT_PERIPH_BL2_CTRL4, value & 0x10); -+} -+ -+static struct led_classdev a780_main_led = { -+ .name = "a780:main", -+ .default_trigger = "none", -+ .brightness_set = a780led_main_set, -+}; -+ -+static struct led_classdev a780_aux_led = { -+ .name = "a780:aux", -+ .default_trigger = "none", -+ .brightness_set = a780led_aux_set, -+}; -+ -+#ifdef CONFIG_PM -+static int a780led_suspend(struct platform_device *dev, pm_message_t state) -+{ -+ led_classdev_suspend(&a780_main_led); -+ led_classdev_suspend(&a780_aux_led); -+ return 0; -+} -+ -+static int a780led_resume(struct platform_device *dev) -+{ -+ led_classdev_resume(&a780_main_led); -+ led_classdev_resume(&a780_aux_led); -+ return 0; -+} -+#endif -+ -+static int a780led_probe(struct platform_device *pdev) -+{ -+ int ret; -+ -+ ret = led_classdev_register(&pdev->dev, &a780_main_led); -+ if (ret < 0) -+ return ret; -+ -+ ret = led_classdev_register(&pdev->dev, &a780_aux_led); -+ if (ret < 0) -+ led_classdev_unregister(&a780_main_led); -+ -+ return ret; -+} -+ -+static int a780led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&a780_main_led); -+ led_classdev_unregister(&a780_aux_led); -+ return 0; -+} -+ -+static struct platform_driver a780led_driver = { -+ .probe = a780led_probe, -+ .remove = a780led_remove, -+#ifdef CONFIG_PM -+ .suspend = a780led_suspend, -+ .resume = a780led_resume, -+#endif -+ .driver = { -+ .name = "a780-led", -+ }, -+}; -+ -+static int __init a780led_init(void) -+{ -+ return platform_driver_register(&a780led_driver); -+} -+ -+static void __exit a780led_exit(void) -+{ -+ a780led_main_set( &a780_main_led, 0 ); -+ a780led_aux_set( &a780_aux_led, 0 ); -+ platform_driver_unregister(&a780led_driver); -+} -+ -+module_init(a780led_init); -+module_exit(a780led_exit); -+ -+MODULE_AUTHOR("Michael Lauer "); -+MODULE_DESCRIPTION("Motorola A780 LED driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch b/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch deleted file mode 100644 index a0d953ddfb..0000000000 --- a/packages/linux/linux-ezx/e680-disable-boomer-HACK.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/drivers/i2c/chips/Makefile~e680-disable-boomer 2006-05-31 18:52:44.000000000 +0200 -+++ linux-2.6.16/drivers/i2c/chips/Makefile 2006-05-31 18:56:38.000000000 +0200 -@@ -17,7 +17,7 @@ - - obj-$(CONFIG_I2C_ADCM2700) += e680_camera.o - obj-$(CONFIG_I2C_A780_CAMERA) += a780_camera.o --obj-$(CONFIG_PXA_EZX_E680) += boomer.o -+//obj-$(CONFIG_PXA_EZX_E680) += boomer.o - - ifeq ($(CONFIG_I2C_DEBUG_CHIP),y) - EXTRA_CFLAGS += -DDEBUG diff --git a/packages/linux/linux-ezx/e680-fix-keypad.patch b/packages/linux/linux-ezx/e680-fix-keypad.patch deleted file mode 100644 index ca06052803..0000000000 --- a/packages/linux/linux-ezx/e680-fix-keypad.patch +++ /dev/null @@ -1,152 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-fix-keypad.patch 2006-06-11 00:47:33.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-12 16:13:28.000000000 +0200 -@@ -341,71 +341,25 @@ - }; - #endif - --/* keyboard */ -- --#if defined(CONFIG_PXA_EZX_V700) --#error "kbd matrix still needs to be converted to new row/col layout" --static unsigned char ezx_keycode[] = { -- /* col 0 */ -- KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, -- KEYPAD_POUND, KEY_0, KEY_9, 0, -- /* col 1 */ -- KEY_2, KEY_4, KEY_6, KEY_8, -- KEY_7, KEYPAD_SLEFT, KEYPAD_SRIGHT, 0, -- /* col 2 */ -- KEY_MENU, KEY_1, KEY_3, KEY_5, -- KEY_KPASTERISK, KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0, -- /* col 3 */ -- KEY_CAMERA, KEYPAD_CLEAR, KEYPAD_CARRIER, KEYPAD_ACTIVATE, -- KEYPAD_SEND, KEYPAD_SMART, KEYPAD_VAVR, 0, --}; --static unsigned char ezx_direct_keycode[] = { -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_NONE, --}; --#elif defined(CONFIG_PXA_EZX_E680_P4A) --#error "kbd matrix still needs to be converted to new row/col layout" --static unsigned char ezx_keycode[] = { -- /* col 0 */ -- KEY_UP, KEY_DOWN, KEY_LEFT, 0, 0, 0, 0, 0, -- /* col 1 */ -- KEY_RIGHT, KEY_CENTER, KEY_HOME, 0, 0, 0, 0, 0, -- /* col 2 */ -- KEYPAD_GAME_R, 0, KEYPAD_GAME_L, 0, 0, 0, 0, 0, -- /* col 3 */ -- KEY_A, KEY_B, 0, 0, 0, 0, 0, 0, --}; --static unsigned char ezx_direct_keycode[] = { -- KEY_CAMERA, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEY_POWER, -- KEYPAD_NONE, --}; --#elif defined(CONFIG_PXA_EZX_E680) --#error "kbd matrix still needs to be converted to new row/col layout" -+/* -+ * PXA Keyboard -+ */ -+#if defined(CONFIG_PXA_EZX_E680) - static unsigned char ezx_keycode[] = { -- /* col 0 */ -- KEY_UP, KEY_DOWN, 0, 0, 0, 0, 0, 0, -- /* col 1 */ -- KEY_RIGHT, KEY_LEFT, 0, 0, 0, 0, 0, 0, -- /* col 2 */ -- 0, KEYPAD_GAME_R, 0, 0, 0, 0, 0, 0, -- /* col 3 */ -- KEYPAD_HOME, KEYPAD_GAME_L, KEYPAD_CENTER, 0, 0, 0, 0, 0, -+ /* row 0 */ -+ KEY_UP, KEY_RIGHT, KEY_RESERVED, KEY_PHONE, -+ /* row 1 */ -+ KEY_DOWN, KEY_LEFT, KEY_VOLUMEUP, KEY_VOLUMEDOWN, -+ /* row 2 */ -+ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_KPENTER, - }; - static unsigned char ezx_direct_keycode[] = { - KEY_CAMERA, -- KEYPAD_NONE, -- KEYPAD_NONE, -- KEYPAD_A, -+ KEY_RESERVED, -+ KEY_RESERVED, -+ KEY_HOME, - KEY_POWER, -- KEYPAD_B, -+ KEY_MENU, - }; - #elif defined(CONFIG_PXA_EZX_A780) - static unsigned char ezx_keycode[] = { -@@ -424,22 +378,12 @@ - KEY_CAMERA, - }; - #else --#error "no EZX subarchitecture defined !?!" -+#error "no EZX subarchitecture defined" - #endif - - static int ezx_kbd_init(void) - { --#if defined(CONFIG_PXA_EZX_E680_P4A) -- pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */ -- pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */ -- pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN); /* KP_MKIN<0> */ -- pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN); /* KP_MKIN<1> */ -- pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN); /* KP_MKIN<2> */ -- pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */ -- pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */ -- pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */ -- pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */ --#elif defined(CONFIG_PXA_EZX_E680) -+#if defined(CONFIG_PXA_EZX_E680) - pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, VR Key */ - pxa_gpio_mode(96 | GPIO_ALT_FN_1_IN); /* KP_DKIN<3>, GAME_A */ - pxa_gpio_mode(97 | GPIO_ALT_FN_1_IN); /* KP_DKIN<4>, power key */ -@@ -455,7 +399,7 @@ - GPDR(GPIO_TC_MM_EN) |= GPIO_bit(GPIO_TC_MM_EN); - GPSR(GPIO_TC_MM_EN) = GPIO_bit(GPIO_TC_MM_EN); - PGSR3 |= GPIO_bit(GPIO_TC_MM_EN); --#elif defined (CONFIG_PXA_EZX_A780) -+#elif defined(CONFIG_PXA_EZX_A780) - pxa_gpio_mode(93 | GPIO_ALT_FN_1_IN); /* KP_DKIN<0>, voice_rec */ - pxa_gpio_mode(97 | GPIO_ALT_FN_3_IN); /* KP_MKIN<3> */ - pxa_gpio_mode(98 | GPIO_ALT_FN_3_IN); /* KP_MKIN<4> */ -@@ -476,10 +420,7 @@ - .scan_interval = HZ/40, - .matrix = { - .keycode = &ezx_keycode, --#if defined(CONFIG_ARCH_EXZ_E680_P4A) -- .cols = 4, -- .rows = 3, --#elif defined(CONFIG_PXA_EZX_E680) -+#if defined(CONFIG_PXA_EZX_E680) - .cols = 4, - .rows = 3, - #elif defined(CONFIG_PXA_EZX_A780) -@@ -489,10 +430,8 @@ - }, - .direct = { - .keycode = &ezx_direct_keycode, --#if defined(CONFIG_PXA_EZX_E680_P4A) -- .num = 4, --#elif defined(CONFIG_PXA_EZX_E680) -- .num = 5, -+#if defined(CONFIG_PXA_EZX_E680) -+ .num = 6, - #elif defined(CONFIG_PXA_EZX_A780) - .num = 1, - #endif diff --git a/packages/linux/linux-ezx/e680-leds-r0.patch b/packages/linux/linux-ezx/e680-leds-r0.patch deleted file mode 100644 index b6d2413dc1..0000000000 --- a/packages/linux/linux-ezx/e680-leds-r0.patch +++ /dev/null @@ -1,336 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~led_ezx-r0.patch 2006-06-03 15:17:43.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-05 15:14:59.000000000 +0200 -@@ -357,6 +357,17 @@ - .num_resources = ARRAY_SIZE(ezx_backlight_resources), - }; - -+#ifdef CONFIG_PXA_EZX_E680 -+/* -+ * E680 LEDs -+ */ -+static struct platform_device e680led_device = { -+ .name = "e680-led", -+ .id = -1, -+}; -+#endif -+ -+ - /* keyboard */ - - #if defined(CONFIG_PXA_EZX_V700) -@@ -770,6 +781,9 @@ - - static struct platform_device *devices[] __initdata = { - &ezx_bp_device, -+#ifdef CONFIG_PXA_EZX_E680 -+ &e680led_device, -+#endif - }; - - static void __init ---- linux-2.6.16/drivers/leds/Kconfig~led_ezx-r0.patch 2006-06-03 15:17:47.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Kconfig 2006-06-03 15:17:47.000000000 +0200 -@@ -59,6 +59,13 @@ - This option enables support for the LEDs on Sharp Zaurus - SL-6000 series. - -+config LEDS_E680 -+ tristate "LED Support for the Motorola E680(i) GSM Phone" -+ depends LEDS_CLASS && PXA_EZX_E680 -+ help -+ This options enables support for the LEDs on the -+ Motorola E680(i) GSM Phone. -+ - config LEDS_TRIGGER_TIMER - tristate "LED Timer Trigger" - depends LEDS_TRIGGERS ---- linux-2.6.16/drivers/leds/Makefile~led_ezx-r0.patch 2006-06-03 15:17:47.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Makefile 2006-06-03 15:17:47.000000000 +0200 -@@ -10,7 +10,8 @@ - obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o - obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.o - obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o -+obj-$(CONFIG_LEDS_E680) += leds-e680.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o --obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o -\ Kein Zeilenumbruch am Dateiende. -+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o ---- /dev/null 2006-06-05 13:59:28.329930680 +0200 -+++ linux-2.6.16/drivers/leds/leds-e680.c 2006-06-05 15:11:42.000000000 +0200 -@@ -0,0 +1,269 @@ -+/* -+ * EZX Platform LED Driver for the Motorola E680(i) GSM Phone -+ * -+ * Copyright 2006 Vanille-Media -+ * -+ * Author: Michael Lauer -+ * -+ * Based on the Motorola 2.4 leds-e680.c and leds-corgi.c by Richard Purdie -+ * -+ * 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 -+#include -+#include -+#include -+//FIXME this belongs to somewhere else, please -+// adjust when ssp_pcap.h reached its final destination -+#include "../misc/ezx/ssp_pcap.h" -+ -+//FIXME move defines to header file -+#define IND_CNTL_R_BUL 46 -+#define IND_CNTL_G_BUL 47 -+#define SSP_PCAP_LED_MASK 0x000fffe0 -+#define SSP_PCAP_LED_SHIFT 5 -+ -+static enum led_brightness old_red; -+static enum led_brightness old_green; -+static enum led_brightness old_blue; -+ -+typedef struct { -+ unsigned char ind_GPIO_red; /*Indicator Red control GPIO 46: 0 active, 1 disactive*/ -+ unsigned char ind_GPIO_green; /*Indicator Green control GPIO 47: 0 active, 1 disactive*/ -+ unsigned char pcap_LEDR_en; /*pcap LEDR_EN bit value: 1 =Red LED(&Green) sink circuit enabled*/ -+ unsigned char pcap_LEDG_en; /*pcap LEDG_EN bit value:1 =Green(->Blue)LED sink circuit enabled*/ -+ unsigned char pcap_LEDR_CTRL; /* 4bits Sets the timing for the red(&Green) LED sink circuit*/ -+ unsigned char pcap_LEDG_CTRL; /* 4bits Sets the timing for the GREEN (->Blue) LED sink circuit*/ -+ unsigned char pcap_LEDR_I; /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDR*/ -+ unsigned char pcap_LEDG_I; /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDG*/ -+ unsigned char pcap_SKIP_on; /*1=The ON timing sequence defined by LEDx_CTRL is executed on every other cycle*/ -+} PCAP2_LED_REGISTER_VALUE; -+ -+const PCAP2_LED_REGISTER_VALUE led_register_value[]= -+{ -+ /* on/off pulsepower timing intensity */ -+ {0x1,0x1, 0x0,0x0, 0x0,0x0, 0x0,0x0,0x0}, /* OFF */ -+ {0x0,0x1, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* RED */ -+ {0x1,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* GREEN */ -+ {0x0,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* ORANGE = RED + GREEN */ -+ {0x1,0x1, 0x0,0x1, 0x0,0xc, 0x0,0x0,0x0}, /* BLUE */ -+ {0x0,0x1, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_RED = RED + BLUE */ -+ {0x1,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_GREEN = GREEN + BLUE */ -+ {0x0,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* WHITE = RED + GREEN + BLUE */ -+}; -+ -+static void e680led_led_set( enum led_brightness red, enum led_brightness green, enum led_brightness blue ) -+{ -+ printk( KERN_DEBUG "e680led_led_set: red=%d, green=%d, blue=%d", red, green, blue ); -+ unsigned int tempValue = 0; -+ unsigned int value = 0; -+ unsigned int stateIndex = 0; -+ unsigned char gpio_red, gpio_green, ledr_en, ledg_en, ledr_ctrl, ledg_ctrl, ledr_i, ledg_i,skip; -+ -+ stateIndex = ( ( blue << 2 ) | ( green << 1 ) | ( red ) ) & 0x7; -+ printk( KERN_DEBUG "LED stateIndex is %d", stateIndex ); -+ gpio_red = led_register_value[stateIndex].ind_GPIO_red & 0x1; -+ gpio_green = led_register_value[stateIndex].ind_GPIO_green & 0x1; -+ ledr_en = led_register_value[stateIndex].pcap_LEDR_en & 0x1; -+ ledg_en = led_register_value[stateIndex].pcap_LEDG_en & 0x1; -+ ledr_ctrl = led_register_value[stateIndex].pcap_LEDR_CTRL & 0xf; -+ ledg_ctrl = led_register_value[stateIndex].pcap_LEDG_CTRL & 0xf; -+ ledr_i = led_register_value[stateIndex].pcap_LEDR_I & 0x3; -+ ledg_i = led_register_value[stateIndex].pcap_LEDG_I & 0x3; -+ skip = led_register_value[stateIndex].pcap_SKIP_on & 0x1; -+ -+ /* disable LEDs */ -+ if( ezx_pcap_read(SSP_PCAP_ADJ_PERIPH_REGISTER,&tempValue) != SSP_PCAP_SUCCESS ) -+ { -+ printk( KERN_WARNING "LED PCAP Read Failed\n" ); -+ return; -+ } -+ tempValue &= (~SSP_PCAP_LED_MASK); -+ if( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) != SSP_PCAP_SUCCESS ) -+ { -+ printk( KERN_WARNING "LED PCAP Write Failed (Clear Data)\n" ); -+ return; -+ } -+ -+ /* configure GPIOs as output */ -+ pxa_gpio_mode(IND_CNTL_R_BUL | GPIO_OUT); -+ pxa_gpio_mode(IND_CNTL_G_BUL | GPIO_OUT); -+ -+ //FIXME: Simplify this logic -+ if ( (gpio_green && gpio_red) ) -+ { -+ /*Disable Red & Green signal*/ -+ set_GPIO(IND_CNTL_R_BUL); /*IND_CNTL_R_BUL Low active*/ -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL); -+ -+ clr_GPIO(IND_CNTL_G_BUL); /*IND_CNTL_G_BUL High active*/ -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL)); -+ -+ printk( KERN_DEBUG "LED GPIO Green & Red Disable\n"); -+ } else if ( gpio_green && !gpio_red ) -+ { -+ /*Green Disable, Red Enable*/ -+ clr_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL)); -+ -+ clr_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL)); -+ -+ printk( KERN_DEBUG "LED GPIO Green Disable, Red Enable\n"); -+ } else if (gpio_red && !gpio_green ) -+ { -+ /*Red Disable, Green Enable*/ -+ set_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL); -+ -+ set_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL); -+ printk( KERN_DEBUG "LED GPIO Red Disable, Green Enable"); -+ }else -+ { -+ /*Red & Green enable*/ -+ clr_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL)); -+ -+ set_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL); -+ printk( KERN_DEBUG "LED GPIO Red & Green Enable\n"); -+ } -+ -+ /* Write PCAP LED Peripheral Control Register*/ -+ value = ( ledr_en | (ledg_en <<1) | (ledr_ctrl <<2) | (ledg_ctrl <<6) | -+ (ledr_i << 10) | (ledg_i <<12) | (skip <<14) ) & 0x7fff; -+ tempValue |= (value <dev, &e680_red_led); -+ if (ret < 0) -+ return ret; -+ -+ ret = led_classdev_register(&pdev->dev, &e680_green_led); -+ if (ret < 0) -+ led_classdev_unregister(&e680_red_led); -+ -+ ret = led_classdev_register(&pdev->dev, &e680_blue_led); -+ if (ret < 0) { -+ led_classdev_unregister(&e680_red_led); -+ led_classdev_unregister(&e680_green_led); -+ } -+ return ret; -+} -+ -+static int e680led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&e680_red_led); -+ led_classdev_unregister(&e680_green_led); -+ led_classdev_unregister(&e680_blue_led); -+ return 0; -+} -+ -+static struct platform_driver e680led_driver = { -+ .probe = e680led_probe, -+ .remove = e680led_remove, -+#ifdef CONFIG_PM -+ .suspend = e680led_suspend, -+ .resume = e680led_resume, -+#endif -+ .driver = { -+ .name = "e680-led", -+ }, -+}; -+ -+static int __init e680led_init(void) -+{ -+ return platform_driver_register(&e680led_driver); -+} -+ -+static void __exit e680led_exit(void) -+{ -+ e680led_led_set( 0, 0, 0 ); -+ platform_driver_unregister(&e680led_driver); -+} -+ -+module_init(e680led_init); -+module_exit(e680led_exit); -+ -+MODULE_AUTHOR("Michael Lauer "); -+MODULE_DESCRIPTION("Motorola E680 LED driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/e680-leds-r1.patch b/packages/linux/linux-ezx/e680-leds-r1.patch deleted file mode 100644 index abbab2937d..0000000000 --- a/packages/linux/linux-ezx/e680-leds-r1.patch +++ /dev/null @@ -1,374 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~e680-leds-r0.patch 2006-06-06 17:14:06.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-06 17:23:14.000000000 +0200 -@@ -357,6 +357,17 @@ - .num_resources = ARRAY_SIZE(ezx_backlight_resources), - }; - -+#ifdef CONFIG_PXA_EZX_E680 -+/* -+ * E680 LEDs -+ */ -+static struct platform_device e680led_device = { -+ .name = "e680-led", -+ .id = -1, -+}; -+#endif -+ -+ - /* keyboard */ - - #if defined(CONFIG_PXA_EZX_V700) -@@ -766,6 +777,9 @@ - - static struct platform_device *devices[] __initdata = { - &ezx_bp_device, -+#ifdef CONFIG_PXA_EZX_E680 -+ &e680led_device, -+#endif - }; - - static void __init ---- linux-2.6.16/drivers/leds/Kconfig~e680-leds-r0.patch 2006-06-06 17:14:05.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Kconfig 2006-06-06 17:23:14.000000000 +0200 -@@ -59,6 +59,13 @@ - This option enables support for the LEDs on Sharp Zaurus - SL-6000 series. - -+config LEDS_E680 -+ tristate "LED Support for the Motorola E680(i) GSM Phone" -+ depends LEDS_CLASS && PXA_EZX_E680 -+ help -+ This options enables support for the LEDs on the -+ Motorola E680(i) GSM Phone. -+ - config LEDS_TRIGGER_TIMER - tristate "LED Timer Trigger" - depends LEDS_TRIGGERS ---- linux-2.6.16/drivers/leds/Makefile~e680-leds-r0.patch 2006-06-06 17:14:05.000000000 +0200 -+++ linux-2.6.16/drivers/leds/Makefile 2006-06-06 17:23:14.000000000 +0200 -@@ -10,7 +10,8 @@ - obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o - obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.o - obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o -+obj-$(CONFIG_LEDS_E680) += leds-e680.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o --obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o -\ Kein Zeilenumbruch am Dateiende. -+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o ---- /dev/null 2006-06-06 16:58:36.577045136 +0200 -+++ linux-2.6.16/drivers/leds/leds-e680.c 2006-06-06 17:55:46.000000000 +0200 -@@ -0,0 +1,307 @@ -+/* -+ * EZX Platform LED Driver for the Motorola E680(i) GSM Phone -+ * -+ * Copyright 2006 Vanille-Media -+ * -+ * Author: Michael Lauer -+ * -+ * Based on the Motorola 2.4 leds-e680.c and leds-corgi.c by Richard Purdie -+ * -+ * 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 -+#include -+#include -+#include -+#include -+#include -+ -+//FIXME move defines to a common header file -+#define IND_CNTL_R_BUL 46 -+#define IND_CNTL_G_BUL 47 -+#define SSP_PCAP_LED_MASK 0x000fffe0 -+#define SSP_PCAP_LED_SHIFT 5 -+#define GPIO_TC_MM_EN 99 -+ -+static enum led_brightness old_red; -+static enum led_brightness old_green; -+static enum led_brightness old_blue; -+ -+typedef struct { -+ unsigned char ind_GPIO_red; /*Indicator Red control GPIO 46: 0 active, 1 disactive*/ -+ unsigned char ind_GPIO_green; /*Indicator Green control GPIO 47: 0 active, 1 disactive*/ -+ unsigned char pcap_LEDR_en; /*pcap LEDR_EN bit value: 1 =Red LED(&Green) sink circuit enabled*/ -+ unsigned char pcap_LEDG_en; /*pcap LEDG_EN bit value:1 =Green(->Blue)LED sink circuit enabled*/ -+ unsigned char pcap_LEDR_CTRL; /* 4bits Sets the timing for the red(&Green) LED sink circuit*/ -+ unsigned char pcap_LEDG_CTRL; /* 4bits Sets the timing for the GREEN (->Blue) LED sink circuit*/ -+ unsigned char pcap_LEDR_I; /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDR*/ -+ unsigned char pcap_LEDG_I; /* 2 bits 00 3mA,01 4mA, 10 5mA, 11 9mA, sets the pulsed current level for LEDG*/ -+ unsigned char pcap_SKIP_on; /*1=The ON timing sequence defined by LEDx_CTRL is executed on every other cycle*/ -+} PCAP2_LED_REGISTER_VALUE; -+ -+const PCAP2_LED_REGISTER_VALUE led_register_value[]= -+{ -+ /* on/off pulsepower timing intensity */ -+ {0x1,0x1, 0x0,0x0, 0x0,0x0, 0x0,0x0,0x0}, /* OFF */ -+ {0x0,0x1, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* RED */ -+ {0x1,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* GREEN */ -+ {0x0,0x0, 0x1,0x0, 0xc,0x0, 0x1,0x0,0x0}, /* ORANGE = RED + GREEN */ -+ {0x1,0x1, 0x0,0x1, 0x0,0xc, 0x0,0x0,0x0}, /* BLUE */ -+ {0x0,0x1, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_RED = RED + BLUE */ -+ {0x1,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* LIGHT_GREEN = GREEN + BLUE */ -+ {0x0,0x0, 0x1,0x1, 0xc,0xc, 0x1,0x0,0x0}, /* WHITE = RED + GREEN + BLUE */ -+}; -+ -+static void e680led_led_set( enum led_brightness red, enum led_brightness green, enum led_brightness blue ) -+{ -+ printk( KERN_DEBUG "e680led_led_set: red=%d, green=%d, blue=%d", red, green, blue ); -+ unsigned int tempValue = 0; -+ unsigned int value = 0; -+ unsigned int stateIndex = 0; -+ unsigned char gpio_red, gpio_green, ledr_en, ledg_en, ledr_ctrl, ledg_ctrl, ledr_i, ledg_i,skip; -+ -+ stateIndex = ( ( blue << 2 ) | ( green << 1 ) | ( red ) ) & 0x7; -+ printk( KERN_DEBUG "LED stateIndex is %d", stateIndex ); -+ gpio_red = led_register_value[stateIndex].ind_GPIO_red & 0x1; -+ gpio_green = led_register_value[stateIndex].ind_GPIO_green & 0x1; -+ ledr_en = led_register_value[stateIndex].pcap_LEDR_en & 0x1; -+ ledg_en = led_register_value[stateIndex].pcap_LEDG_en & 0x1; -+ ledr_ctrl = led_register_value[stateIndex].pcap_LEDR_CTRL & 0xf; -+ ledg_ctrl = led_register_value[stateIndex].pcap_LEDG_CTRL & 0xf; -+ ledr_i = led_register_value[stateIndex].pcap_LEDR_I & 0x3; -+ ledg_i = led_register_value[stateIndex].pcap_LEDG_I & 0x3; -+ skip = led_register_value[stateIndex].pcap_SKIP_on & 0x1; -+ -+ /* disable LEDs */ -+ if( ezx_pcap_read(SSP_PCAP_ADJ_PERIPH_REGISTER,&tempValue) != SSP_PCAP_SUCCESS ) -+ { -+ printk( KERN_WARNING "LED PCAP Read Failed\n" ); -+ return; -+ } -+ tempValue &= (~SSP_PCAP_LED_MASK); -+ if( ezx_pcap_write(SSP_PCAP_ADJ_PERIPH_REGISTER,tempValue) != SSP_PCAP_SUCCESS ) -+ { -+ printk( KERN_WARNING "LED PCAP Write Failed (Clear Data)\n" ); -+ return; -+ } -+ -+ /* configure GPIOs as output */ -+ pxa_gpio_mode(IND_CNTL_R_BUL | GPIO_OUT); -+ pxa_gpio_mode(IND_CNTL_G_BUL | GPIO_OUT); -+ -+ //FIXME: Simplify this logic -+ if ( (gpio_green && gpio_red) ) -+ { -+ /*Disable Red & Green signal*/ -+ set_GPIO(IND_CNTL_R_BUL); /*IND_CNTL_R_BUL Low active*/ -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL); -+ -+ clr_GPIO(IND_CNTL_G_BUL); /*IND_CNTL_G_BUL High active*/ -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL)); -+ -+ printk( KERN_DEBUG "LED GPIO Green & Red Disable\n"); -+ } else if ( gpio_green && !gpio_red ) -+ { -+ /*Green Disable, Red Enable*/ -+ clr_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL)); -+ -+ clr_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) & (~GPIO_bit(IND_CNTL_G_BUL)); -+ -+ printk( KERN_DEBUG "LED GPIO Green Disable, Red Enable\n"); -+ } else if (gpio_red && !gpio_green ) -+ { -+ /*Red Disable, Green Enable*/ -+ set_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) | GPIO_bit(IND_CNTL_R_BUL); -+ -+ set_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL); -+ printk( KERN_DEBUG "LED GPIO Red Disable, Green Enable"); -+ }else -+ { -+ /*Red & Green enable*/ -+ clr_GPIO(IND_CNTL_R_BUL); -+ PGSR(IND_CNTL_R_BUL) = PGSR(IND_CNTL_R_BUL) & (~GPIO_bit(IND_CNTL_R_BUL)); -+ -+ set_GPIO(IND_CNTL_G_BUL); -+ PGSR(IND_CNTL_G_BUL) = PGSR(IND_CNTL_G_BUL) | GPIO_bit(IND_CNTL_G_BUL); -+ printk( KERN_DEBUG "LED GPIO Red & Green Enable\n"); -+ } -+ -+ /* Write PCAP LED Peripheral Control Register*/ -+ value = ( ledr_en | (ledg_en <<1) | (ledr_ctrl <<2) | (ledg_ctrl <<6) | -+ (ledr_i << 10) | (ledg_i <<12) | (skip <<14) ) & 0x7fff; -+ tempValue |= (value <dev, &e680_red_led); -+ if (ret < 0) -+ return ret; -+ -+ ret = led_classdev_register(&pdev->dev, &e680_green_led); -+ if (ret < 0) -+ led_classdev_unregister(&e680_red_led); -+ -+ ret = led_classdev_register(&pdev->dev, &e680_blue_led); -+ if (ret < 0) { -+ led_classdev_unregister(&e680_red_led); -+ led_classdev_unregister(&e680_green_led); -+ } -+ -+ ret = led_classdev_register(&pdev->dev, &e680_keypad_led); -+ if (ret < 0) { -+ led_classdev_unregister(&e680_red_led); -+ led_classdev_unregister(&e680_green_led); -+ led_classdev_unregister(&e680_blue_led); -+ } -+ return ret; -+} -+ -+static int e680led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&e680_red_led); -+ led_classdev_unregister(&e680_green_led); -+ led_classdev_unregister(&e680_blue_led); -+ led_classdev_unregister(&e680_keypad_led); -+ return 0; -+} -+ -+static struct platform_driver e680led_driver = { -+ .probe = e680led_probe, -+ .remove = e680led_remove, -+#ifdef CONFIG_PM -+ .suspend = e680led_suspend, -+ .resume = e680led_resume, -+#endif -+ .driver = { -+ .name = "e680-led", -+ }, -+}; -+ -+static int __init e680led_init(void) -+{ -+ return platform_driver_register(&e680led_driver); -+} -+ -+static void __exit e680led_exit(void) -+{ -+ e680led_led_set( 0, 0, 0 ); -+ platform_driver_unregister(&e680led_driver); -+} -+ -+module_init(e680led_init); -+module_exit(e680led_exit); -+ -+MODULE_AUTHOR("Michael Lauer "); -+MODULE_DESCRIPTION("Motorola E680 LED driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/ezx-backlight-r0.patch b/packages/linux/linux-ezx/ezx-backlight-r0.patch deleted file mode 100644 index db917300c2..0000000000 --- a/packages/linux/linux-ezx/ezx-backlight-r0.patch +++ /dev/null @@ -1,212 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~ezx-backlight-r0.patch 2006-06-07 16:00:29.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-07 16:21:09.000000000 +0200 -@@ -344,17 +344,12 @@ - .pxafb_lcd_power = &pxafb_lcd_power, - }; - -- --/* backlight for lcd */ -- --static struct resource ezx_backlight_resources[] = { --}; -- --static struct platform_device ezx_backlight_device = { -- .name = "ezx-lcd-backlight", -+/* -+ * EZX LCD Backlight -+ */ -+static struct platform_device ezxbacklight_device = { -+ .name = "ezx-bl", - .id = -1, -- .resource = ezx_backlight_resources, -- .num_resources = ARRAY_SIZE(ezx_backlight_resources), - }; - - #ifdef CONFIG_PXA_EZX_E680 -@@ -786,6 +781,7 @@ - - static struct platform_device *devices[] __initdata = { - &ezx_bp_device, -+ &ezxbacklight_device, - #ifdef CONFIG_PXA_EZX_E680 - &e680led_device, - #endif ---- linux-2.6.16/drivers/video/backlight/Kconfig~ezx-backlight-r0.patch 2006-06-07 16:00:28.000000000 +0200 -+++ linux-2.6.16/drivers/video/backlight/Kconfig 2006-06-07 16:00:30.000000000 +0200 -@@ -58,3 +58,12 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config BACKLIGHT_EZX -+ tristate "Motorola EXZ Backlight Driver (A780/E680/E680i)" -+ depends on BACKLIGHT_DEVICE && PXA_EZX -+ default y -+ help -+ If you have a Motorola A780 or E680(i), say y to enable the -+ backlight driver. -+ -+ ---- linux-2.6.16/drivers/video/backlight/Makefile~ezx-backlight-r0.patch 2006-03-20 06:53:29.000000000 +0100 -+++ linux-2.6.16/drivers/video/backlight/Makefile 2006-06-07 16:00:30.000000000 +0200 -@@ -5,3 +5,5 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_SHARP_LOCOMO) += locomolcd.o -+obj-$(CONFIG_BACKLIGHT_EZX) += ezx_bl.o -+ ---- /dev/null 2006-06-07 15:54:31.503752232 +0200 -+++ linux-2.6.16/drivers/video/backlight/ezx_bl.c 2006-06-07 16:51:14.000000000 +0200 -@@ -0,0 +1,148 @@ -+/* -+ * Backlight Driver for Motorola A780 and E680(i) GSM Phones. -+ * -+ * Copyright 2006 Vanille Media -+ * -+ * Author: Michael Lauer -+ * -+ * 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 -+#include -+#include -+ -+#include -+#include -+ -+#define EZX_MAX_INTENSITY 50 -+#define EZX_DEFAULT_INTENSITY 25 -+ -+static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED; -+static struct backlight_properties ezxbl_data; -+static struct backlight_device *ezx_backlight_device; -+static int current_intensity; -+ -+static int ezx_send_intensity(struct backlight_device *bd) -+{ -+ unsigned long flags; -+ int intensity = bd->props->brightness; -+ -+ printk( KERN_DEBUG "ezx_set_intensity to %d", intensity ); -+ -+ if (bd->props->power != FB_BLANK_UNBLANK) -+ intensity = 0; -+ if (bd->props->fb_blank != FB_BLANK_UNBLANK) -+ intensity = 0; -+ -+ spin_lock_irqsave(&bl_lock, flags); -+ -+ PWM_CTRL0 = 2; /* pre-scaler */ -+ PWM_PWDUTY0 = intensity; /* duty cycle */ -+ PWM_PERVAL0 = 49; /* period */ -+ -+ if (intensity) { -+ //pxa_set_cken(CKEN0_PWM0, 1); -+ //FIXME: Set PWM0 GPIO as output -+ } else { -+ //pxa_set_cken(CKEN0_PWM0, 0); -+ //FIXME: Set PWM0 GPIO as input -+ } -+ -+ spin_unlock_irqrestore(&bl_lock, flags); -+ current_intensity = intensity; -+ return 0; -+} -+ -+static int ezx_get_intensity(struct backlight_device *bd) -+{ -+ return current_intensity; -+} -+ -+static int ezx_set_intensity(struct backlight_device *bd) -+{ -+ return ezx_send_intensity(ezx_backlight_device); -+} -+ -+#ifdef CONFIG_PM -+static int ezx_bl_suspend(struct platform_device *pdev, pm_message_t state) -+{ -+ //set suspend flag -+ ezx_set_intensity(ezx_backlight_device); -+ return 0; -+} -+ -+static int ezx_bl_resume(struct platform_device *pdev) -+{ -+ // set resume flag -+ ezx_set_intensity(ezx_backlight_device); -+ return 0; -+} -+#else -+#define ezx_bl_suspend NULL -+#define ezx_bl_resume NULL -+#endif -+ -+static struct backlight_properties ezx_bl_data = { -+ .owner = THIS_MODULE, -+ .get_brightness = ezx_get_intensity, -+ .max_brightness = EZX_MAX_INTENSITY, -+ .update_status = ezx_set_intensity, -+}; -+ -+static int __init ezx_bl_probe(struct platform_device *pdev) -+{ -+ ezx_backlight_device = backlight_device_register ("ezx-bl", -+ NULL, &ezx_bl_data); -+ if (IS_ERR (ezx_backlight_device)) -+ return PTR_ERR (ezx_backlight_device); -+ -+ //ezx_bl_data.requested_brightness = EZX_DEFAULT_INTENSITY; -+ //ezx_bl_data.requested_power = FB_BLANK_UNBLANK; -+ //ezx_set_intensity(ezx_backlight_device, ezx_bl_data.requested_brightness); -+ -+ printk("EZX Backlight Driver Initialized.\n"); -+ return 0; -+} -+ -+static int ezx_bl_remove(struct platform_device *pdev) -+{ -+ backlight_device_unregister(ezx_backlight_device); -+ -+ printk("EZX Backlight Driver Unloaded.\n"); -+ return 0; -+} -+ -+static struct platform_driver ezx_bl_driver = { -+ .probe = ezx_bl_probe, -+ .remove = ezx_bl_remove, -+ .suspend = ezx_bl_suspend, -+ .resume = ezx_bl_resume, -+ .driver = { -+ .name = "ezx-bl", -+ }, -+}; -+ -+static int __init ezx_bl_init(void) -+{ -+ return platform_driver_register(&ezx_bl_driver); -+} -+ -+static void __exit ezx_bl_exit(void) -+{ -+ platform_driver_unregister(&ezx_bl_driver); -+} -+ -+module_init(ezx_bl_init); -+module_exit(ezx_bl_exit); -+ -+MODULE_AUTHOR("Michael Lauer "); -+MODULE_DESCRIPTION("Backlight Driver for Motorola A780|E680(i)"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/ezx-backlight-r1.patch b/packages/linux/linux-ezx/ezx-backlight-r1.patch deleted file mode 100644 index a277f19344..0000000000 --- a/packages/linux/linux-ezx/ezx-backlight-r1.patch +++ /dev/null @@ -1,277 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/arch/arm/mach-pxa/ezx.c~ezx-backlight-r1.patch 2006-06-08 19:33:36.000000000 +0200 -+++ linux-2.6.16/arch/arm/mach-pxa/ezx.c 2006-06-08 19:33:37.000000000 +0200 -@@ -274,34 +274,9 @@ - .udc_command = ezx_udc_command, - }; - --/* pxafb */ -- --#define BKLIGHT_PRESCALE 2 --#define BKLIGHT_PERIOD 49 --#define DEFAULT_DUTYCYCLE 25 --#define MAX_DUTYCYCLE (BKLIGHT_PERIOD+1) --#define MIN_DUTYCYCLE 0 -- --static void pxafb_backlight_power(int on) --{ -- if (on) { -- CKEN |= CKEN0_PWM0; -- PWM_CTRL0 = BKLIGHT_PRESCALE; -- PWM_PERVAL0 = BKLIGHT_PERIOD; -- PWM_PWDUTY0 = DEFAULT_DUTYCYCLE; -- -- GPDR0 |= 0x00010000; //PWM0 is GPIO16 -- pxa_gpio_mode(GPIO16_PWM0_MD); -- } else { -- PWM_PWDUTY0 = 0; -- GAFR0_U &= 0xfffffffc; -- GPDR0 &= 0xfffeffff; /* set gpio16 (pwm0) as input */ -- CKEN &= ~CKEN0_PWM0; -- PWM_PWDUTY0 = MIN_DUTYCYCLE; -- } --} -- --//#define mdelay(x) udelay((x)*1000) -+/* -+ * EZX PXA Framebuffer -+ */ - - static void pxafb_lcd_power(int on) - { -@@ -326,35 +301,24 @@ - .xres = 240, - .yres = 320, - .bpp = 16, -- - .hsync_len = 10, - .left_margin = 20, - .right_margin = 10, -- - .vsync_len = 2, - .upper_margin = 3, - .lower_margin = 2, -- - .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, -- - .lccr0 = 0x002008F8, - .lccr3 = 0x0430FF09, -- -- .pxafb_backlight_power = &pxafb_backlight_power, -- .pxafb_lcd_power = &pxafb_lcd_power, --}; -- -- --/* backlight for lcd */ -- --static struct resource ezx_backlight_resources[] = { -+ .pxafb_lcd_power= &pxafb_lcd_power, - }; - --static struct platform_device ezx_backlight_device = { -- .name = "ezx-lcd-backlight", -+/* -+ * EZX LCD Backlight -+ */ -+static struct platform_device ezxbacklight_device = { -+ .name = "ezx-bl", - .id = -1, -- .resource = ezx_backlight_resources, -- .num_resources = ARRAY_SIZE(ezx_backlight_resources), - }; - - #ifdef CONFIG_PXA_EZX_E680 -@@ -786,6 +750,7 @@ - - static struct platform_device *devices[] __initdata = { - &ezx_bp_device, -+ &ezxbacklight_device, - #ifdef CONFIG_PXA_EZX_E680 - &e680led_device, - #endif ---- linux-2.6.16/drivers/video/backlight/Kconfig~ezx-backlight-r1.patch 2006-06-08 19:33:34.000000000 +0200 -+++ linux-2.6.16/drivers/video/backlight/Kconfig 2006-06-08 19:33:37.000000000 +0200 -@@ -58,3 +58,12 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config BACKLIGHT_EZX -+ tristate "Motorola EXZ Backlight Driver (A780/E680/E680i)" -+ depends on BACKLIGHT_DEVICE && PXA_EZX -+ default y -+ help -+ If you have a Motorola A780 or E680(i), say y to enable the -+ backlight driver. -+ -+ ---- linux-2.6.16/drivers/video/backlight/Makefile~ezx-backlight-r1.patch 2006-03-20 06:53:29.000000000 +0100 -+++ linux-2.6.16/drivers/video/backlight/Makefile 2006-06-08 19:33:37.000000000 +0200 -@@ -5,3 +5,5 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_SHARP_LOCOMO) += locomolcd.o -+obj-$(CONFIG_BACKLIGHT_EZX) += ezx_bl.o -+ ---- /dev/null 2006-06-08 19:04:31.354926880 +0200 -+++ linux-2.6.16/drivers/video/backlight/ezx_bl.c 2006-06-08 20:52:33.000000000 +0200 -@@ -0,0 +1,156 @@ -+/* -+ * Backlight Driver for Motorola A780 and E680(i) GSM Phones. -+ * -+ * Copyright 2006 Vanille Media -+ * -+ * Author: Michael Lauer -+ * -+ * 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 -+#include -+#include -+ -+#include -+#include -+ -+#define EZX_MIN_INTENSITY 00 -+#define EZX_MAX_INTENSITY 50 -+#define EZX_DEFAULT_INTENSITY 25 -+ -+static spinlock_t bl_lock = SPIN_LOCK_UNLOCKED; -+static struct backlight_device *ezx_backlight_device; -+static int last_intensity; -+ -+static int ezxbl_send_intensity(struct backlight_device *bd) -+{ -+ unsigned long flags; -+ int intensity = bd->props->brightness; -+ -+ printk( KERN_DEBUG "ezx_set_intensity to %d\n", intensity ); -+ -+ if (bd->props->power != FB_BLANK_UNBLANK) -+ intensity = 0; -+ if (bd->props->fb_blank != FB_BLANK_UNBLANK) -+ intensity = 0; -+ -+ spin_lock_irqsave(&bl_lock, flags); -+ -+ printk( KERN_DEBUG "backlight last intensity was %d, new intensity is %d\n", last_intensity, intensity ); -+ -+ if ( !last_intensity && intensity ) { -+ printk( KERN_DEBUG "backlight power ON\n" ); -+ PWM_CTRL0 = 2; /* pre-scaler */ -+ PWM_PWDUTY0 = intensity; /* duty cycle */ -+ PWM_PERVAL0 = 49; /* period */ -+ pxa_gpio_mode(GPIO16_PWM0_MD); /* set GPIO16 as alternate function + output */ -+ pxa_set_cken(CKEN0_PWM0, 1); /* clock enable */ -+ } -+ else if ( last_intensity && !intensity ) { -+ printk( KERN_DEBUG "backlight power OFF\n" ); -+ PWM_PWDUTY0 = 0; -+ GAFR0_U &= 0xFFFFFFFC; /* ??? */ -+ pxa_set_cken(CKEN0_PWM0, 0); /* clock disable */ -+ pxa_gpio_mode(GPIO16_PWM0); /* set GPIO16 as input */ -+ } else if ( last_intensity && intensity ) { -+ printk( KERN_DEBUG "backlight adjusting duty cycle\n" ); -+ PWM_PWDUTY0 = intensity; /* duty cycle */ -+ } -+ spin_unlock_irqrestore(&bl_lock, flags); -+ last_intensity = intensity; -+ return 0; -+} -+ -+static int ezxbl_get_intensity(struct backlight_device *bd) -+{ -+ return last_intensity; -+} -+ -+static int ezxbl_set_intensity(struct backlight_device *bd) -+{ -+ return ezxbl_send_intensity(ezx_backlight_device); -+} -+ -+#ifdef CONFIG_PM -+static int ezxbl_suspend(struct platform_device *pdev, pm_message_t state) -+{ -+ //set suspend flag -+ ezxbl_set_intensity(ezx_backlight_device); -+ return 0; -+} -+ -+static int ezxbl_resume(struct platform_device *pdev) -+{ -+ // set resume flag -+ ezxbl_set_intensity(ezx_backlight_device); -+ return 0; -+} -+#else -+#define ezxbl_suspend NULL -+#define ezxbl_resume NULL -+#endif -+ -+static struct backlight_properties ezxbl_data = { -+ .owner = THIS_MODULE, -+ .get_brightness = ezxbl_get_intensity, -+ .max_brightness = EZX_MAX_INTENSITY, -+ .update_status = ezxbl_set_intensity, -+}; -+ -+static int __init ezxbl_probe(struct platform_device *pdev) -+{ -+ ezx_backlight_device = backlight_device_register ("ezx-bl", -+ NULL, &ezxbl_data); -+ if (IS_ERR (ezx_backlight_device)) -+ return PTR_ERR (ezx_backlight_device); -+ -+ ezxbl_data.power = FB_BLANK_UNBLANK; -+ ezxbl_data.brightness = EZX_DEFAULT_INTENSITY; -+ ezxbl_set_intensity(ezx_backlight_device); -+ -+ printk("EZX Backlight Driver Initialized.\n"); -+ return 0; -+} -+ -+static int ezxbl_remove(struct platform_device *pdev) -+{ -+ backlight_device_unregister(ezx_backlight_device); -+ -+ printk("EZX Backlight Driver Unloaded.\n"); -+ return 0; -+} -+ -+static struct platform_driver ezxbl_driver = { -+ .probe = ezxbl_probe, -+ .remove = ezxbl_remove, -+ .suspend = ezxbl_suspend, -+ .resume = ezxbl_resume, -+ .driver = { -+ .name = "ezx-bl", -+ }, -+}; -+ -+static int __init ezxbl_init(void) -+{ -+ return platform_driver_register(&ezxbl_driver); -+} -+ -+static void __exit ezxbl_exit(void) -+{ -+ platform_driver_unregister(&ezxbl_driver); -+} -+ -+module_init(ezxbl_init); -+module_exit(ezxbl_exit); -+ -+MODULE_AUTHOR("Michael Lauer "); -+MODULE_DESCRIPTION("Backlight Driver for Motorola A780|E680(i)"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch b/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch deleted file mode 100644 index 1dedb981bd..0000000000 --- a/packages/linux/linux-ezx/pxakbd-fix-directkeys.patch +++ /dev/null @@ -1,83 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/drivers/input/keyboard/pxakbd.c~pxakbd-fix-directkeys.patch 2006-06-11 00:47:25.000000000 +0200 -+++ linux-2.6.16/drivers/input/keyboard/pxakbd.c 2006-06-12 16:10:03.000000000 +0200 -@@ -20,7 +20,7 @@ - #include - #include - --#if 0 -+#if 1 - #define DEBUGP(x, args ...) printk(x, ## args) - #else - #define DEBUGP(x, args ...) -@@ -44,8 +44,7 @@ - unsigned int i; - int num_pressed = 0; - -- kpdk = KPDK & 0x0000000f; -- -+ kpdk = KPDK & 0x000000ff; - for (i = 0; i < pxakbd->pd->direct.num; i++) { - int pressed = 0; - -@@ -54,11 +53,12 @@ - num_pressed++; - DEBUGP("pxakbd: pressed: direct %u\n", i); - } -- -- input_report_key(pxakbd->input, pxakbd->pd->direct.keycode[i], -- pressed); -+ if (pxakbd->pd->direct.keycode[i] != KEY_RESERVED) { -+ DEBUGP( "pxakbd: sending to input layer: keycode = %d, pressed = %d\n", pxakbd->pd->direct.keycode[i], pressed ); -+ input_report_key(pxakbd->input, pxakbd->pd->direct.keycode[i], -+ pressed); -+ } - } -- - return num_pressed; - } - -@@ -248,16 +248,6 @@ - set_bit(pxakbd->pd->matrix.keycode[i], input_dev->keybit); - clear_bit(0, input_dev->keybit); - --#if 0 -- input_dev2->evbit[0] = ; -- input_dev2->keycode = pxakbd->pd->direct.keycode; -- input_dev2->keycodesize = sizeof(unsigned char); -- input_dev2->keycodemax = pxakbd->pd->direct.num; -- -- for (i = 0; i < input_dev2->keycodemax; i++) -- set_bit(ezxkbd->keycode[i], input_dev2->keybit); --#endif -- - if (request_irq(pxakbd->irq, pxakbd_interrupt, 0, "pxakbd", pxakbd)) { - printk(KERN_ERR "pxakbd: can't request irq %d\n", pxakbd->irq); - ret = -EBUSY; -@@ -279,6 +269,7 @@ - KPC_ME | KPC_DE | /* matrix and direct keypad enabled */ - ((pxakbd->pd->matrix.cols-1)<<23) | /* columns */ - ((pxakbd->pd->matrix.rows-1)<<26) | /* rows */ -+ ((pxakbd->pd->direct.num-1)<<6) | /* direct keys */ - KPC_MS_ALL); /* scan all columns */ - - pxa_set_cken(CKEN19_KEYPAD, 1); -@@ -375,13 +366,11 @@ - static int pxakbd_remove(struct platform_device *pdev) - { - struct pxakbd *pxakbd = platform_get_drvdata(pdev); -- -+ input_unregister_device(pxakbd->input); - platform_set_drvdata(pdev, NULL); - release_resource(pxakbd->res); - free_irq(pxakbd->irq, pxakbd); -- input_unregister_device(pxakbd->input); - kfree(pxakbd); -- - return 0; - } - diff --git a/packages/linux/linux-ezx/touchscreen-fix-r0.patch b/packages/linux/linux-ezx/touchscreen-fix-r0.patch deleted file mode 100644 index 7d19a887fc..0000000000 --- a/packages/linux/linux-ezx/touchscreen-fix-r0.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.6.16/drivers/input/touchscreen/pcap_ts.c~touchscreen-fix-r0 2006-05-30 23:18:22.000000000 +0200 -+++ linux-2.6.16/drivers/input/touchscreen/pcap_ts.c 2006-05-30 23:29:34.000000000 +0200 -@@ -126,10 +126,7 @@ - if (ret < 0) - return ret; - -- if (tmp & 0x00400000) -- return -EIO; -- -- if (pcap_ts->read_state == COORDINATE) { -+ if (pcap_ts->read_state == COORDINATE && !(tmp & 0x00400000)) { - pcap_ts->x = (tmp & SSP_PCAP_ADD1_VALUE_MASK); - pcap_ts->y = (tmp & SSP_PCAP_ADD2_VALUE_MASK) - >>SSP_PCAP_ADD2_VALUE_SHIFT; -- cgit v1.2.3 From d8dcbab026f5258012dbe27bbe4f9d4b41df3762 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Aug 2006 09:18:44 +0000 Subject: imagemagick: add 6.2.9, closes #336 --- packages/imagemagick/.mtn2git_empty | 0 packages/imagemagick/files/.mtn2git_empty | 0 packages/imagemagick/files/PerlMagic_MakePatch | 13 +++++++++++++ packages/imagemagick/imagemagick_6.2.9.bb | 21 +++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 packages/imagemagick/.mtn2git_empty create mode 100644 packages/imagemagick/files/.mtn2git_empty create mode 100644 packages/imagemagick/files/PerlMagic_MakePatch create mode 100644 packages/imagemagick/imagemagick_6.2.9.bb (limited to 'packages') diff --git a/packages/imagemagick/.mtn2git_empty b/packages/imagemagick/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/imagemagick/files/.mtn2git_empty b/packages/imagemagick/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/imagemagick/files/PerlMagic_MakePatch b/packages/imagemagick/files/PerlMagic_MakePatch new file mode 100644 index 0000000000..c87414529a --- /dev/null +++ b/packages/imagemagick/files/PerlMagic_MakePatch @@ -0,0 +1,13 @@ +Index: ImageMagick-6.2.5/PerlMagick/Makefile.PL.in +=================================================================== +--- ImageMagick-6.2.5.orig/PerlMagick/Makefile.PL.in 2005-04-21 00:27:36.000000000 +0800 ++++ ImageMagick-6.2.5/PerlMagick/Makefile.PL.in 2005-10-04 04:43:35.239036400 +0800 +@@ -72,6 +72,8 @@ + + # Use same compiler as ImageMagick + 'PERLMAINCC' => '@PERLMAINCC@', ++ 'AR' => '@AR@', ++ 'LD' => '@PERLMAINCC@', + + # Set Perl installation prefix to ImageMagick installation prefix + # 'PREFIX' => '@prefix@', diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb new file mode 100644 index 0000000000..cac16329c4 --- /dev/null +++ b/packages/imagemagick/imagemagick_6.2.9.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +SECTION = "console/utils" +DEPENDS = "tiff" +DESCRIPTION = "ImageMagick is an image convertion tools" + +SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \ + file://PerlMagic_MakePatch;patch=1" + +S = "${WORKDIR}/ImageMagick-${PV}" + +inherit autotools + +EXTRA_OECONF="-without-x " + +LEAD_SONAME="libMagick.so.*" + +FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ + ${libdir}/ImageMagick-${PV}/config/ \ + ${datadir}/ImageMagick-${PV}" + +FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*" -- cgit v1.2.3 From d7e75a4cf3d473ca5f611cf4a9e640ad44a1fcc5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 09:21:15 +0000 Subject: libgnomecanvas: fix -dbg packaging for 2.10.2 and 2.12.0 --- packages/gnome/libgnomecanvas_2.10.2.bb | 3 ++- packages/gnome/libgnomecanvas_2.12.0.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gnome/libgnomecanvas_2.10.2.bb b/packages/gnome/libgnomecanvas_2.10.2.bb index 36ee1aa67f..3c1b36ecd4 100644 --- a/packages/gnome/libgnomecanvas_2.10.2.bb +++ b/packages/gnome/libgnomecanvas_2.10.2.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r1" +PR = "r2" DESCRIPTION = "A powerful object-oriented display" inherit gnome @@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" EXTRA_OECONF = "--disable-gtk-doc" FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so" do_stage() { gnome_stage_includes diff --git a/packages/gnome/libgnomecanvas_2.12.0.bb b/packages/gnome/libgnomecanvas_2.12.0.bb index 36ee1aa67f..3c1b36ecd4 100644 --- a/packages/gnome/libgnomecanvas_2.12.0.bb +++ b/packages/gnome/libgnomecanvas_2.12.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r1" +PR = "r2" DESCRIPTION = "A powerful object-oriented display" inherit gnome @@ -9,6 +9,7 @@ DEPENDS = "gnome-vfs libbonobo libglade libart-lgpl" EXTRA_OECONF = "--disable-gtk-doc" FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" +FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/libcanvas.so" do_stage() { gnome_stage_includes -- cgit v1.2.3 From 6daed4e490d91d87965db48cc288edca914ce47c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 10:51:26 +0000 Subject: libbonoboui-2.10.0: fix -dbg packaging --- packages/gnome/libbonoboui_2.10.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gnome/libbonoboui_2.10.0.bb b/packages/gnome/libbonoboui_2.10.0.bb index 719fe2395a..3a41ef731d 100644 --- a/packages/gnome/libbonoboui_2.10.0.bb +++ b/packages/gnome/libbonoboui_2.10.0.bb @@ -1,12 +1,13 @@ LICENSE = "GPL" SECTION = "x11/gnome/libs" -PR = "r1" +PR = "r2" inherit gnome pkgconfig FILES_${PN} += "${libdir}/libglade/2.0/*.so" FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \ ${libdir}/bonobo-2.0/samples" +FILES_${PN}-dbg += "${libdir}/libglade/2.0/.debug/*.so" DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" -- cgit v1.2.3 From f4860e4639923a4f88c48bc138cce089ae5dbf60 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 29 Aug 2006 11:40:58 +0000 Subject: python 2.4.3 add PACKAGES_DYNAMIC -- close #1366 --- packages/python/python_2.4.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 4fe3ebd402..30c4ee1aee 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml4" +PR = "ml5" PYTHON_MAJMIN = "2.4" @@ -68,4 +68,5 @@ require python-${PV}-manifest.inc RPROVIDES_python-core = "python" RPROVIDES_python-curses = "python" PACKAGES =+ "libpython2" +PACKAGES_DYNAMIC = "python-* libpython2" FILES_libpython2 = "${libdir}/libpython*" -- cgit v1.2.3 From 1bfeca965f47b63f59f09785e1a43cbbc76095b2 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 29 Aug 2006 12:36:57 +0000 Subject: linux-omap1_2.6.x+git.bb: Clean up file, eliminate unecessary operations. --- packages/linux/linux-omap1_2.6.x+git.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb index 9e499c7687..7a5ff66af2 100644 --- a/packages/linux/linux-omap1_2.6.x+git.bb +++ b/packages/linux/linux-omap1_2.6.x+git.bb @@ -9,24 +9,19 @@ S = "${WORKDIR}/git" KERNEL_IMAGETYPE = "vmlinux" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" -#KERNEL_CCSUFFIX = "-4.1.1" DEPENDS = "u-boot" inherit kernel -# GIT does not have the UTS_RELEASE in version.h used to find the kernel version -KERNEL_RELEASE = "2.6.17" - COMPATIBLE_HOST = 'arm.*-linux' do_configure_prepend() { if [ "${MACHINE}" == "omap5912osk" ] ; then - make omap_osk_5912_defconfig + oe_runmake omap_osk_5912_defconfig fi - - oe_runmake oldconfig -} + +} do_deploy() { if [ "${MACHINE}" == "omap5912osk" ]; then -- cgit v1.2.3 From 9a45407127c761f0740f0c26a5995ee99e09a42f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 29 Aug 2006 13:48:11 +0000 Subject: uboot cvs fix SRC_URI --- packages/uboot/uboot_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb index 5ff012555e..0174fc0560 100644 --- a/packages/uboot/uboot_cvs.bb +++ b/packages/uboot/uboot_cvs.bb @@ -10,7 +10,7 @@ PROVIDES = "virtual/bootloader" S = "${WORKDIR}/u-boot" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ +SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ file://arm_flags.patch;patch=1" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -- cgit v1.2.3 From 7c31c551449c21c4b45302fd2ade5f75b484d3dc Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 29 Aug 2006 16:06:41 +0000 Subject: omniorb-native_4.0.7.bb, omniorb_4.0.7.bb, long_double.patch : * Add bb files for omniorb-4.0.7 * Patch long_double.patch allows compilation when sizeof(long double) * is something other than 12 or 16. --- packages/omniorb/files/long_double.patch | 19 ++++++++++++++++ packages/omniorb/omniorb-native_4.0.7.bb | 21 ++++++++++++++++++ packages/omniorb/omniorb_4.0.7.bb | 37 ++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 packages/omniorb/files/long_double.patch create mode 100644 packages/omniorb/omniorb-native_4.0.7.bb create mode 100644 packages/omniorb/omniorb_4.0.7.bb (limited to 'packages') diff --git a/packages/omniorb/files/long_double.patch b/packages/omniorb/files/long_double.patch new file mode 100644 index 0000000000..a34ff9807e --- /dev/null +++ b/packages/omniorb/files/long_double.patch @@ -0,0 +1,19 @@ +*** omniORB-4.0.7.old/include/omniORB4/CORBA_sysdep_auto.h 2004-10-17 16:14:28.000000000 -0400 +--- omniORB-4.0.7/include/omniORB4/CORBA_sysdep_auto.h 2006-08-29 11:29:08.000000000 -0400 +*************** +*** 85,91 **** + #endif + + +! #if defined(SIZEOF_LONG_DOUBLE) && (SIZEOF_LONG_DOUBLE == 16) + # define HAS_LongDouble + # define _CORBA_LONGDOUBLE_DECL long double + #endif +--- 85,91 ---- + #endif + + +! #if defined(SIZEOF_LONG_DOUBLE) + # define HAS_LongDouble + # define _CORBA_LONGDOUBLE_DECL long double + #endif diff --git a/packages/omniorb/omniorb-native_4.0.7.bb b/packages/omniorb/omniorb-native_4.0.7.bb new file mode 100644 index 0000000000..f9addd997d --- /dev/null +++ b/packages/omniorb/omniorb-native_4.0.7.bb @@ -0,0 +1,21 @@ +PR = "r0" +SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz" +SECTION = "devel" +S = "${WORKDIR}/omniORB-${PV}" + +DEPENDS += python-native + +inherit native autotools + +do_compile () { + oe_runmake +} + + +#do_stage() { +# install -m 0755 src/bison ${STAGING_BINDIR}/ +# ln -sf ./bison ${STAGING_BINDIR}/yacc +# install -d ${STAGING_BINDIR}/../share/bison/m4sugar +# install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_BINDIR}/../share/bison/ +# install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_BINDIR}/../share/bison/m4sugar/ +#} diff --git a/packages/omniorb/omniorb_4.0.7.bb b/packages/omniorb/omniorb_4.0.7.bb new file mode 100644 index 0000000000..0ef6bdac03 --- /dev/null +++ b/packages/omniorb/omniorb_4.0.7.bb @@ -0,0 +1,37 @@ +PR = "r0" +DESCRIPTION = "OmniORB High Performance ORB" +SECTION = "devel" +PRIORITY = "optional" +MAINTAINER = "Philip Balister " +LICENSE = "LGPL" + +DEPENDS = omniorb-native + +SRC_URI = "${SOURCEFORGE_MIRROR}/omniorb/omniORB-${PV}.tar.gz \ +file://omniORB-cross.patch;patch=1 \ +file://omniORB_embedded_appl.patch;patch=1" \ +file://long_double.patch;patch=1" + +S = "${WORKDIR}/omniORB-${PV}" + +inherit autotools pkgconfig + +#do_configure () { +# oe_runconf +#} + +do_compile () { + export EmbeddedSystem=1 + export TOOLBINDIR=${STAGING_BINDIR} + oe_runmake +} + +do_stage () { + export EmbeddedSystem=1 + make DESTDIR=${STAGING_DIR}/${TARGET_SYS} install +} + +do_install () { + export EmbeddedSystem=1 + make DESTDIR=${D} install +} -- cgit v1.2.3 From 1ca3ed533e848c27025769e7d311bf2892730490 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 16:09:16 +0000 Subject: dbus-glib-native-0.71: fix bogus DEPENDS --- packages/dbus/dbus-glib-native_0.71.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/dbus/dbus-glib-native_0.71.bb b/packages/dbus/dbus-glib-native_0.71.bb index 200a7133b2..1f5d71da91 100644 --- a/packages/dbus/dbus-glib-native_0.71.bb +++ b/packages/dbus/dbus-glib-native_0.71.bb @@ -3,7 +3,6 @@ PR = "r0" HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" -DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ file://cross.patch;patch=1 \ @@ -13,7 +12,7 @@ inherit autotools pkgconfig gettext native S = "${WORKDIR}/dbus-glib-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib" -DEPENDS = "glib-2.0-native" +DEPENDS = "glib-2.0-native dbus-native" do_stage() { oe_runmake install -- cgit v1.2.3 From fa3571e0a22f896c6153949b74d3220af2d7abf8 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 18:29:35 +0000 Subject: xserver-kdrive-git: apply the xcalibrate patch from X11R7.1 --- packages/xorg-xserver/xserver-kdrive_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index aa5784e1c7..33e15bab86 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,7 +1,7 @@ PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r1" +PR = "r2" LICENSE = "MIT" DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" @@ -35,7 +35,8 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ # file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.patch;patch=1" + file://enable-tslib.patch;patch=1 \ + file://xcalibrate.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" -- cgit v1.2.3 From 806294f16a8f9ee061cfd99adeb2087f3538c998 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Aug 2006 19:56:56 +0000 Subject: bluez-libs, bluez-utils: add 3.4 --- packages/bluez/bluez-libs_3.4.bb | 22 ++++++++++++++++ packages/bluez/bluez-utils_3.4.bb | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 packages/bluez/bluez-libs_3.4.bb create mode 100644 packages/bluez/bluez-utils_3.4.bb (limited to 'packages') diff --git a/packages/bluez/bluez-libs_3.4.bb b/packages/bluez/bluez-libs_3.4.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_3.4.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb new file mode 100644 index 0000000000..3b8702e997 --- /dev/null +++ b/packages/bluez/bluez-utils_3.4.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + file://hciattach-ti-bts.patch;patch=1" + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" -- cgit v1.2.3 From a350439c9ae71b8d437730e8659a9f5561d0b0d5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 29 Aug 2006 21:34:04 +0000 Subject: xserver-kdrive git: remove tslib and xcalibrate patches that have been applied upstream (yay!) and enable tslib in EXTRA_OECONF --- packages/xorg-xserver/xserver-kdrive_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 33e15bab86..bf6fd92d61 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,7 +1,7 @@ PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r2" +PR = "r3" LICENSE = "MIT" DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" @@ -35,8 +35,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ # file://disable-xf86-dga-xorgcfg.patch;patch=1 \ - file://enable-tslib.patch;patch=1 \ - file://xcalibrate.patch;patch=1" + " SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" @@ -54,4 +53,5 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xevie --disable-xprint --disable-xtrap \ --disable-dmx \ --with-default-font-path=built-ins \ + --enable-tslib \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 41a995084316c3f0092a85a9047751ffb82b02bc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 07:37:32 +0000 Subject: calibrateproto: add git version --- packages/xorg-proto/calibrateproto_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/xorg-proto/calibrateproto_git.bb (limited to 'packages') diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb new file mode 100644 index 0000000000..bad54301da --- /dev/null +++ b/packages/xorg-proto/calibrateproto_git.bb @@ -0,0 +1,7 @@ +require xorg-proto-common.inc + +DESCRIPTION = " Touchscreen calibration protocol" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" +S = "${WORKDIR}/git" + -- cgit v1.2.3 From 1f466c89c6c17f37c517bda099db12ab55daad6a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 07:42:33 +0000 Subject: calibrateproto: add a PV --- packages/xorg-proto/calibrateproto_git.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb index bad54301da..964380d943 100644 --- a/packages/xorg-proto/calibrateproto_git.bb +++ b/packages/xorg-proto/calibrateproto_git.bb @@ -2,6 +2,8 @@ require xorg-proto-common.inc DESCRIPTION = " Touchscreen calibration protocol" +PV = "0.0+git${DATE}" + SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" S = "${WORKDIR}/git" -- cgit v1.2.3 From 342881986b13d73ee6489acf4e23afbf691deb3c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 07:43:30 +0000 Subject: libxcalibrate: add git version --- packages/xorg-lib/libxcalibrate_git.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/xorg-lib/libxcalibrate_git.bb (limited to 'packages') diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb new file mode 100644 index 0000000000..df23f22b11 --- /dev/null +++ b/packages/xorg-lib/libxcalibrate_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = " Touchscreen calibration client library" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "BSD-X" + +PV = "0.0+git${DATE}" + +DEPENDS = "virtual/libx11 calibrateproto libxext" + +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 86f8687c1632cb0f1b6da84589e8bc211f4b40ab Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 08:14:51 +0000 Subject: xserver-kdrive git: adjust for new calibrate stuff, package Xsdl, enable build of epson server --- packages/xorg-xserver/xserver-kdrive/enable-epson.patch | 11 +++++++++++ packages/xorg-xserver/xserver-kdrive_git.bb | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/enable-epson.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/enable-epson.patch b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch new file mode 100644 index 0000000000..63b13a4511 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/enable-epson.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2006-08-30 09:51:21.000000000 +0200 ++++ git/hw/kdrive/Makefile.am 2006-08-30 09:51:44.425780000 +0200 +@@ -4,7 +4,7 @@ + endif + + if KDRIVEFBDEV +-FBDEV_SUBDIRS = fbdev ++FBDEV_SUBDIRS = fbdev epson + endif + + if XSDLSERVER diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index bf6fd92d61..9c967db254 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -4,26 +4,32 @@ DEFAULT_PREFERENCE = "-2" PR = "r3" LICENSE = "MIT" -DEPENDS = "tslib libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version" FILES_${PN} += "${libdir}/xserver/SecurityPolicy" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-fake = "${bindir}/Xfake" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" RDEPENDS_xserver-kdrive-fbdev = "${PN}" RDEPENDS_xserver-kdrive-fake = "${PN}" RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://kmode.patch;patch=1 \ @@ -34,6 +40,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ # file://disable-xf86-dga-xorgcfg.patch;patch=1 \ " @@ -53,5 +60,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xevie --disable-xprint --disable-xtrap \ --disable-dmx \ --with-default-font-path=built-ins \ - --enable-tslib \ + --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" + + -- cgit v1.2.3 From 5fde101032ef0d864112eebf2731c559da00c335 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 30 Aug 2006 09:35:58 +0000 Subject: handhelds-pxa-2.6: Add defconfig for h4000. --- .../linux/handhelds-pxa-2.6/h4000/.mtn2git_empty | 0 packages/linux/handhelds-pxa-2.6/h4000/defconfig | 1343 ++++++++++++++++++++ 2 files changed, 1343 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty create mode 100644 packages/linux/handhelds-pxa-2.6/h4000/defconfig (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty b/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/handhelds-pxa-2.6/h4000/defconfig b/packages/linux/handhelds-pxa-2.6/h4000/defconfig new file mode 100644 index 0000000000..2bba0377eb --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6/h4000/defconfig @@ -0,0 +1,1343 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-hh2 +# Sat Jun 24 13:09:54 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +# CONFIG_MINIMAL_OOPS is not set +CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_USELIB=y +CONFIG_CORE_DUMP=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=m + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_KMOD is not set + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_ARCH_H3900 is not set +CONFIG_MACH_H4000=y +CONFIG_IPAQ_H4000_SERIAL=m +CONFIG_IPAQ_H4000_UDC=y +CONFIG_IPAQ_H4000_LCD=y +CONFIG_IPAQ_H4000_TS=y +CONFIG_IPAQ_H4000_PCMCIA=y +CONFIG_IPAQ_H4000_BUTTONS=y +CONFIG_IPAQ_H4000_BATT=y +CONFIG_IPAQ_H4300_KBD=m +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_MACH_X30 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA25x=y +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y + +# +# Compaq/iPAQ Platforms +# +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_SLEEVE is not set +# CONFIG_IPAQ_SAMCOP is not set +# CONFIG_IPAQ_HAMCOP is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +CONFIG_PCMCIA_DEBUG=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +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 is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +CONFIG_PM_DEBUG=y +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +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 is not set +# 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_TUNNEL is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_IPV6_TUNNEL is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_QUEUE is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +# CONFIG_VLAN_8021Q is not set +# 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_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=y +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +CONFIG_BT=y +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=3 +CONFIG_MTD_CONCAT=y +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=m +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=m +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +CONFIG_MTD_XIP=y + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_IPAQ is not set +# CONFIG_MTD_SHARP_SL is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_ACX=y +CONFIG_ACX_MEM=y +CONFIG_NET_WIRELESS=y + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELV is not set +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_SLAVE=y +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C 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 + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +CONFIG_SA1100_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_HTC_ASIC2 is not set +CONFIG_HTC_ASIC3=y +# CONFIG_SOC_TSC2101 is not set + +# +# Misc devices +# +CONFIG_BATTERY_MONITOR=y + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# 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 + +# +# ALSA ARM devices +# +# CONFIG_SND_A716 is not set +# CONFIG_SND_H1910 is not set +# CONFIG_SND_H2200 is not set +# CONFIG_SND_HTCMAGICIAN is not set +# CONFIG_SND_HX4700 is not set +# CONFIG_SND_H5XXX_AK4535 is not set +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# PCMCIA devices +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=y +# CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_G_CHAR is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +# CONFIG_MMC_PXA is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +CONFIG_MMC_ASIC3=y + +# +# LED devices +# +CONFIG_CLASS_LEDS=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS 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_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# 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_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=1 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=y +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +# 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=y +CONFIG_NLS_CODEPAGE_1251=y +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +# 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 + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=15 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_VM=y +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y -- cgit v1.2.3 From 3d7729be91fd12330e2163f4ec1cd4c756bdaaae Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 30 Aug 2006 09:43:43 +0000 Subject: handhelds-pxa-2.6_2.6.16-hh5: Recipe for the latest HH.org 2.6.16 tag. Based on handhelds-pxa-2.6_2.6.15-hh0.bb. --- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb new file mode 100644 index 0000000000..555ec411ee --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -0,0 +1,40 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +MAINTAINER = "Greg Gilbert " +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|h4000|ipaq-pxa270)' + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://ide_not_removable-r0.patch;patch=1 \ + file://block-pio.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From b0e7d9796b0affcd3bf49987f4965a527cb0e5a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 10:22:42 +0000 Subject: hh-pxa-2.6 2.6.16 hh5: unbreak do_configure for EABI, add proper COMPATIBLE_MACHINES and do a version check for good measure --- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 43 +++++++++++++++++++++----- 1 file changed, 35 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb index 555ec411ee..a5cc4073e4 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -1,33 +1,60 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." -MAINTAINER = "Greg Gilbert " LICENSE = "GPL" -DEFAULT_PREFERENCE = "-1" - COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h2200|h4000|ipaq-pxa270)' +COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://ide_not_removable-r0.patch;patch=1 \ - file://block-pio.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel26" inherit kernel +FILES_kernel-image_ipaq-pxa270 = "" +ALLOW_EMPTY_ipaq_pxa270 = 1 +FILES_kernel-image_htcuniversal = "" +ALLOW_EMPTY_htcuniversal = 1 + + + K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" + do_configure() { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." - yes '' | oe_runmake oldconfig + + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + + rm -f ${S}/.config + + if [ ! -e ${WORKDIR}/defconfig ]; then + die "No default configuration for ${MACHINE} available." + fi + + + if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig + } do_deploy() { -- cgit v1.2.3 From d3be917a564f3aee7ee7ad8e09e9edab7929867a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 11:15:50 +0000 Subject: horizon: add cvs version of this cool sketch toy * still has /media/mmc1/horizon hardcoded --- packages/horizon/.mtn2git_empty | 0 packages/horizon/files/.mtn2git_empty | 0 packages/horizon/files/makefile.patch | 34 ++++++++++++++++++++++++++++++++++ packages/horizon/horizon_cvs.bb | 27 +++++++++++++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 packages/horizon/.mtn2git_empty create mode 100644 packages/horizon/files/.mtn2git_empty create mode 100644 packages/horizon/files/makefile.patch create mode 100644 packages/horizon/horizon_cvs.bb (limited to 'packages') diff --git a/packages/horizon/.mtn2git_empty b/packages/horizon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/horizon/files/.mtn2git_empty b/packages/horizon/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/horizon/files/makefile.patch b/packages/horizon/files/makefile.patch new file mode 100644 index 0000000000..33f341ef08 --- /dev/null +++ b/packages/horizon/files/makefile.patch @@ -0,0 +1,34 @@ +--- /tmp/Makefile 2006-08-30 12:51:56.000000000 +0200 ++++ horizon/src/Makefile 2006-08-30 12:53:03.025780000 +0200 +@@ -2,12 +2,11 @@ + + all: .depend $(BINARY) + +-CFLAGS = -g -O2 -Wall -Werror \ +- -I/usr/X11R6/include \ ++HCFLAGS = -g -O2 -Wall -Werror \ + `sdl-config --cflags` \ + `pkg-config --cflags glib-2.0 gobject-2.0 libpng` \ + -I. +-LDFLAGS = -L/usr/X11R6/lib -lX11 \ ++HLDFLAGS = -lX11 \ + `sdl-config --libs` \ + `pkg-config --libs glib-2.0 gobject-2.0 libpng` \ + -ljpeg +@@ -16,7 +15,7 @@ + OBJS = $(CFILES:.c=.o) + + $(BINARY): $(OBJS) +- $(CC) *.o */*.o -o $@ $(LDFLAGS) ++ $(CC) *.o */*.o -o $@ $(LDFLAGS) $(HLDFLAGS) + + clean: + rm -f $(OBJS) $(BINARY) *.o *~ */*~ */*/*~ .depend +@@ -35,6 +34,6 @@ + ./$(BINARY) /tmp/horizon + + .depend: *.[ch] */*.[ch] +- $(CC) -M $(CFLAGS) */*.c *.c > .depend ++ $(CC) -M $(CFLAGS) $(HCFLAGS) */*.c *.c > .depend + + include .depend diff --git a/packages/horizon/horizon_cvs.bb b/packages/horizon/horizon_cvs.bb new file mode 100644 index 0000000000..d83fbf9868 --- /dev/null +++ b/packages/horizon/horizon_cvs.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Horizon is a sketchbook application for tablet devices." +LICENSE = "GPLv2" + +DEPENDS = "glib-2.0 libpng jpeg virtual/libsdl" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=horizon \ + file://makefile.patch;patch=1" + +inherit pkgconfig binconfig + +S = "${WORKDIR}/horizon" +PV = "0.37+cvs${SRCDATE}" + +PARALLEL_MAKE = "" + +CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL -I. -Isrc -L${STAGING_LIBDIR} `PKG_CONFIG_PATH=${STAGING_DATADIR}/pkgconfig pkg-config --cflags glib-2.0 gobject-2.0 libpng`" + +do_compile() { + #yes, this is a hack to work around a faulty makefile + oe_runmake horizon +} + +do_install() { + install -d ${D}${bindir} + install -m 755 horizon ${D}${bindir} +} + -- cgit v1.2.3 From 36b05076d6f41c4301454048929aa2c8b42718f7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 30 Aug 2006 13:22:23 +0000 Subject: linux-openzaurus: added patches from mikearthur to fix TS on tosa --- .../linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch | 157 ++++++++++++++++ .../wm97xx-lcdnoise-r0.patch | 208 +++++++++++++++++++++ packages/linux/linux-openzaurus_2.6.17.bb | 6 +- 3 files changed, 369 insertions(+), 2 deletions(-) create mode 100644 packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch create mode 100644 packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch (limited to 'packages') diff --git a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch b/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch new file mode 100644 index 0000000000..cb014fb8bc --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch @@ -0,0 +1,157 @@ +Index: linux-tosa/arch/arm/mach-pxa/tosa.c +=================================================================== +--- linux-tosa.orig/arch/arm/mach-pxa/tosa.c 2006-08-29 16:52:59.000000000 +0100 ++++ linux-tosa/arch/arm/mach-pxa/tosa.c 2006-08-29 16:55:25.959706776 +0100 +@@ -2,6 +2,7 @@ + * Support for Sharp SL-C6000x PDAs + * Model: (Tosa) + * ++ * Copyright (c) 2006 Wolfson Microelectronics PLC. + * Copyright (c) 2005 Dirk Opfer + * + * Based on code written by Sharp/Lineo for 2.4 kernels +@@ -46,6 +47,8 @@ + #include + #include + ++#include ++ + #include "generic.h" + + /* +@@ -428,6 +431,16 @@ + }, + }; + ++ ++/* ++ * Tosa Touchscreen device ++ */ ++ ++static struct wm97xx_machinfo tosa_ts_machinfo = { ++ .get_hsync_time = tosa_get_hsync_time, ++ .wait_hsync = tosa_wait_hsync, ++}; ++ + /* + * Tosa Blueooth + */ +@@ -457,6 +470,7 @@ + GPSR(TOSA_GPIO_ON_RESET) = GPIO_bit(TOSA_GPIO_ON_RESET); + + mdelay(1000); ++ wm97xx_unset_machinfo(); + } + + static void tosa_restart(void) +@@ -501,6 +515,8 @@ + platform_scoop_config = &tosa_pcmcia_config; + + platform_add_devices(devices, ARRAY_SIZE(devices)); ++ ++ wm97xx_set_machinfo(&tosa_ts_machinfo); + } + + static void __init fixup_tosa(struct machine_desc *desc, +Index: linux-tosa/arch/arm/mach-pxa/tosa_lcd.c +=================================================================== +--- linux-tosa.orig/arch/arm/mach-pxa/tosa_lcd.c 2006-08-29 16:52:59.000000000 +0100 ++++ linux-tosa/arch/arm/mach-pxa/tosa_lcd.c 2006-08-29 16:55:32.818664056 +0100 +@@ -1,6 +1,7 @@ + /* + * LCD / Backlight control code for Sharp SL-6000x (tosa) + * ++ * Copyright (c) 2006 Wolfson Microelectronics PLC. + * Copyright (c) 2005 Dirk Opfer + * + * This program is free software; you can redistribute it and/or modify +@@ -59,6 +60,8 @@ + static struct ssp_dev tosa_nssp_dev; + static struct ssp_state tosa_nssp_state; + static spinlock_t tosa_nssp_lock; ++static int blanked; ++static unsigned long hsync_time; + + static unsigned short normal_i2c[] = { + DAC_BASE, +@@ -130,6 +133,17 @@ + pxa_nssp_output(TG_GPOSR,0x02); /* GPOS0=powercontrol, GPOS1=GPIO, GPOS2=TCTL */ + } + ++static unsigned long calc_hsync_time(const struct fb_videomode *mode) { ++ /* The 25 and 44 'magic numbers' are from Sharp's 2.4 patches */ ++ if (mode->yres == 640) { ++ return 25; ++ } ++ if (mode->yres == 320) { ++ return 44; ++ } ++ return 0; ++} ++ + static void tosa_lcd_tg_on(struct device *dev, const struct fb_videomode *mode) + { + const int value = TG_REG0_COLOR | TG_REG0_UD | TG_REG0_LR; +@@ -154,6 +168,8 @@ + /* set common voltage */ + i2c_smbus_write_byte_data(tosa_i2c_dac, DAC_CH1, comadj); + ++ blanked = 0; ++ hsync_time = calc_hsync_time(mode); + } + + static void tosa_lcd_tg_off(struct device *dev) +@@ -172,6 +188,8 @@ + + /* L3V Off */ + reset_scoop_gpio( &tosascoop_jc_device.dev,TOSA_SCOOP_JC_TC3693_L3V_ON); ++ ++ blanked = 1; + } + + static int tosa_detect_client(struct i2c_adapter* adapter, int address, int kind) { +@@ -238,6 +256,23 @@ + return 0; + } + ++unsigned long tosa_get_hsync_time(void) ++{ ++/* This method should eventually contain the correct algorithm for calculating ++ the hsync_time */ ++ if (blanked) ++ return 0; ++ else ++ return hsync_time; ++} ++ ++void tosa_wait_hsync(void) ++{ ++ /* Waits for a rising edge on the VGA line */ ++ while((GPLR(TOSA_GPIO_VGA_LINE) & GPIO_bit(TOSA_GPIO_VGA_LINE)) == 0); ++ while((GPLR(TOSA_GPIO_VGA_LINE) & GPIO_bit(TOSA_GPIO_VGA_LINE)) != 0); ++} ++ + static struct i2c_driver tosa_driver={ + .id = TOSA_LCD_I2C_DEVICEID, + .attach_adapter = tosa_attach_adapter, +Index: linux-tosa/include/asm-arm/arch-pxa/tosa.h +=================================================================== +--- linux-tosa.orig/include/asm-arm/arch-pxa/tosa.h 2006-08-29 16:52:59.000000000 +0100 ++++ linux-tosa/include/asm-arm/arch-pxa/tosa.h 2006-08-29 16:55:12.442761664 +0100 +@@ -1,6 +1,7 @@ + /* + * Hardware specific definitions for Sharp SL-C6000x series of PDAs + * ++ * Copyright (c) 2006 Wolfson Microelectronics PLC. + * Copyright (c) 2005 Dirk Opfer + * + * Based on Sharp's 2.4 kernel patches +@@ -187,4 +188,8 @@ + extern struct platform_device tosascoop_jc_device; + extern struct platform_device tosascoop_device; + extern struct platform_device tc6393_device; ++ ++unsigned long tosa_get_hsync_time(void); ++void tosa_wait_hsync(void); ++ + #endif /* _ASM_ARCH_TOSA_H_ */ diff --git a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch new file mode 100644 index 0000000000..191de3af22 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch @@ -0,0 +1,208 @@ +Index: linux-tosa/drivers/input/touchscreen/wm9712.c +=================================================================== +--- linux-tosa.orig/drivers/input/touchscreen/wm9712.c 2006-08-29 16:52:36.008543280 +0100 ++++ linux-tosa/drivers/input/touchscreen/wm9712.c 2006-08-29 16:52:50.923275896 +0100 +@@ -1,7 +1,7 @@ + /* + * wm9712.c -- Codec driver for Wolfson WM9712 AC97 Codecs. + * +- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC. ++ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC. + * Author: Liam Girdwood + * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com + * Parts Copyright : Ian Molton +@@ -13,6 +13,12 @@ + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * ++ * Revision history ++ * 4th Jul 2005 Initial version. ++ * 29th Aug 2006 Mike Arthur ++ * Added fixes for Sharp SL-6000 (Tosa) LCD noise causing ++ * touchscreen interference. ++ * + */ + + #include +@@ -28,6 +34,10 @@ + #define WM9705_VERSION "0.60" + #define DEFAULT_PRESSURE 0xb0c0 + ++#define CCNT(a) asm volatile ("mrc p14, 0, %0, C1, C1, 0" : "=r"(a)) ++#define CCNT_ON() asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1)) ++#define CCNT_OFF() asm("mcr p14, 0, %0, C0, C0, 0" : : "r"(1)) ++ + /* + * Debug + */ +@@ -243,6 +253,36 @@ + return wm->dig[2] & WM9712_PDEN; + } + ++ ++#ifdef CONFIG_MACH_TOSA ++/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait ++ * before sampling the Y axis of the touchscreen */ ++static inline void wm9712_lcd_sync_on(struct wm97xx* wm, int adcsel) { ++ unsigned long timer1 = 0, timer2 = 0, wait_time = 0; ++ if (adcsel == WM97XX_ADCSEL_Y) { ++ wait_time = wm97xx_calc_lcd_waittime(wm); ++ ++ CCNT_ON(); ++ ++ if (wait_time) { ++ /* wait for LCD rising edge */ ++ wm_machinfo->wait_hsync(); ++ /* get clock */ ++ CCNT(timer1); ++ CCNT(timer2); ++ ++ while ((timer2 - timer1) < wait_time) { ++ CCNT(timer2); ++ } ++ } ++ } ++} ++ ++static inline void wm9712_lcd_sync_off(void) { ++ CCNT_OFF(); ++} ++#endif ++ + /* + * Read a sample from the WM9712 adc in polling mode. + */ +@@ -260,6 +300,9 @@ + /* set up digitiser */ + if (adcsel & 0x8000) + adcsel = ((adcsel & 0x7fff) + 3) << 12; ++ #ifdef CONFIG_MACH_TOSA ++ wm9712_lcd_sync_on(wm, adcsel); ++ #endif + wm97xx_reg_write(wm, AC97_WM97XX_DIGITISER1, adcsel | WM97XX_POLL | WM97XX_DELAY(delay)); + + /* wait 3 AC97 time slots + delay for conversion */ +@@ -282,6 +325,10 @@ + + *sample = wm97xx_reg_read(wm, AC97_WM97XX_DIGITISER_RD); + ++ #ifdef CONFIG_MACH_TOSA ++ wm9712_lcd_sync_off(); ++ #endif ++ + /* check we have correct sample */ + if ((*sample & WM97XX_ADCSEL_MASK) != adcsel) { + dbg ("adc wrong sample, read %x got %x", adcsel, +@@ -303,11 +350,12 @@ + static int wm9712_poll_touch(struct wm97xx* wm, struct wm97xx_data *data) + { + int rc; +- + if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_X, &data->x)) != RC_VALID) + return rc; ++ + if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_Y, &data->y)) != RC_VALID) + return rc; ++ + if (pil && !five_wire) { + if ((rc = wm9712_poll_sample(wm, WM97XX_ADCSEL_PRES, &data->p)) != RC_VALID) + return rc; +Index: linux-tosa/drivers/input/touchscreen/wm97xx-core.c +=================================================================== +--- linux-tosa.orig/drivers/input/touchscreen/wm97xx-core.c 2006-08-29 16:52:36.008543280 +0100 ++++ linux-tosa/drivers/input/touchscreen/wm97xx-core.c 2006-08-29 16:52:50.924275744 +0100 +@@ -2,7 +2,7 @@ + * wm97xx-core.c -- Touch screen driver core for Wolfson WM9705, WM9712 + * and WM9713 AC97 Codecs. + * +- * Copyright 2003, 2004, 2005 Wolfson Microelectronics PLC. ++ * Copyright 2003, 2004, 2005, 2006 Wolfson Microelectronics PLC. + * Author: Liam Girdwood + * liam.girdwood@wolfsonmicro.com or linux@wolfsonmicro.com + * Parts Copyright : Ian Molton +@@ -67,6 +67,9 @@ + * GPIOs) and 2.6 power management. + * 29th Nov 2004 Added WM9713 support. + * 4th Jul 2005 Moved codec specific code out to seperate files. ++ * 29th Aug 2006 Mike Arthur ++ * Added fixes for Sharp SL-6000 (Tosa) LCD noise causing ++ * touchscreen interference. + */ + + #include +@@ -94,6 +97,7 @@ + static DECLARE_MUTEX(gpio_sem); + static LIST_HEAD(wm97xx_misc_list); + static struct wm97xx* wm_codec = NULL; ++struct wm97xx_machinfo *wm_machinfo; + + /* + * WM97xx - enable/disable AUX ADC sysfs +@@ -832,6 +836,23 @@ + mdev->remove(wm_codec); + } + ++#ifdef CONFIG_MACH_TOSA ++/* On the Sharp SL-6000 (Tosa), due to a noisy LCD, we need to perform a wait ++ * before sampling the Y axis of the touchscreen */ ++unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm) { ++ unsigned long hsync_time = wm_machinfo->get_hsync_time(); ++ return hsync_time; ++} ++ ++void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo) { ++ wm_machinfo = machinfo; ++} ++ ++void wm97xx_unset_machinfo() { ++ wm_machinfo = NULL; ++} ++#endif ++ + static struct device_driver wm97xx_driver = { + .name = "ac97", + .bus = &ac97_bus_type, +@@ -861,6 +882,9 @@ + EXPORT_SYMBOL_GPL(wm97xx_reg_write); + EXPORT_SYMBOL_GPL(wm97xx_register_misc_dev); + EXPORT_SYMBOL_GPL(wm97xx_unregister_misc_dev); ++EXPORT_SYMBOL_GPL(wm97xx_calc_lcd_waittime); ++EXPORT_SYMBOL_GPL(wm97xx_set_machinfo); ++EXPORT_SYMBOL_GPL(wm97xx_unset_machinfo); + + module_init(wm97xx_init); + module_exit(wm97xx_exit); +Index: linux-tosa/include/linux/wm97xx.h +=================================================================== +--- linux-tosa.orig/include/linux/wm97xx.h 2006-08-29 16:52:36.008543280 +0100 ++++ linux-tosa/include/linux/wm97xx.h 2006-08-29 16:52:50.924275744 +0100 +@@ -207,6 +207,7 @@ + + struct wm97xx; + extern struct wm97xx_codec_drv wm97xx_codec; ++extern struct wm97xx_machinfo *wm_machinfo; + + /* + * Codec driver interface - allows mapping to WM9705/12/13 and newer codecs +@@ -253,6 +254,11 @@ + struct list_head list; + }; + ++struct wm97xx_machinfo { ++ unsigned long (*get_hsync_time)(void); ++ void (*wait_hsync)(void); ++}; ++ + int wm97xx_register_misc_dev(struct wm97xx_misc_dev* mdev); + void wm97xx_unregister_misc_dev(struct wm97xx_misc_dev* mdev); + +@@ -281,4 +287,9 @@ + int wm97xx_acc_startup(struct wm97xx* wm); + void wm97xx_acc_shutdown(struct wm97xx* wm); + ++ ++unsigned long wm97xx_calc_lcd_waittime(struct wm97xx *wm); ++void wm97xx_set_machinfo(struct wm97xx_machinfo *machinfo); ++void wm97xx_unset_machinfo(void); ++ + #endif diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index c7f1f21618..ef03c0e434 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r20" +PR = "r21" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -115,7 +115,9 @@ SRC_URI_append_tosa = "\ ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ - ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1" + ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1 \ + file://tosa-lcdnoise-r0.patch;patch=1 \ + file://wm97xx-lcdnoise-r0.patch;patch=1 " # ${DOSRC}/tosa-asoc-r1.patch;patch=1 " S = "${WORKDIR}/linux-2.6.17" -- cgit v1.2.3 From 5c72e2e5ecf750ebd5893ccba10cc74c2ee6d1db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 14:09:39 +0000 Subject: libx11: bump PR to keep up with diet-x11 --- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index b31ed72998..2f4a5706d5 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -1,5 +1,7 @@ require xorg-lib-common.inc +PR = "r1" + DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ -- cgit v1.2.3 From 835bbbbe1609357517e6cc3f38a0a6be8e3aa450 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 30 Aug 2006 14:14:03 +0000 Subject: ltrace: add mvista-toolchain specific version, fix building w/ gnueabi --- packages/ltrace/files/.mtn2git_empty | 0 packages/ltrace/files/mvc-toolchain.patch | 32 +++++++++++++++++++++++++++++++ packages/ltrace/ltrace-mvc_0.3.36.bb | 5 +++++ packages/ltrace/ltrace_0.3.36.bb | 12 +++++++----- 4 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 packages/ltrace/files/.mtn2git_empty create mode 100644 packages/ltrace/files/mvc-toolchain.patch create mode 100644 packages/ltrace/ltrace-mvc_0.3.36.bb (limited to 'packages') diff --git a/packages/ltrace/files/.mtn2git_empty b/packages/ltrace/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ltrace/files/mvc-toolchain.patch b/packages/ltrace/files/mvc-toolchain.patch new file mode 100644 index 0000000000..886759dfbf --- /dev/null +++ b/packages/ltrace/files/mvc-toolchain.patch @@ -0,0 +1,32 @@ +diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h +--- ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h 2004-11-09 20:25:15.000000000 +0800 ++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/arch.h 2005-12-17 02:00:34.000000000 +0800 +@@ -1,4 +1,5 @@ +-#define BREAKPOINT_VALUE { 0x01, 0x00, 0x9f, 0xef } ++#define BREAKPOINT_VALUE { 0xfe, 0xde, 0xff, 0xe7} ++ + #define BREAKPOINT_LENGTH 4 + #define DECR_PC_AFTER_BREAK 0 + +diff -ru ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c +--- ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c 2004-11-09 20:25:15.000000000 +0800 ++++ ltrace-0.3.36-mvc/sysdeps/linux-gnu/arm/plt.c 2005-12-19 08:08:54.000000000 +0800 +@@ -5,5 +5,5 @@ + GElf_Addr + arch_plt_sym_val (struct ltelf *lte, size_t ndx, GElf_Rela *rela) + { +- return lte->plt_addr + 20 + ndx * 12; ++ return lte->plt_addr + 16 + ndx * 16; + } +diff -ru ltrace-0.3.36/wait_for_something.c ltrace-0.3.36-mvc/wait_for_something.c +--- ltrace-0.3.36/wait_for_something.c 2004-06-14 23:55:50.000000000 +0800 ++++ ltrace-0.3.36-mvc/wait_for_something.c 2005-12-17 02:21:15.000000000 +0800 +@@ -82,7 +82,7 @@ + event.thing = LT_EV_UNKNOWN; + return &event; + } +- if (WSTOPSIG(status) != SIGTRAP) { ++ if (WSTOPSIG(status) != SIGTRAP && WSTOPSIG(status) != SIGILL) { + event.thing = LT_EV_SIGNAL; + event.e_un.signum = WSTOPSIG(status); + return &event; diff --git a/packages/ltrace/ltrace-mvc_0.3.36.bb b/packages/ltrace/ltrace-mvc_0.3.36.bb new file mode 100644 index 0000000000..66a613fe2e --- /dev/null +++ b/packages/ltrace/ltrace-mvc_0.3.36.bb @@ -0,0 +1,5 @@ +require ltrace_${PV}.bb + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://mvc-toolchain.patch;patch=1" diff --git a/packages/ltrace/ltrace_0.3.36.bb b/packages/ltrace/ltrace_0.3.36.bb index ae2c865f72..1e2ff5394b 100644 --- a/packages/ltrace/ltrace_0.3.36.bb +++ b/packages/ltrace/ltrace_0.3.36.bb @@ -3,12 +3,10 @@ HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" SECTION = "devel" DEPENDS = "libelf" LICENSE = "GPL" -PR = "r1" - -SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz\ - ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1\ - file://mvc-toolchain.patch;patch=1" +PR = "r2" +SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36.orig.tar.gz \ + ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz;patch=1" inherit autotools PARALLEL_MAKE = "" @@ -20,6 +18,10 @@ EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_DIR}/${TARGET_SYS}/include" +do_configure_prepend() { + ln -sf ./linux-gnu sysdeps/linux-gnueabi +} + do_compile() { oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} } -- cgit v1.2.3 From f1fac8939e88ca25e8227a6e97393eb216abd738 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 30 Aug 2006 14:35:19 +0000 Subject: lsof: remove 4.74, remove 4.75, add 4.76, add gnueabi support --- packages/lsof/lsof_4.74.bb | 38 -------------------------------------- packages/lsof/lsof_4.75.bb | 38 -------------------------------------- packages/lsof/lsof_4.76.bb | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 76 deletions(-) delete mode 100644 packages/lsof/lsof_4.74.bb delete mode 100644 packages/lsof/lsof_4.75.bb create mode 100644 packages/lsof/lsof_4.76.bb (limited to 'packages') diff --git a/packages/lsof/lsof_4.74.bb b/packages/lsof/lsof_4.74.bb deleted file mode 100644 index 0562a57fb1..0000000000 --- a/packages/lsof/lsof_4.74.bb +++ /dev/null @@ -1,38 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "Lsof is a Unix-specific diagnostic \ -tool. Its name stands for LiSt Open Files, and it \ -does just that." -LICENSE = "BSD" - -SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2" -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${LOCALSRC}', d) - bb.build.exec_func('base_do_unpack', d) - bb.data.setVar('SRC_URI', src_uri, d) -} - -LSOF_OS = "${TARGET_OS}" -LSOF_OS_linux-uclibc = "linux" - -do_configure () { - ./Configure ${LSOF_OS} -} - -export I = "${STAGING_INCDIR}" -export L = "${STAGING_INCDIR}" -export EXTRA_OEMAKE = "" - -do_compile () { - oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' -} - -do_install () { - install -d ${D}${sbindir} ${D}${mandir}/man8 - install -m 4755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 -} diff --git a/packages/lsof/lsof_4.75.bb b/packages/lsof/lsof_4.75.bb deleted file mode 100644 index 0562a57fb1..0000000000 --- a/packages/lsof/lsof_4.75.bb +++ /dev/null @@ -1,38 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "Lsof is a Unix-specific diagnostic \ -tool. Its name stands for LiSt Open Files, and it \ -does just that." -LICENSE = "BSD" - -SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2" -LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" -S = "${WORKDIR}/lsof_${PV}_src" - -python do_unpack () { - bb.build.exec_func('base_do_unpack', d) - src_uri = bb.data.getVar('SRC_URI', d) - bb.data.setVar('SRC_URI', '${LOCALSRC}', d) - bb.build.exec_func('base_do_unpack', d) - bb.data.setVar('SRC_URI', src_uri, d) -} - -LSOF_OS = "${TARGET_OS}" -LSOF_OS_linux-uclibc = "linux" - -do_configure () { - ./Configure ${LSOF_OS} -} - -export I = "${STAGING_INCDIR}" -export L = "${STAGING_INCDIR}" -export EXTRA_OEMAKE = "" - -do_compile () { - oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' -} - -do_install () { - install -d ${D}${sbindir} ${D}${mandir}/man8 - install -m 4755 lsof ${D}${sbindir}/lsof - install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 -} diff --git a/packages/lsof/lsof_4.76.bb b/packages/lsof/lsof_4.76.bb new file mode 100644 index 0000000000..d134f38b23 --- /dev/null +++ b/packages/lsof/lsof_4.76.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ +Its name stands for LiSt Open Files, and it does just that." +SECTION = "devel" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2" +LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" +S = "${WORKDIR}/lsof_${PV}_src" + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + src_uri = bb.data.getVar('SRC_URI', d) + bb.data.setVar('SRC_URI', '${LOCALSRC}', d) + bb.build.exec_func('base_do_unpack', d) + bb.data.setVar('SRC_URI', src_uri, d) +} + +LSOF_OS = "${TARGET_OS}" +LSOF_OS_linux-uclibc = "linux" +LSOF_OS_linux-gnueabi = "linux" + +do_configure () { + ./Configure ${LSOF_OS} +} + +export I = "${STAGING_INCDIR}" +export L = "${STAGING_INCDIR}" +export EXTRA_OEMAKE = "" + +do_compile () { + oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}' +} + +do_install () { + install -d ${D}${sbindir} ${D}${mandir}/man8 + install -m 4755 lsof ${D}${sbindir}/lsof + install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8 +} -- cgit v1.2.3 From da39c95afb07559e58b1881bff6e6d1d232984e6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 30 Aug 2006 19:13:19 +0000 Subject: initscripts: populate-volatile.sh: Add explicit command separators. * There was issue seen when populate-volatile.sh executed something like "mkdir chown" when configuration was not full right. This fixed it. Closes #1355. --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index f22bf2fdfe..2c2132209f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -10,7 +10,7 @@ COREDEF="00_core" create_file() { EXEC=" - touch \"$1\" + touch \"$1\"; chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " @@ -21,7 +21,7 @@ create_file() { mk_dir() { EXEC=" - mkdir -p \"$1\" + mkdir -p \"$1\"; chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " -- cgit v1.2.3 From b777f492ed8bfd26d409f31cfafb724f1ed62848 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 30 Aug 2006 19:17:46 +0000 Subject: handhelds-pxa-2.6_2.6.16-hh5: Add patches from handhelds-pxa-2.6_cvs . --- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb index a5cc4073e4..f36e9d2b12 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -8,7 +8,10 @@ COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://hx-iwmmxt.patch;patch=1;maxdate=20060807 \ + file://defconfig" S = "${WORKDIR}/kernel26" -- cgit v1.2.3 From 589f8b60632116adca542320de2b834642dec25f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 19:24:41 +0000 Subject: hh-pxa-2.6 2.6.16-hh5: remove maxdate from iwmmxt patch --- packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb index f36e9d2b12..9ddc30a916 100644 --- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb @@ -10,7 +10,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://24-hostap_cs_id.diff;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ - file://hx-iwmmxt.patch;patch=1;maxdate=20060807 \ + file://hx-iwmmxt.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel26" -- cgit v1.2.3 From ac7135e9c90c73e8c3fab13b7209b8e2f64910e7 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 30 Aug 2006 21:52:52 +0000 Subject: Update openomap distro and omap5912osk machine file with fixes to allow the OSK to boot. Includes changes to the kernel config to add TMPFS to the kernel config. The deployed fstab may need some tweaking still. --- .../linux/linux-omap1-2.6.x+git/.mtn2git_empty | 0 packages/linux/linux-omap1-2.6.x+git/defconfig | 1113 ++++++++++++++++++++ packages/linux/linux-omap1_2.6.x+git.bb | 12 +- 3 files changed, 1120 insertions(+), 5 deletions(-) create mode 100644 packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty create mode 100644 packages/linux/linux-omap1-2.6.x+git/defconfig (limited to 'packages') diff --git a/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-omap1-2.6.x+git/defconfig b/packages/linux/linux-omap1-2.6.x+git/defconfig new file mode 100644 index 0000000000..ca2ac4ebd5 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.x+git/defconfig @@ -0,0 +1,1113 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.18-rc4-omap1 +# Wed Aug 30 10:58:22 2006 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_RT_MUTEXES=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_BLK_DEV_IO_TRACE 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" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_OMAP=y + +# +# TI OMAP Implementations +# +CONFIG_ARCH_OMAP_OTG=y +CONFIG_ARCH_OMAP1=y +# CONFIG_ARCH_OMAP2 is not set + +# +# OMAP Feature Selections +# +CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_BOOT_TAG is not set +# CONFIG_OMAP_GPIO_SWITCH is not set +CONFIG_OMAP_MUX=y +# CONFIG_OMAP_MUX_DEBUG is not set +CONFIG_OMAP_MUX_WARNINGS=y +# CONFIG_OMAP_STI is not set +CONFIG_OMAP_MCBSP=y +# CONFIG_OMAP_MPU_TIMER is not set +CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 +# CONFIG_OMAP_DM_TIMER is not set +CONFIG_OMAP_LL_DEBUG_UART1=y +# CONFIG_OMAP_LL_DEBUG_UART2 is not set +# CONFIG_OMAP_LL_DEBUG_UART3 is not set +CONFIG_OMAP_SERIAL_WAKE=y + +# +# OMAP Core Type +# +# CONFIG_ARCH_OMAP730 is not set +# CONFIG_ARCH_OMAP15XX is not set +CONFIG_ARCH_OMAP16XX=y + +# +# OMAP Board Type +# +# CONFIG_MACH_OMAP_INNOVATOR is not set +# CONFIG_MACH_OMAP_H2 is not set +# CONFIG_MACH_OMAP_H3 is not set +CONFIG_MACH_OMAP_OSK=y +# CONFIG_OMAP_OSK_MISTRAL is not set +# CONFIG_MACH_NOKIA770 is not set +# CONFIG_MACH_OMAP_GENERIC is not set + +# +# OMAP CPU Speed +# +# CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set +# CONFIG_OMAP_ARM_216MHZ is not set +CONFIG_OMAP_ARM_192MHZ=y +# CONFIG_OMAP_ARM_168MHZ is not set +# CONFIG_OMAP_ARM_120MHZ is not set +# CONFIG_OMAP_ARM_60MHZ is not set +# CONFIG_OMAP_ARM_30MHZ is not set +# CONFIG_OMAP_DSP is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM926T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_OMAP_CF=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=128 +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +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 is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +# CONFIG_CPU_FREQ is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_APM is not set + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +# CONFIG_PACKET_MMAP is not set +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# 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=y +# 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=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y +# CONFIG_IPV6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE 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_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_ARM_INTEGRATOR is not set +CONFIG_MTD_OMAP_NOR=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_ONENAND_SYNC_READ is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# 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_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +CONFIG_SMC91X=y +# CONFIG_DM9000 is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +CONFIG_PPP=y +CONFIG_PPP_MULTILINK=y +# CONFIG_PPP_FILTER is not set +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_MPPE is not set +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=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_TSDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_OMAP=y +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_OMAP=y +# CONFIG_OMAP_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_OMAP_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set +CONFIG_I2C_OMAP=y + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_ISP1301_OMAP is not set +CONFIG_TPS65010=y +# CONFIG_SENSORS_TLV320AIC23 is not set +# CONFIG_GPIOEXPANDER_OMAP is not set +# CONFIG_SENSORS_MAX6875 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 + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM 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_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FIRMWARE_EDID=y +CONFIG_FB=y +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT 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 +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_LCD_MIPID is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +# CONFIG_FB_OMAP_DMA_TUNE is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# Real Time Clock +# +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set + +# +# Synchronous Serial Interfaces (SSI) +# +CONFIG_OMAP_UWIRE=y +CONFIG_OMAP_TSC2101=y + +# +# CBUS support +# +# CONFIG_CBUS 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 is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y +# CONFIG_FUSE_FS 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=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# 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_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +# 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 is not set +CONFIG_NLS_ISO8859_1=m +# 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 is not set + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_FS is not set +CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set +# CONFIG_DEBUG_USER is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +# CONFIG_CRYPTO is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y diff --git a/packages/linux/linux-omap1_2.6.x+git.bb b/packages/linux/linux-omap1_2.6.x+git.bb index 7a5ff66af2..9bc1b7c0a9 100644 --- a/packages/linux/linux-omap1_2.6.x+git.bb +++ b/packages/linux/linux-omap1_2.6.x+git.bb @@ -3,7 +3,8 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" -SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git" +SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ + file://defconfig" S = "${WORKDIR}/git" @@ -17,10 +18,11 @@ inherit kernel COMPATIBLE_HOST = 'arm.*-linux' do_configure_prepend() { - if [ "${MACHINE}" == "omap5912osk" ] ; then - oe_runmake omap_osk_5912_defconfig - fi - +# if [ "${MACHINE}" == "omap5912osk" ] ; then +# oe_runmake omap_osk_5912_defconfig +# fi + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + make oldconfig } do_deploy() { -- cgit v1.2.3 From 6d1b2218c91c330a07b02bb49d8db2c10c74aa4c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 22:23:03 +0000 Subject: task-angstrom-x11: mask of thcrut --- packages/angstrom/task-angstrom-x11.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index 55d644bc15..2e5d55d727 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -113,6 +113,6 @@ RDEPENDS_angstrom-task-sectest := "\ # tcpdump \ kismet \ hydra \ - thcrut \ +# thcrut \ # driftnet \ miniclipboard" -- cgit v1.2.3 From 6bfcdbf0b05a8ea5c02321e44b1b567823e191da Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 31 Aug 2006 08:01:41 +0000 Subject: gpe-bluetooth: #include in main.h, fix for #1373 --- packages/gpe-bluetooth/files/include-sdp_lib.patch | 9 +++++++++ packages/gpe-bluetooth/gpe-bluetooth_0.54.bb | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 packages/gpe-bluetooth/files/include-sdp_lib.patch (limited to 'packages') diff --git a/packages/gpe-bluetooth/files/include-sdp_lib.patch b/packages/gpe-bluetooth/files/include-sdp_lib.patch new file mode 100644 index 0000000000..8ec1ab3af3 --- /dev/null +++ b/packages/gpe-bluetooth/files/include-sdp_lib.patch @@ -0,0 +1,9 @@ +--- gpe-bluetooth-0.54/main.h.orig 2006-08-31 09:49:46.000000000 +0200 ++++ gpe-bluetooth-0.54/main.h 2006-08-31 09:49:48.000000000 +0200 +@@ -1,5 +1,6 @@ + #include + #include ++#include + + struct bt_device + { diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb index b02be325e6..77cf675e21 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb @@ -11,6 +11,7 @@ RDEPENDS = "bluez-utils-dbus blueprobe" GPE_TARBALL_SUFFIX= "bz2" inherit gpe autotools -SRC_URI += "file://hciattach-bts.patch;patch=1" +SRC_URI += "file://hciattach-bts.patch;patch=1 \ + file://include-sdp_lib.patch;patch=1" FILES_${PN} += '${datadir}/bluez-pin' -- cgit v1.2.3 From 2b2bb70ca659b9923de0b92d0a9a2cca68ed5d90 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 08:09:44 +0000 Subject: gpe-package: backport search functionality from cvs --- packages/gpe-package/files/search.patch | 313 ++++++++++++++++++++++++++++++++ packages/gpe-package/gpe-package_0.3.bb | 10 +- 2 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 packages/gpe-package/files/search.patch (limited to 'packages') diff --git a/packages/gpe-package/files/search.patch b/packages/gpe-package/files/search.patch new file mode 100644 index 0000000000..2a71c5339f --- /dev/null +++ b/packages/gpe-package/files/search.patch @@ -0,0 +1,313 @@ +--- /tmp/interface.c 2006-08-31 09:49:57.000000000 +0200 ++++ gpe-package-0.3/interface.c 2006-08-31 09:50:20.855780000 +0200 +@@ -27,6 +27,10 @@ + #include + #include + ++#ifdef ENABLE_PCRE ++#include ++#endif ++ + #define _(x) gettext(x) + #define N_(_x) (_x) + +@@ -55,11 +59,8 @@ + #define MI_PACKAGES_APPLY 7 + #define MI_FILTER_INST 8 + #define MI_FILTER_NOTINST 9 +-#define MI_PACKAGES_INFO 10 +- +-#define TREE_SHOW_ALL 0x00 +-#define TREE_SHOW_INST 0x01 +-#define TREE_SHOW_NOTINST 0x02 ++#define MI_FILTER_SEARCH 10 ++#define MI_PACKAGES_INFO 11 + + #define HELPMESSAGE "GPE-Package\nVersion " VERSION \ + "\nGPE frontend for ipkg\n\nflorian@handhelds.org" +@@ -79,7 +80,6 @@ + + static description_t *pkg_info = NULL; + static int pkg_count = 0; +-static int tree_filter = TREE_SHOW_ALL; + + int sock; + static pkcommand_t running_command = CMD_NONE; +@@ -91,10 +91,12 @@ + static GtkWidget *notebook; + static GtkWidget *txLog; + static GtkWidget *treeview; ++static GtkTreeModel *filter; ++static gchar *filter_term = NULL; + static GtkTreeStore *store = NULL; + static GtkToolItem *bApply; + static GtkWidget *miUpdate, *miSysUpgrade, *miSelectLocal, *miApply; +-static GtkWidget *miFilterInst, *miFilterNotInst; ++static GtkWidget *miFilterInst, *miFilterNotInst, *miFilterSearch; + static GtkWidget *sbar; + GtkWidget *fMain; + static GtkWidget *dlgAction = NULL; +@@ -102,10 +104,17 @@ + static GtkTextBuffer *infobuffer = NULL; + static GtkWidget *mMain; + ++#ifdef ENABLE_PCRE ++static gboolean is_regexp; ++#endif + + /* some forwards */ + gboolean get_pending_messages (); + void on_tree_filter_changed(GtkCheckMenuItem *menuitem, gpointer user_data); ++void on_tree_filter_search_changed (GtkCheckMenuItem *menuitem, gpointer user_data); ++gboolean filter_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data); ++void set_filter_term (const gchar *text, gboolean regexp); ++void search_entry_activated (GtkEntry *entry, gpointer user_data); + void create_fMain (void); + void on_select_local(GtkButton *button, gpointer user_data); + void on_packages_update_clicked(GtkButton *button, gpointer user_data); +@@ -125,8 +134,10 @@ + { N_("/Packages/Show Insta_lled"), "", on_tree_filter_changed, MI_FILTER_INST , ""}, + { N_("/Packages/Show _Not Installed"), "", on_tree_filter_changed, MI_FILTER_NOTINST, ""}, + { N_("/_Packages/s2"), NULL , NULL, 0, ""}, +- { N_("/Packages/Show _Info"), " I", on_package_info_clicked, MI_PACKAGES_INFO , ""}, ++ { N_("/Packages/_Search"), " I", on_tree_filter_search_changed, MI_FILTER_SEARCH , ""}, + { N_("/_Packages/s3"), NULL , NULL, 0, ""}, ++ { N_("/Packages/Show _Info"), " I", on_package_info_clicked, MI_PACKAGES_INFO , ""}, ++ { N_("/_Packages/s4"), NULL , NULL, 0, ""}, + { N_("/Packages/_Update lists"), " U", on_packages_update_clicked, MI_PACKAGES_UPDATE , ""}, + { N_("/Packages/Upgrade _System"), "", on_system_update_clicked, MI_PACKAGES_UPGRADE, ""}, + { N_("/_Packages/s3"), NULL , NULL, 0, ""}, +@@ -215,10 +226,10 @@ + GtkWidget * + progress_dialog (gchar * text, GdkPixbuf * pixbuf) + { +-GtkWidget *window; +-GtkWidget *label; +-GtkWidget *image; +-GtkWidget *hbox; ++ GtkWidget *window; ++ GtkWidget *label; ++ GtkWidget *image; ++ GtkWidget *hbox; + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + hbox = gtk_hbox_new (FALSE, 0); +@@ -227,6 +238,7 @@ + + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_DIALOG); ++ gtk_window_set_title (GTK_WINDOW (window), _("Working")); + + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + +@@ -381,9 +393,9 @@ + + void update_tree(void) + { +-guint id; +-int i; +-GtkTreeIter iter; ++ guint id; ++ int i; ++ GtkTreeIter iter; + + id = gtk_statusbar_get_context_id(GTK_STATUSBAR(sbar),"upd"); + gtk_statusbar_push(GTK_STATUSBAR(sbar), +@@ -392,10 +404,6 @@ + gtk_tree_store_clear(GTK_TREE_STORE(store)); + + for (i=0; i= 0) { ++ return TRUE; ++ } ++ } ++ ++ return FALSE; ++ } ++#endif ++ ++ if (strstr (pkgname, filter_term)) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++void set_filter_term (const gchar *text, gboolean regexp) ++{ ++ if (filter_term) { ++ g_free (filter_term); ++ } ++ ++ filter_term = g_strdup (text); ++ ++#ifdef ENABLE_PCRE ++ is_regexp = regexp; ++#endif ++ ++ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter)); ++} ++ ++void search_entry_activated (GtkEntry *entry, gpointer user_data) ++{ ++ GtkDialog *dialog = user_data; ++ ++ gtk_dialog_response (dialog, GTK_RESPONSE_ACCEPT); ++} ++ ++void on_tree_filter_search_changed (GtkCheckMenuItem *menuitem, gpointer user_data) ++{ ++ GtkWidget *dialog; ++ GtkWidget *entry; ++ const gchar *text; ++#ifdef ENABLE_PCRE ++ GtkWidget *checkbutton; ++#endif ++ ++ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (miFilterSearch))) { ++ dialog = gtk_dialog_new_with_buttons (_("Search term:"), ++ GTK_WINDOW (fMain), ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, ++ NULL); ++ entry = gtk_entry_new (); ++ g_signal_connect (G_OBJECT (entry), "activate", G_CALLBACK (search_entry_activated), dialog); ++ gtk_widget_show (entry); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), entry); ++#ifdef ENABLE_PCRE ++ checkbutton = gtk_check_button_new_with_label (_("Regular expression")); ++ gtk_widget_show (checkbutton); ++ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), checkbutton); ++#endif ++ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ++ text = gtk_entry_get_text (GTK_ENTRY (entry)); ++ if (strlen (text)) { ++#ifdef ENABLE_PCRE ++ set_filter_term (text, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton))); ++#else ++ set_filter_term (text, FALSE); ++#endif ++ } else { ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (miFilterSearch), FALSE); ++ } ++ } else { ++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (miFilterSearch), FALSE); ++ } ++ gtk_widget_destroy (dialog); ++ } else { ++ set_filter_term (NULL, FALSE); ++ } ++ ++ ++} + + void on_about_clicked (GtkWidget * w) + { +@@ -740,9 +871,9 @@ + + void on_package_info_clicked(GtkButton *button, gpointer user_data) + { +-GtkTreeIter iter; +-GtkTreeSelection *sel; +-char *name = NULL; ++ GtkTreeIter iter; ++ GtkTreeSelection *sel; ++ char *name = NULL; + + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + +@@ -848,7 +979,7 @@ + selection = gtk_tree_view_get_selection (treeview); + if (gtk_tree_selection_get_selected (selection, NULL, &iter) == FALSE) + return FALSE; +- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_VERSION, &version, -1); ++ gtk_tree_model_get (GTK_TREE_MODEL (filter), &iter, COL_VERSION, &version, -1); + gtk_statusbar_push(GTK_STATUSBAR(sbar),0,version); + + return TRUE; +@@ -882,6 +1013,8 @@ + MI_FILTER_INST); + miFilterNotInst = gtk_item_factory_get_item_by_action(itemfactory, + MI_FILTER_NOTINST); ++ miFilterSearch = gtk_item_factory_get_item_by_action(itemfactory, ++ MI_FILTER_SEARCH); + + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(miFilterInst),TRUE); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(miFilterNotInst),TRUE); +@@ -984,7 +1117,9 @@ + gtk_box_pack_start(GTK_BOX(vbox), cur, TRUE, TRUE, 0); + + /* packages tree */ +- treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); ++ filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); ++ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter), filter_visible_func, NULL, NULL); ++ treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (filter)); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(treeview),FALSE); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(treeview),TRUE); + gtk_container_add(GTK_CONTAINER(cur),treeview); + diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb index 55cc4ef2a8..a6342f4e18 100644 --- a/packages/gpe-package/gpe-package_0.3.bb +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -1,18 +1,22 @@ LICENSE = "GPL" -PR = "r2" +PR = "r3" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" -DEPENDS = "ipkg libgpewidget gpe-su" +DEPENDS = "ipkg pcre libgpewidget gpe-su" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" SRC_URI += " file://sbin-and-no-suid-install.patch;patch=1 \ - file://gpe-package" + file://search.patch;patch=1 \ + file://gpe-package" FILES_${PN} += " /usr/bin/gpe-package" +CFLAGS += "-DENABLE_PCRE" +LDFLAGS += "-lpcre" + do_install_append() { install -d ${D}/usr/bin install -m 0755 ${WORKDIR}/gpe-package ${D}/usr/bin -- cgit v1.2.3 From d710ae5a50fe6b2983ce2d9e41d295f79e55a7a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 08:43:46 +0000 Subject: h2200-bootloader: try to make sure only h2200 machine will build and install it --- packages/h2200-bootloader/h2200-bootloader.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb index eb36cd50d6..376e34d7cc 100644 --- a/packages/h2200-bootloader/h2200-bootloader.bb +++ b/packages/h2200-bootloader/h2200-bootloader.bb @@ -3,6 +3,10 @@ ALLOW_EMPTY = "1" MAINTAINER = "Koen Kooi " PR="r2" +COMPATIBLE_MACHINE = "h2200" +#it is a shell script, but lets protect the innocent some more +PACKAGE_ARCH = "h2200" + pkg_postinst() { #!/bin/sh mkdir -p /lib/firmware -- cgit v1.2.3 From 20dcec61dc2304f0500a52f93abca50abe8a970b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 31 Aug 2006 11:43:10 +0000 Subject: ruby: added 1.8.5 --- packages/ruby/ruby-native_1.8.5.bb | 3 +++ packages/ruby/ruby_1.8.5.bb | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/ruby/ruby-native_1.8.5.bb create mode 100644 packages/ruby/ruby_1.8.5.bb (limited to 'packages') diff --git a/packages/ruby/ruby-native_1.8.5.bb b/packages/ruby/ruby-native_1.8.5.bb new file mode 100644 index 0000000000..d5ccae8262 --- /dev/null +++ b/packages/ruby/ruby-native_1.8.5.bb @@ -0,0 +1,3 @@ +include ruby_${PV}.bb +inherit native +DEPENDS = "" diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb new file mode 100644 index 0000000000..235c3892de --- /dev/null +++ b/packages/ruby/ruby_1.8.5.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Ruby is an interpreted scripting language \ +for quick and easy object-oriented programming." +SECTION = "devel/ruby" +DEPENDS = "ruby-native" +PRIORITY = "optional" +MAINTAINER = "Gints Polis " +LICENSE = "GPL" + +SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/ruby-${PV}.tar.gz" +S = "${WORKDIR}/ruby-${PV}" + +inherit autotools -- cgit v1.2.3 From 7e13817fd6722787df7fb331781e779158192fec Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 19:18:08 +0000 Subject: xorg-xserver-common.inc: fixes --- packages/xorg-xserver/xorg-xserver-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 5f5f5c0dea..9455e5063c 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -15,7 +15,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" -REPENDS="rgb" +RDEPENDS="rgb" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ @@ -25,6 +25,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-builddocs" + PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" -- cgit v1.2.3 From 710e35683f8d5d9bba3af6d9b396a1f9c9cf5aac Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 19:20:44 +0000 Subject: ep93xx kernel: update defconfig --- packages/linux/ep93xx-kernel/defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig index f173484160..e42a804b5a 100644 --- a/packages/linux/ep93xx-kernel/defconfig +++ b/packages/linux/ep93xx-kernel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.18-rc1-git9 -# Sat Jul 15 19:58:55 2006 +# Sat Jul 15 20:13:41 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -170,7 +170,8 @@ CONFIG_ARM_AMBA=y # CONFIG_PREEMPT is not set # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -188,7 +189,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/nfs ip=bootp" +CONFIG_CMDLINE="console=ttyAM0,57600 root=/dev/nfs ip=bootp" # CONFIG_XIP_KERNEL is not set # @@ -208,7 +209,6 @@ CONFIG_FPE_NWFPE_XP=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options @@ -521,7 +521,7 @@ CONFIG_NETDEVICES=y # CONFIG_NET_ETHERNET=y CONFIG_MII=y -# CONFIG_EP93XX_ETH is not set +CONFIG_EP93XX_ETH=y # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set -- cgit v1.2.3 From 595160162414a8b0a1db18dfb80a457cac2b53ac Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 19:27:54 +0000 Subject: packages/linux: set some more COMPATIBLE_MACHINES * maintainers: please add the appropriate ones to your recipes --- packages/linux/a780-kernel_2.6.bb | 1 + packages/linux/e680-kernel_2.6.bb | 1 + packages/linux/gumstix_2.6.5-gnalm1-gum0.bb | 2 ++ packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb | 2 ++ packages/linux/linux-gumstix_2.6.15.bb | 2 ++ packages/linux/linux-openzaurus.inc | 2 +- packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc | 1 + packages/linux/shepherd-kernel-2.4-embedix.bb | 1 + 8 files changed, 11 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/a780-kernel_2.6.bb b/packages/linux/a780-kernel_2.6.bb index d141f90b55..b60bbaa3bc 100644 --- a/packages/linux/a780-kernel_2.6.bb +++ b/packages/linux/a780-kernel_2.6.bb @@ -1,2 +1,3 @@ MACHINE = "a780" +COMPATIBLE_MACHINE = "a780" require linux-ezx_2.6.16.13.bb diff --git a/packages/linux/e680-kernel_2.6.bb b/packages/linux/e680-kernel_2.6.bb index df5624384e..b3cbfbc0bf 100644 --- a/packages/linux/e680-kernel_2.6.bb +++ b/packages/linux/e680-kernel_2.6.bb @@ -1,2 +1,3 @@ MACHINE = "e680" +COMPATIBLE_MACHINE = "(e680|a780)" require linux-ezx_2.6.16.13.bb diff --git a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb index 846e5f4fa2..befb587f89 100644 --- a/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb +++ b/packages/linux/gumstix_2.6.5-gnalm1-gum0.bb @@ -5,6 +5,8 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for OMAP processors" LICENSE = "GPL" +COMPATIBLE_MACHINE = "gumstix" + # NOTE: pulled local linux-2.6.5-gnalm1, since it didn't apply cleanly SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \ file://linux-2.6.5-gnalm1.patch;patch=1 \ diff --git a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb index d2f8faa032..1948dedf65 100644 --- a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb +++ b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb @@ -3,6 +3,8 @@ DESCRIPTION = "2.6 Linux kernel for the Amstrad Delta (E3)" LICENSE = "GPL" MAINTAINER = "Jonathan McDowell " +COMPATIBLE_MACHINE = "amsdelta" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.16-omap2.bz2;patch=1 \ http://the.earth.li/pub/e3/2.6.16/00-ams-delta-backlight.diff;patch=1 \ diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb index de83450964..2b98c82370 100644 --- a/packages/linux/linux-gumstix_2.6.15.bb +++ b/packages/linux/linux-gumstix_2.6.15.bb @@ -3,6 +3,8 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r1" +COMPATIBLE_MACHINE = "gumstix" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd;date=20060223 \ file://defconfig-gumstix \ diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index bba29ac1d6..2ff70f48e3 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -23,7 +23,7 @@ ALLOW_EMPTY = 1 EXTRA_OEMAKE = "OPENZAURUS_RELEASE=-${DISTRO_VERSION}" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|ipaq-pxa270|qemuarm)' +COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|ipoq-pxa270|qemuarm)' CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc index 3b0024d147..04f8342165 100644 --- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc +++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc @@ -8,6 +8,7 @@ KV = "2.4.18" RMKV = "7" PXAV = "3" SHARPV = "20031107" +COMPATIBLE_MACHINE = "(poodle|corgi|shepherd|husky|poodle255|tosa)" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}" diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb index e86996d96f..874c72e432 100644 --- a/packages/linux/shepherd-kernel-2.4-embedix.bb +++ b/packages/linux/shepherd-kernel-2.4-embedix.bb @@ -1,4 +1,5 @@ MACHINE = "shepherd" +COMPATIBLE_MACHINE = "shepherd" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc -- cgit v1.2.3 From 2eb608702d28f25f48fc4b34cf7e1c7d5f340a45 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Thu, 31 Aug 2006 20:47:46 +0000 Subject: Provide new recipes for the latest hh.org kernels for the h3900 and h5400 iPAQs. --- .../.mtn2git_empty | 0 .../defconfig-h3900 | 1627 ++++++++++++++++++++ .../linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb | 73 + 3 files changed, 1700 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h3900 create mode 100644 packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h3900 b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h3900 new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h3900 @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# 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_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb new file mode 100644 index 0000000000..b39cb50835 --- /dev/null +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb @@ -0,0 +1,73 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." +MAINTAINER = "Phil Blundell " +LICENSE = "GPL" +#PR = "r1" + + +KERNEL_CCSUFFIX = "-3.3.4" +COMPATIBLE_HOST = "arm.*-linux" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig-${PACKAGE_ARCH} \ + file://ipaq-hal.init \ + file://linux-2.4-usb-gadget.patch;patch=1 \ + file://usb-gadget-ether-compat.patch;patch=1 \ + file://linux-2.4-no-short-loads.patch;patch=1 \ + file://linux-2.4-cpufreq.patch;patch=1" + +S = "${WORKDIR}/kernel" + +inherit kernel update-rc.d + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +RMKV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}" +PXAV = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}" + +module_conf_h3900_asic = "alias ipaq_hal_3900 h3900_asic" +module_conf_h5400_asic = "alias ipaq_hal_5400 h5400_asic" +module_conf_pxa_ir = "alias irda0 pxa_ir" +module_conf_i2c-algo-pxa = "options i2c-algo-pxa pxa_scan=0" +module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1" +module_conf_ppp_async = "alias ppp0 ppp_async" +module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1" +module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1" +module_conf_hidp = "alias bt-prot-5 hidp" + +module_autoload_h3600_ts = "h3600_ts" +module_autoload_apm = "apm" +module_autoload_af_packet = "af_packet" +module_autoload_usb-ohci-h5400 = "usb-ohci-h5400" +module_autoload_ppp_async = "ppp_async" +module_autoload_usb-eth = "usb-eth" +module_autoload_h5400_buzzer = "h5400_buzzer" +# breaks booting on first install of h3900 handhelds +#module_autoload_mmc_asic3 = "mmc_asic3" +module_autoload_mmc_h5400 = "mmc_h5400" +module_autoload_h5400-audio = "h5400-audio" +module_autoload_h3900-uda1380 = "h3900-uda1380" +module_autoload_sa1100-rtc = "sa1100-rtc" +module_autoload_ak4535 = "ak4535" +module_autoload_i2c-adap-pxa = "i2c-adap-pxa" + +FILES_kernel += "/etc/init.d/ipaq-hal" +INITSCRIPT_NAME = "ipaq-hal" +INITSCRIPT_PARAMS = "start 21 S ." + +# extra depends +RDEPENDS_kernel-module-h5400-audio = "kernel-module-ak4535 kernel-module-i2c-adap-pxa" +RDEPENDS_kernel-module-h3900-uda1380 = "kernel-module-uda1380 kernel-module-i2c-adap-pxa" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal +} -- cgit v1.2.3 From eb9aa42c10eccc39c3cb939c9f9dd70ed89991e4 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Thu, 31 Aug 2006 21:10:49 +0000 Subject: Update of my earlier change to make it possible to compile glibc 2.3.5 with newer gcc compilers (4.0.2 and up). This commit changes the name of the files to weak instead of week. And updates the bb file respectfully. --- .../glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch | 11 +++++++++++ packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch | 15 +++++++++++++++ .../glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch | 11 ----------- packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch | 15 --------------- packages/glibc/glibc_2.3.5+cvs20050627.bb | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch create mode 100644 packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch delete mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch delete mode 100644 packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch (limited to 'packages') diff --git a/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch new file mode 100644 index 0000000000..bf2f31e479 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm-2.patch @@ -0,0 +1,11 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700 +@@ -123,5 +123,7 @@ + #endif + + PSEUDO_END (__socket) +- ++ ++#ifndef NO_WEAK_ALIAS + weak_alias (__socket, socket) ++#endif diff --git a/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch new file mode 100644 index 0000000000..0097ff94d3 --- /dev/null +++ b/packages/glibc/files/glibc-2.3.5-fix-weak-alias-arm.patch @@ -0,0 +1,15 @@ +--- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700 ++++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700 +@@ -32,7 +32,11 @@ + The .S files for the other calls just #define socket and #include this. */ + + #ifndef __socket +-#define __socket P(__,socket) ++# ifndef NO_WEAK_ALIAS ++# define __socket P(__,socket) ++# else ++# define __socket socket ++# endif + #endif + + #define PUSHARGS_1 str a1, [sp, $-4]! diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch deleted file mode 100644 index bf2f31e479..0000000000 --- a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 14:38:22.208228359 -0700 -+++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 14:39:56.911675066 -0700 -@@ -123,5 +123,7 @@ - #endif - - PSEUDO_END (__socket) -- -+ -+#ifndef NO_WEAK_ALIAS - weak_alias (__socket, socket) -+#endif diff --git a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch b/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch deleted file mode 100644 index 0097ff94d3..0000000000 --- a/packages/glibc/files/glibc-2.3.5-fix-week-alias-arm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S.orig 2006-07-12 13:57:05.990485563 -0700 -+++ glibc-2.3.3/ports/sysdeps/unix/sysv/linux/arm/socket.S 2006-07-12 13:58:41.197865230 -0700 -@@ -32,7 +32,11 @@ - The .S files for the other calls just #define socket and #include this. */ - - #ifndef __socket --#define __socket P(__,socket) -+# ifndef NO_WEAK_ALIAS -+# define __socket P(__,socket) -+# else -+# define __socket socket -+# endif - #endif - - #define PUSHARGS_1 str a1, [sp, $-4]! diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 31105c8adb..8943e1c565 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -56,8 +56,8 @@ SRC_URI = "http://familiar.handhelds.org/source/v0.8.3/stash_libc_sources.redhat file://5090_all_stubs-rule-fix.patch;patch=1 \ file://raise.patch;patch=1 \ file://zecke-sane-readelf.patch;patch=1 \ - file://glibc-2.3.3-fix-week-alias-arm.patch;patch=1 \ - file://glibc-2.3.3-fix-week-alias-arm-2.patch;patch=1 \ + file://glibc-2.3.5-fix-weak-alias-arm.patch;patch=1 \ + file://glibc-2.3.5-fix-weak-alias-arm-2.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" -- cgit v1.2.3 From a93ce70849496660903566e819a4bf10b51641aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 21:25:51 +0000 Subject: hh-pxa 2.4-hh42: really make sure it supports h5xxx --- .../defconfig-h5xxx | 1627 ++++++++++++++++++++ 1 file changed, 1627 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h5xxx (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h5xxx b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h5xxx new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh42/defconfig-h5xxx @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# 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_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m -- cgit v1.2.3 From 79f580d504eb7f7ebabb9ef9b53d7bda901ea312 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 31 Aug 2006 21:45:01 +0000 Subject: xserver-kdrive: apply mreimer's fix to kdrive-use-evdev.patch --- packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch index d4f885ee26..28d7325601 100644 --- a/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch +++ b/packages/xorg-xserver/xserver-kdrive/kdrive-use-evdev.patch @@ -40,13 +40,14 @@ ErrorF("-switchCmd Command to execute on vt switch\n"); ErrorF("-nozap Don't terminate server on Ctrl+Alt+Backspace\n"); ErrorF("vtxx Use virtual terminal xx instead of the next available\n"); -@@ -796,6 +799,10 @@ +@@ -796,6 +799,11 @@ UseMsg (); return 2; } + if (!strcmp (argv[i], "-use-evdev")) + { + use_evdev = 1; ++ return 1; + } if (!strcmp (argv[i], "-keyboard")) { -- cgit v1.2.3 From abdcfacc9fd95489b2c51b0767fa46238f518cb3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 31 Aug 2006 21:47:55 +0000 Subject: xserver-kdrive-X11R7.1: apply latest fixes from the git .bb - build Xepson and Xsdl - package SecurityPolicy --- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index cfb1294c09..78b4054232 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,18 +1,32 @@ LICENSE = "MIT" -DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" + +PR = "r2" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" +DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version" + +FILES_${PN} += "${libdir}/xserver/SecurityPolicy" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-fake = "${bindir}/Xfake" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" +FILES_xserver-kdrive-epson = "${bindir}/Xepson" +FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" + +RDEPENDS_xserver-kdrive-fbdev = "${PN}" +RDEPENDS_xserver-kdrive-fake = "${PN}" +RDEPENDS_xserver-kdrive-xephyr = "${PN}" +RDEPENDS_xserver-kdrive-epson = "${PN}" +RDEPENDS_xserver-kdrive-sdl = "${PN}" SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ file://kmode.patch;patch=1 \ @@ -23,6 +37,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ + file://enable-epson.patch;patch=1 \ file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1" @@ -39,8 +54,10 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ - --disable-dmx \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ --with-default-font-path=built-ins \ + --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" + -- cgit v1.2.3 From e64c9654dbc7319dbd9d54d5c9f2c53e02963ffb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 31 Aug 2006 21:50:06 +0000 Subject: xserver-kdrive-git: update and apply disable-xf86-dga-xorgcfg.patch --- .../disable-xf86-dga-xorgcfg-git.patch | 39 ++++++++++++++++++++++ packages/xorg-xserver/xserver-kdrive_git.bb | 7 ++-- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch new file mode 100644 index 0000000000..4b7e41e3e9 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg-git.patch @@ -0,0 +1,39 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2006-08-31 22:44:06.000000000 +0200 ++++ git/configure.ac 2006-08-31 22:49:39.000000000 +0200 +@@ -513,7 +513,11 @@ + XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' + + dnl Core modules for most extensions, et al. ++if test "$KDRIVE" = yes; then ++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]" ++else + REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]" ++fi + REQUIRED_LIBS="xfont xau fontenc" + + AM_CONDITIONAL(XV, [test "x$XV" = xyes]) +@@ -1540,7 +1544,9 @@ + AC_SUBST(XKB_COMPILED_DIR) + + dnl and the rest of these are generic, so they're in config.h ++if test ! x"$KDRIVE" = xyes; then + AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) ++fi + AC_DEFINE(XResExtension, 1, [Build XRes extension]) + + dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined +@@ -1560,10 +1566,12 @@ + + AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) + ++if test ! "x$KDRIVE" = xyes ; then + dnl xorgconfig CLI configuration utility + PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) + AC_SUBST(XORGCONFIG_DEP_CFLAGS) + AC_SUBST(XORGCONFIG_DEP_LIBS) ++fi + + dnl xorgcfg GUI configuration utility + AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 9c967db254..bffcc4cdee 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,10 +1,10 @@ PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r3" +PR = "r4" LICENSE = "MIT" -DEPENDS = "tslib virtual/libsdl libxkbfile xf86dgaproto xf86vidmodeproto xf86miscproto xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" +DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" @@ -41,7 +41,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ -# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \ " SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -63,4 +63,3 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" - -- cgit v1.2.3 From 2499a6a0c904d96d20ef9c416f1a35ff2b1ab79a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 31 Aug 2006 21:52:17 +0000 Subject: xserver-kdrive: bump PR for cvs and 20060312 (use-evdev fix) --- packages/xorg-xserver/xserver-kdrive_20060312.bb | 2 +- packages/xorg-xserver/xserver-kdrive_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_20060312.bb b/packages/xorg-xserver/xserver-kdrive_20060312.bb index 594b6d74ec..c5080452ae 100644 --- a/packages/xorg-xserver/xserver-kdrive_20060312.bb +++ b/packages/xorg-xserver/xserver-kdrive_20060312.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r11" +PR = "r12" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" diff --git a/packages/xorg-xserver/xserver-kdrive_cvs.bb b/packages/xorg-xserver/xserver-kdrive_cvs.bb index c2b25973fb..e0e24065e6 100644 --- a/packages/xorg-xserver/xserver-kdrive_cvs.bb +++ b/packages/xorg-xserver/xserver-kdrive_cvs.bb @@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r11" +PR = "r12" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" -- cgit v1.2.3 From 595bc05e18f8dc76aa07f6a59349fa7180885fd5 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 31 Aug 2006 23:43:07 +0000 Subject: initscripts-slugos: Fix extra symlinks that break do_install. Bump PR of initscripts --- packages/initscripts/initscripts-slugos_1.0.bb | 17 ++++++++++++----- packages/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index dcb57e92bb..f64e11dfe4 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -4,14 +4,14 @@ # problems in the initscripts on SlugOS. The problems # mostly come down to the order the scripts are executed # in. -require initscripts_${PV}.bb +include initscripts_${PV}.bb MAINTAINER = "John Bowler " RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.9" +PR := "${PR}.10" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -64,15 +64,20 @@ do_install_append() { # udev will run at S04 if installed rm ${D}${sysconfdir}/rcS.d/S03sysfs rm ${D}${sysconfdir}/rcS.d/S38devpts.sh -# rm ${D}${sysconfdir}/rcS.d/S06alignment + rm ${D}${sysconfdir}/rcS.d/S06alignment + rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh + rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh + rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh + + # Check the result find ${D}${sysconfdir}/rc?.d ! -type d -print | { status=0 while read d do - oenote "initscripts-slugos: unexpected link $f" - status = 1 + oenote "initscripts-slugos: unexpected link $d" + status=1 done test $status -eq 0 || oefatal "initscripts-slugos: new links break do_install" @@ -102,6 +107,7 @@ do_install_append() { # base-files populate-volatile.sh runs at S37 update-rc.d -r ${D} devpts.sh start 38 S . # slugos file syslog starts here (39) + update-rc.d -r ${D} populate-volatile.sh start 37 S . # set hostname and domainname before the network script works (by # entering them at level 40), networking may reset them. @@ -138,6 +144,7 @@ do_install_append() { # This is the special, correct, slugos umountnfs.sh (it looks in # the /proc/mounts information, not /etc/fstab) update-rc.d -r ${D} umountnfs.sh start 31 0 6 . + update-rc.d -r ${D} save-rtc.sh start 25 0 6 . # portmap stops at 32 # slugos network syslog stops here (39) # networking stops at 40 (nothing else does, believe me.) diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 29747d41c2..9cf7e47de0 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -92,7 +92,7 @@ do_install () { # Install device dependent scripts # - if [ "${DISTRO}" == "openzaurus" ]; then + if [ "${DISTRO}" = "openzaurus" ]; then cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion chmod 0755 ${D}${sysconfdir}/init.d/checkversion ln -sf ../init.d/checkversion ${D}${sysconfdir}/rcS.d/S01version -- cgit v1.2.3 From 17c6027f5979a73ec425199947ca1c046d0c7aa6 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 31 Aug 2006 23:50:26 +0000 Subject: busybox: Add updated slugos defconfig, remove openslug-only directory, bump busybox PR --- .../busybox/busybox-1.2.1/openslug/.mtn2git_empty | 0 .../busybox-1.2.1/openslug/udhcpscript.patch | 133 ------ .../busybox/busybox-1.2.1/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.2.1/slugos/defconfig | 444 +++++++++++++++++++++ .../busybox/busybox-1.2.1/slugos/udhcpscript.patch | 133 ++++++ packages/busybox/busybox_1.2.1.bb | 2 +- 6 files changed, 578 insertions(+), 134 deletions(-) delete mode 100644 packages/busybox/busybox-1.2.1/openslug/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.2.1/slugos/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.2.1/slugos/defconfig create mode 100644 packages/busybox/busybox-1.2.1/slugos/udhcpscript.patch (limited to 'packages') diff --git a/packages/busybox/busybox-1.2.1/openslug/.mtn2git_empty b/packages/busybox/busybox-1.2.1/openslug/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch b/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch deleted file mode 100644 index 010f64a53f..0000000000 --- a/packages/busybox/busybox-1.2.1/openslug/udhcpscript.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 -+++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 -@@ -1,40 +1,101 @@ - #!/bin/sh -+# openslug UDHCP client script -+# this must set the HW address (MAC) on the interface -+# -+. /etc/default/functions - --# udhcpc script edited by Tim Riker - --[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 -+echodns(){ -+ local dns -+ if test $# -gt 0 -+ then -+ for dns in "$@" -+ do -+ echo "nameserver $dns" -+ done -+ fi -+} -+ -+# Output the correct contents for resolv.conf -+mkresolv() { -+ test -n "$domain" && echo "search $domain" -+ echodns $dns -+} -+ -+# checksum of a file (or stdin if -) -+md5strm() { -+ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' -+} -+ -+bind() { -+ local B N metric i olddomain -+ B= -+ test -n "$broadcast" && B="broadcast $broadcast" -+ N= -+ test -n "$subnet" && N="netmask $subnet" -+ ifconfig "$interface" "$ip" $B $N up -+ -+ # If given router information delete the old information and -+ # enter new stuff, routers get metrics incremented by 1 -+ # between each (this is somewhat arbitrary) -+ if test -n "$router" -+ then -+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null -+ do -+ : -+ done - --RESOLV_CONF="/etc/resolv.conf" --[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" --[ -n "$subnet" ] && NETMASK="netmask $subnet" -+ metric=0 -+ for i in $router -+ do -+ route add default gw "$i" dev "$interface" metric $((metric++)) -+ done -+ fi -+ -+ olddomain= -+ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" -+ if test -n "$domain" -a "$domain" != "$olddomain" -+ then -+ echo "$domain" >/etc/defaultdomain -+ # and update the kernel view too -+ echo "$domain" >/proc/sys/kernel/domainname -+ fi -+ -+ # Update /etc/resolv.conf to reflect domain and dns information, -+ # this always clears resolv.conf if none is given -+ md5old="$(md5strm /etc/resolv.conf)" -+ md5new="$(mkresolv | md5strm -)" -+ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf -+} - - case "$1" in -- deconfig) -- /sbin/ifconfig $interface 0.0.0.0 -- ;; -- -- renew|bound) -- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK -- -- if [ -n "$router" ] ; then -- echo "deleting routers" -- while route del default gw 0.0.0.0 dev $interface ; do -- : -- done -- -- metric=0 -- for i in $router ; do -- route add default gw $i dev $interface metric $((metric++)) -- done -+deconfig) -+ # Bring the interface up (without inet at this point) -+ ifconfig "$interface" up;; -+ -+renew|bound) -+ bind;; -+ -+leasefail) -+ # Pull the values from the config data if (only only if) this -+ # is the config interface -+ if test "$interface" = "$(config iface)" -+ then -+ ip="$(config ip)" -+ if test -n "$ip" -+ then -+ router="$(config gateway)" -+ subnet="$(config netmask)" -+ broadcast="$(config broadcast)" -+ domain="$(config domain)" -+ dns="$(config dns)" -+ -+ bind - fi -+ fi;; - -- echo -n > $RESOLV_CONF -- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF -- for i in $dns ; do -- echo adding dns $i -- echo nameserver $i >> $RESOLV_CONF -- done -- ;; -+*) echo "udhcpc: $*: unknown command" >&2 -+ exit 1;; - esac - - exit 0 diff --git a/packages/busybox/busybox-1.2.1/slugos/.mtn2git_empty b/packages/busybox/busybox-1.2.1/slugos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig new file mode 100644 index 0000000000..55aa5f3b5e --- /dev/null +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -0,0 +1,444 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_SELINUX is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +CONFIG_LFS=y +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +PREFIX="./_install" + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CMP is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_EXPR=y +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_OD=y +CONFIG_PRINTF=y +CONFIG_PWD=y +# CONFIG_REALPATH is not set +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_SORT=y +CONFIG_STTY=y +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y + +# +# test (forced enabled for use with shell) +# +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +CONFIG_GETKEY=y +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +CONFIG_RESET=y +# CONFIG_SETKEYCODES is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +CONFIG_START_STOP_DAEMON=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_PATCH is not set +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +# CONFIG_FIND is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +# CONFIG_XARGS is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_CROND is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_MT is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_IP is not set +# CONFIG_IPCALC is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_FEATURE_TFTP_DEBUG is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y + +# +# udhcp Server/Client +# +# CONFIG_UDHCPD is not set +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +CONFIG_PS=y +CONFIG_RENICE=y +CONFIG_TOP=y +FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y +CONFIG_SYSCTL=y + +# +# Another Bourne-like Shell +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y +# CONFIG_LOSETUP is not set +CONFIG_MKSWAP=y +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_MOUNT is not set +# CONFIG_UMOUNT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox-1.2.1/slugos/udhcpscript.patch b/packages/busybox/busybox-1.2.1/slugos/udhcpscript.patch new file mode 100644 index 0000000000..010f64a53f --- /dev/null +++ b/packages/busybox/busybox-1.2.1/slugos/udhcpscript.patch @@ -0,0 +1,133 @@ +--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 ++++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 +@@ -1,40 +1,101 @@ + #!/bin/sh ++# openslug UDHCP client script ++# this must set the HW address (MAC) on the interface ++# ++. /etc/default/functions + +-# udhcpc script edited by Tim Riker + +-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 ++echodns(){ ++ local dns ++ if test $# -gt 0 ++ then ++ for dns in "$@" ++ do ++ echo "nameserver $dns" ++ done ++ fi ++} ++ ++# Output the correct contents for resolv.conf ++mkresolv() { ++ test -n "$domain" && echo "search $domain" ++ echodns $dns ++} ++ ++# checksum of a file (or stdin if -) ++md5strm() { ++ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' ++} ++ ++bind() { ++ local B N metric i olddomain ++ B= ++ test -n "$broadcast" && B="broadcast $broadcast" ++ N= ++ test -n "$subnet" && N="netmask $subnet" ++ ifconfig "$interface" "$ip" $B $N up ++ ++ # If given router information delete the old information and ++ # enter new stuff, routers get metrics incremented by 1 ++ # between each (this is somewhat arbitrary) ++ if test -n "$router" ++ then ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ++ do ++ : ++ done + +-RESOLV_CONF="/etc/resolv.conf" +-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +-[ -n "$subnet" ] && NETMASK="netmask $subnet" ++ metric=0 ++ for i in $router ++ do ++ route add default gw "$i" dev "$interface" metric $((metric++)) ++ done ++ fi ++ ++ olddomain= ++ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" ++ if test -n "$domain" -a "$domain" != "$olddomain" ++ then ++ echo "$domain" >/etc/defaultdomain ++ # and update the kernel view too ++ echo "$domain" >/proc/sys/kernel/domainname ++ fi ++ ++ # Update /etc/resolv.conf to reflect domain and dns information, ++ # this always clears resolv.conf if none is given ++ md5old="$(md5strm /etc/resolv.conf)" ++ md5new="$(mkresolv | md5strm -)" ++ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf ++} + + case "$1" in +- deconfig) +- /sbin/ifconfig $interface 0.0.0.0 +- ;; +- +- renew|bound) +- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK +- +- if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do +- : +- done +- +- metric=0 +- for i in $router ; do +- route add default gw $i dev $interface metric $((metric++)) +- done ++deconfig) ++ # Bring the interface up (without inet at this point) ++ ifconfig "$interface" up;; ++ ++renew|bound) ++ bind;; ++ ++leasefail) ++ # Pull the values from the config data if (only only if) this ++ # is the config interface ++ if test "$interface" = "$(config iface)" ++ then ++ ip="$(config ip)" ++ if test -n "$ip" ++ then ++ router="$(config gateway)" ++ subnet="$(config netmask)" ++ broadcast="$(config broadcast)" ++ domain="$(config domain)" ++ dns="$(config dns)" ++ ++ bind + fi ++ fi;; + +- echo -n > $RESOLV_CONF +- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF +- for i in $dns ; do +- echo adding dns $i +- echo nameserver $i >> $RESOLV_CONF +- done +- ;; ++*) echo "udhcpc: $*: unknown command" >&2 ++ exit 1;; + esac + + exit 0 diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 741df3f62d..61df8a9b1c 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1" +PR = "r1.1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://dhcp-hostname.patch;patch=1 \ -- cgit v1.2.3 From 0fd1a70f523a36b525055337d1963a9454b372b5 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 1 Sep 2006 01:48:58 +0000 Subject: linux: Add a 2.6.17 kernel for the pcengines WRAP (Wireless Router Application Platform) boards. These boards use a 233MHz AMD Geode SC1100 CPU (i486). --- .../linux/linux-wrap-geode-2.6.17/.mtn2git_empty | 0 packages/linux/linux-wrap-geode-2.6.17/defconfig | 1554 ++++++++++++++++++++ packages/linux/linux-wrap-geode_2.6.17.bb | 24 + 3 files changed, 1578 insertions(+) create mode 100644 packages/linux/linux-wrap-geode-2.6.17/.mtn2git_empty create mode 100644 packages/linux/linux-wrap-geode-2.6.17/defconfig create mode 100644 packages/linux/linux-wrap-geode_2.6.17.bb (limited to 'packages') diff --git a/packages/linux/linux-wrap-geode-2.6.17/.mtn2git_empty b/packages/linux/linux-wrap-geode-2.6.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-wrap-geode-2.6.17/defconfig b/packages/linux/linux-wrap-geode-2.6.17/defconfig new file mode 100644 index 0000000000..678c650307 --- /dev/null +++ b/packages/linux/linux-wrap-geode-2.6.17/defconfig @@ -0,0 +1,1554 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.17.1 +# Thu Aug 31 16:22:43 2006 +# +CONFIG_X86_32=y +CONFIG_SEMAPHORE_SLEEPERS=y +CONFIG_X86=y +CONFIG_MMU=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_DMI=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_VM86=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# Processor type and features +# +# CONFIG_SMP is not set +CONFIG_X86_PC=y +# CONFIG_X86_ELAN is not set +# CONFIG_X86_VOYAGER is not set +# CONFIG_X86_NUMAQ is not set +# CONFIG_X86_SUMMIT is not set +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_VISWS is not set +# CONFIG_X86_GENERICARCH is not set +# CONFIG_X86_ES7000 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_MWINCHIP2 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_X86_GENERIC is not set +CONFIG_X86_CMPXCHG=y +CONFIG_X86_XADD=y +CONFIG_X86_L1_CACHE_SHIFT=5 +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INVLPG=y +CONFIG_X86_BSWAP=y +CONFIG_X86_POPAD_OK=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_TSC=y +# CONFIG_HPET_TIMER is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +# CONFIG_X86_UP_APIC is not set +# CONFIG_X86_MCE is not set +# 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=m + +# +# Firmware Drivers +# +# CONFIG_EDD is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +CONFIG_NOHIGHMEM=y +# CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +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_SPLIT_PTLOCK_CPUS=4 +# CONFIG_MATH_EMULATION is not set +CONFIG_MTRR=y +# CONFIG_EFI is not set +CONFIG_REGPARM=y +# CONFIG_SECCOMP is not set +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +# CONFIG_KEXEC is not set +CONFIG_PHYSICAL_START=0x100000 + +# +# Power management options (ACPI, APM) +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set + +# +# ACPI (Advanced Configuration and Power Interface) Support +# +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +# CONFIG_ACPI_HOTKEY is not set +CONFIG_ACPI_FAN=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_THERMAL=y +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_IBM is not set +# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_EC=y +CONFIG_ACPI_POWER=y +CONFIG_ACPI_SYSTEM=y +CONFIG_X86_PM_TIMER=y +# CONFIG_ACPI_CONTAINER is not set + +# +# APM (Advanced Power Management) BIOS Support +# +# CONFIG_APM is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_STAT_DETAILS=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPUFreq processor drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +# CONFIG_X86_POWERNOW_K6 is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set +CONFIG_X86_GX_SUSPMOD=m +# 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 + +# +# shared options +# +# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set +# CONFIG_X86_SPEEDSTEP_LIB is not set + +# +# Bus options (PCI, PCMCIA, EISA, MCA, ISA) +# +CONFIG_PCI=y +# CONFIG_PCI_GOBIOS is not set +# CONFIG_PCI_GOMMCONFIG is not set +# CONFIG_PCI_GODIRECT is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCI_DEBUG is not set +CONFIG_ISA_DMA_API=y +# CONFIG_ISA is not set +# CONFIG_MCA is not set +CONFIG_SCx200=m + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_MISC=m + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=y +CONFIG_NET_KEY=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_FWMARK=y +CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +CONFIG_IP_VS=m +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +# CONFIG_IPV6_ROUTER_PREF is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_CT_ACCT=y +CONFIG_IP_NF_CONNTRACK_MARK=y +CONFIG_IP_NF_CONNTRACK_EVENTS=y +CONFIG_IP_NF_CONNTRACK_NETLINK=m +CONFIG_IP_NF_CT_PROTO_SCTP=m +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +CONFIG_IP_NF_NETBIOS_NS=m +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_IP_NF_NAT_SNMP_BASIC=m +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_AMANDA=m +CONFIG_IP_NF_NAT_PPTP=m +CONFIG_IP_NF_NAT_H323=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +CONFIG_BRIDGE_EBT_ULOG=m + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +# CONFIG_ATM_MPOA is not set +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +# CONFIG_DECNET is not set +CONFIG_LLC=m +# 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_NET_DIVERT=y +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CLK_JIFFIES=y +# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set +# CONFIG_NET_SCH_CLK_CPU is not set + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +CONFIG_CLS_U32_PERF=y +CONFIG_CLS_U32_MARK=y +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +CONFIG_GACT_PROB=y +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_IPT=m +CONFIG_NET_ACT_PEDIT=m +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_CLS_IND=y +CONFIG_NET_ESTIMATOR=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# +# CONFIG_PNP is not set + +# +# Block devices +# +# 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=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +# CONFIG_BLK_DEV_HD_IDE is not set +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_IDEDISK_MULTI_MODE=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_BLK_DEV_CMD640 is not set +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +# CONFIG_BLK_DEV_RZ1000 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +# 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_CY82C693 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_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +CONFIG_BLK_DEV_SC1200=y +# CONFIG_BLK_DEV_PIIX 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_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_IEEE1394 is not set + +# +# I2O device support +# +# CONFIG_I2O is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_IFB is not set +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set + +# +# Tulip family network device support +# +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +CONFIG_TULIP_MMIO=y +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +CONFIG_ULI526X=m +# CONFIG_HP100 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_DGRS is not set +# CONFIG_EEPRO100 is not set +# CONFIG_E100 is not set +# CONFIG_FEALNX is not set +CONFIG_NATSEMI=y +# CONFIG_NE2K_PCI is not set +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +# CONFIG_SIS900 is not set +# CONFIG_EPIC100 is not set +# CONFIG_SUNDANCE is not set +# CONFIG_TLAN is not set +# CONFIG_VIA_RHINE is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_E1000 is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2 is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +CONFIG_PRISM54=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +# CONFIG_BCM43XX is not set +CONFIG_NET_WIRELESS=y + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# ATM drivers +# +CONFIG_ATM_DUMMY=m +CONFIG_ATM_TCP=m +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +# CONFIG_ATM_FIRESTREAM is not set +# CONFIG_ATM_ZATM is not set +# CONFIG_ATM_NICSTAR is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E_MAYBE is not set +# CONFIG_ATM_HE is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Telephony Support +# +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=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_TSDEV 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_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC 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_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +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_LEGACY_PTYS is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +# 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_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_I8XX_TCO is not set +CONFIG_SC1200_WDT=m +CONFIG_SCx200_WDT=m +# CONFIG_60XX_WDT is not set +# CONFIG_SBC8360_WDT is not set +# CONFIG_CPU5_WDT is not set +# CONFIG_W83627HF_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 +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +CONFIG_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_SONYPI is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_MWAVE is not set +CONFIG_SCx200_GPIO=m +CONFIG_CS5535_GPIO=m +# CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set +# CONFIG_HANGCHECK_TIMER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m + +# +# I2C Hardware Bus support +# +# 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 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +CONFIG_SCx200_I2C=m +CONFIG_SCx200_I2C_SCL=12 +CONFIG_SCx200_I2C_SDA=13 +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +CONFIG_SENSORS_DS1374=m +CONFIG_SENSORS_EEPROM=m +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 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 + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=m +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +CONFIG_SENSORS_LM77=m +# 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_MAX1619 is not set +# CONFIG_SENSORS_PC87360 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_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# +# CONFIG_IBM_ASM is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +# CONFIG_FB is not set +# CONFIG_VIDEO_SELECT is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_DUMMY_CONSOLE=y + +# +# Sound +# +# CONFIG_SOUND is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +# CONFIG_USB_GADGET is not set + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# LED devices +# +# CONFIG_NEW_LEDS is not set + +# +# LED drivers +# + +# +# LED Triggers +# + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# +# CONFIG_EDAC is not set + +# +# Real Time Clock +# +# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y +# CONFIG_REISERFS_CHECK is not set +CONFIG_REISERFS_PROC_INFO=y +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +CONFIG_JFS_SECURITY=y +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +# CONFIG_XFS_RT is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_QUOTA=y +# CONFIG_QFMT_V1 is not set +CONFIG_QFMT_V2=y +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +# 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=m +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_XATTR=y +CONFIG_CIFS_POSIX=y +# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +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 is not set +CONFIG_NLS_ISO8859_1=m +# 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=m + +# +# Instrumentation Support +# +# CONFIG_PROFILING is not set +# CONFIG_KPROBES is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=17 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_FRAME_POINTER is not set +# CONFIG_UNWIND_INFO is not set +# CONFIG_FORCED_INLINING is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_EARLY_PRINTK=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +CONFIG_STACK_BACKTRACE_COLS=2 +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUG_RODATA is not set +CONFIG_4KSTACKS=y +CONFIG_DOUBLEFAULT=y + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# +# CONFIG_CRYPTO_DEV_PADLOCK is not set + +# +# Library routines +# +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_X86_BIOS_REBOOT=y +CONFIG_KTIME_SCALAR=y diff --git a/packages/linux/linux-wrap-geode_2.6.17.bb b/packages/linux/linux-wrap-geode_2.6.17.bb new file mode 100644 index 0000000000..d02aca79f7 --- /dev/null +++ b/packages/linux/linux-wrap-geode_2.6.17.bb @@ -0,0 +1,24 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for PC-Engines WRAP which are \ +Geode SC1100 (i486) based wirless router appliance boards" +LICENSE = "GPL" +MAINTAINER = "Jamie Lenehan +PR = "r0" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://defconfig" +S = "${WORKDIR}/linux-${PV}" + +COMPATIBLE_HOST = 'i486.*-linux' +COMPATIBLE_MACHINE = "wrap" + +inherit kernel + +ARCH = "i386" +KERNEL_IMAGETYPE = "bzImage" +KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config + yes '' | oe_runmake oldconfig +} -- cgit v1.2.3 From 97f3f6619a1ef68599977240b181b0be205b35fb Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 1 Sep 2006 02:20:24 +0000 Subject: groff 1.19.2: The install task was failing because groff refuses to install into the specified prefix (${D} in this case) unless that directory already exists. So modify to manually create ${D} in the install task. Its not clear what change broke this but it appears that ${D} used to be created automatically but this is no longer occuring. --- packages/groff/groff_1.19.2.bb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/groff/groff_1.19.2.bb b/packages/groff/groff_1.19.2.bb index 24cc5eadea..c012376c0c 100644 --- a/packages/groff/groff_1.19.2.bb +++ b/packages/groff/groff_1.19.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNU roff" SECTION = "base" LICENSE = "GPL" MAINTAINER = "Inge Arnesen " -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.gnu.org/gnu/groff/groff-${PV}.tar.gz \ file://Makefile.in.patch;patch=1 \ @@ -15,11 +15,14 @@ PARALLEL_MAKE = "" EXTRA_OECONF="--prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}/info" inherit autotools -do_configure () { +do_configure() { oe_runconf } -#do_install() { -# oe_runmake 'PREFIX=${D}' install -#} - +# +# The installer refuses to do anything if the prefix directory does not +# already exist, so create it manually before the standard install runs. +# +do_install_prepend() { + install -m 0755 -d ${D} +} -- cgit v1.2.3 From e84cdb4039e927ad32f7b0662b381f9ec7477e8e Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 1 Sep 2006 02:35:39 +0000 Subject: ebtables 2.0.6: Patch to enable compiling with gcc 4.x. Tested with gcc 4.1.1 and 3.4.4. --- packages/ebtables/ebtables-2.0.6/gcc4.patch | 67 +++++++++++++++++++++++++++++ packages/ebtables/ebtables_2.0.6.bb | 3 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 packages/ebtables/ebtables-2.0.6/gcc4.patch (limited to 'packages') diff --git a/packages/ebtables/ebtables-2.0.6/gcc4.patch b/packages/ebtables/ebtables-2.0.6/gcc4.patch new file mode 100644 index 0000000000..6b3688a3d9 --- /dev/null +++ b/packages/ebtables/ebtables-2.0.6/gcc4.patch @@ -0,0 +1,67 @@ +--- ebtables-v2.0.6/extensions/ebt_ip.c 2006/09/01 02:27:02 1.1 ++++ ebtables-v2.0.6/extensions/ebt_ip.c 2006/09/01 02:27:30 +@@ -313,7 +313,7 @@ + ipinfo->invflags |= EBT_IP_PROTO; + if (optind > argc) + print_error("Missing IP protocol argument"); +- (unsigned char) i = strtoul(argv[optind - 1], &end, 10); ++ i = strtoul(argv[optind - 1], &end, 10); + if (*end != '\0') { + struct protoent *pe; + +--- ebtables-v2.0.6/extensions/ebt_vlan.c 2006/09/01 02:27:38 1.1 ++++ ebtables-v2.0.6/extensions/ebt_vlan.c 2006/09/01 02:28:01 +@@ -141,7 +141,7 @@ + check_option(flags, OPT_VLAN_ID); + CHECK_INV_FLAG(EBT_VLAN_ID); + CHECK_IF_MISSING_VALUE; +- (unsigned short) local.id = ++ local.id = + strtoul(argv[optind - 1], &end, 10); + CHECK_RANGE(local.id > 4094 || *end != '\0'); + vlaninfo->id = local.id; +@@ -152,7 +152,7 @@ + check_option(flags, OPT_VLAN_PRIO); + CHECK_INV_FLAG(EBT_VLAN_PRIO); + CHECK_IF_MISSING_VALUE; +- (unsigned char) local.prio = ++ local.prio = + strtoul(argv[optind - 1], &end, 10); + CHECK_RANGE(local.prio >= 8 || *end != '\0'); + vlaninfo->prio = local.prio; +@@ -163,7 +163,7 @@ + check_option(flags, OPT_VLAN_ENCAP); + CHECK_INV_FLAG(EBT_VLAN_ENCAP); + CHECK_IF_MISSING_VALUE; +- (unsigned short) local.encap = ++ local.encap = + strtoul(argv[optind - 1], &end, 16); + if (*end != '\0') { + ethent = getethertypebyname(argv[optind - 1]); +--- ebtables-v2.0.6/extensions/ebt_limit.c 2006/09/01 02:28:09 1.1 ++++ ebtables-v2.0.6/extensions/ebt_limit.c 2006/09/01 02:30:21 +@@ -203,15 +203,15 @@ + + static struct ebt_u_match limit_match = + { +- .name EBT_LIMIT_MATCH, +- .size sizeof(struct ebt_limit_info), +- .help print_help, +- .init init, +- .parse parse, +- .final_check final_check, +- .print print, +- .compare compare, +- .extra_ops opts, ++ .name = EBT_LIMIT_MATCH, ++ .size = sizeof(struct ebt_limit_info), ++ .help = print_help, ++ .init = init, ++ .parse = parse, ++ .final_check = final_check, ++ .print = print, ++ .compare = compare, ++ .extra_ops = opts, + }; + + static void _init(void) __attribute((constructor)); diff --git a/packages/ebtables/ebtables_2.0.6.bb b/packages/ebtables/ebtables_2.0.6.bb index 3c5d17dacb..318dd664a1 100644 --- a/packages/ebtables/ebtables_2.0.6.bb +++ b/packages/ebtables/ebtables_2.0.6.bb @@ -3,10 +3,11 @@ PRIORITY = "optional" MAINTAINER = "Ned Ludd " LICENSE = "GPL" SECTION = "console/network" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://gcc34.patch;patch=1 \ + file://gcc4.patch;patch=1 \ file://installnonroot.patch;patch=1 \ file://installcreatedirs.patch;patch=1" S = "${WORKDIR}/ebtables-v${PV}" -- cgit v1.2.3 From 5e10324e5e797c6e20c9c2db60538de1f983a8ac Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 1 Sep 2006 12:23:14 +0000 Subject: libnss-mdns-0.8: fix the postinst script --- packages/libnss-mdns/libnss-mdns_0.8.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb index 475297cd63..a4a9cd00d1 100644 --- a/packages/libnss-mdns/libnss-mdns_0.8.bb +++ b/packages/libnss-mdns/libnss-mdns_0.8.bb @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" RRECOMMENDS_${PN} = "zeroconf" -PR = "r0" +PR = "r1" EXTRA_OECONF = "--libdir=/lib" S = "${WORKDIR}/nss-mdns-${PV}" @@ -15,6 +15,10 @@ SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" inherit autotools pkg_postinst () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf mv /tmp/nsswitch.conf /etc/nsswitch.conf -- cgit v1.2.3 From 8f5586abb4a12e38c42aa2ab08f472933105c93e Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 1 Sep 2006 12:26:23 +0000 Subject: libnss-mdns: drop old versions --- packages/libnss-mdns/files/.mtn2git_empty | 0 packages/libnss-mdns/files/alignment-fix.patch | 11 ---------- packages/libnss-mdns/libnss-mdns_0.6.bb | 30 -------------------------- packages/libnss-mdns/libnss-mdns_0.7.bb | 29 ------------------------- 4 files changed, 70 deletions(-) delete mode 100644 packages/libnss-mdns/files/.mtn2git_empty delete mode 100644 packages/libnss-mdns/files/alignment-fix.patch delete mode 100644 packages/libnss-mdns/libnss-mdns_0.6.bb delete mode 100644 packages/libnss-mdns/libnss-mdns_0.7.bb (limited to 'packages') diff --git a/packages/libnss-mdns/files/.mtn2git_empty b/packages/libnss-mdns/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libnss-mdns/files/alignment-fix.patch b/packages/libnss-mdns/files/alignment-fix.patch deleted file mode 100644 index 11d4655e1f..0000000000 --- a/packages/libnss-mdns/files/alignment-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nss-mdns-0.6/src/nss.c.orig 2005-09-25 17:27:51 +0200 -+++ nss-mdns-0.6/src/nss.c 2005-09-25 17:28:55 +0200 -@@ -456,6 +456,8 @@ - result->h_addrtype = af; - result->h_length = address_length; - -+ idx+=(sizeof(char*)-idx%sizeof(char*)); /* Align on 32 bit boundary */ -+ - /* Check if there's enough space for the addresses */ - if (buflen < idx+u.data_len+sizeof(char*)*(u.count+1)) { - *errnop = ERANGE; diff --git a/packages/libnss-mdns/libnss-mdns_0.6.bb b/packages/libnss-mdns/libnss-mdns_0.6.bb deleted file mode 100644 index 5de9df567c..0000000000 --- a/packages/libnss-mdns/libnss-mdns_0.6.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "NSS module for Multicast DNS name resolution" -HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" - -RRECOMMENDS_${PN} = "zeroconf" -PR = "r1" - -EXTRA_OECONF = "--libdir=/lib" -S = "${WORKDIR}/nss-mdns-${PV}" - -SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz \ - file://alignment-fix.patch;patch=1" - -inherit autotools - -pkg_postinst () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} - -pkg_prerm () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns/\1/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} diff --git a/packages/libnss-mdns/libnss-mdns_0.7.bb b/packages/libnss-mdns/libnss-mdns_0.7.bb deleted file mode 100644 index 98ab50f07f..0000000000 --- a/packages/libnss-mdns/libnss-mdns_0.7.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "NSS module for Multicast DNS name resolution" -HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" - -RRECOMMENDS_${PN} = "zeroconf" -PR = "r0" - -EXTRA_OECONF = "--libdir=/lib" -S = "${WORKDIR}/nss-mdns-${PV}" - -SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" - -inherit autotools - -pkg_postinst () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/hosts:\s*files dns/& mdns4/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} - -pkg_prerm () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files dns\) mdns4*/\1/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} -- cgit v1.2.3 From a2ce37c9a8834aa29c6a717b045588f15b65d2eb Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 1 Sep 2006 13:05:31 +0000 Subject: busybox: Fixup missing option in slugos busybox defconfig. Bump PR --- packages/busybox/busybox-1.2.1/slugos/defconfig | 2 ++ packages/busybox/busybox_1.2.1.bb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index 55aa5f3b5e..b5ff84550a 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -32,6 +32,8 @@ EXTRA_CFLAGS_OPTIONS="" # # CONFIG_INSTALL_NO_USR is not set PREFIX="./_install" +CONFIG_INSTALL_APPLET_SYMLINKS=y +CONFIG_INSTALL_APPLET_HARDLINKS=n # # Archival Utilities diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 61df8a9b1c..74c69319f4 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1.1" +PR = "r1.2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://dhcp-hostname.patch;patch=1 \ -- cgit v1.2.3 From 576f0b02a7a5d19dcd3a60593bc2fde9578e3fd3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:34:24 +0000 Subject: freeciv: Add proper SECTION definition. --- packages/freeciv/freeciv_2.0.8.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/freeciv/freeciv_2.0.8.bb b/packages/freeciv/freeciv_2.0.8.bb index 361d8e4c20..accdc47af9 100644 --- a/packages/freeciv/freeciv_2.0.8.bb +++ b/packages/freeciv/freeciv_2.0.8.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Freeciv is a free turn-based multiplayer strategy game, in which each player becomes the leader of a civilization, fighting to obtain the ultimate goal: To become the greatest civilization." +SECTION = "games" LICENSE = "GPL" MAINTAINER = "Koen Kooi " DEPENDS = "gtk+ cairo esound zlib readline" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" -- cgit v1.2.3 From e10a5a9fe3bd597a58bfad33f2f313ed7d1d2898 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:43:06 +0000 Subject: gpe-soundbite: Adjust SECTION to gpe/multimedia. --- packages/gpe-soundbite/gpe-soundbite_1.0.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb b/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb index 90a8a823a5..a38a721aa7 100644 --- a/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb +++ b/packages/gpe-soundbite/gpe-soundbite_1.0.6.bb @@ -5,6 +5,6 @@ SRC_URI += "file://makefile-fix.patch;patch=1" DESCRIPTION = "GPE audio Recorder" DEPENDS = "gtk+ libgpewidget libglade libgsm gpe-soundserver" -SECTION = "gpe" +SECTION = "gpe/multimedia" PRIORITY = "optional" LDFLAGS_append = "-Wl,--export-dynamic" -- cgit v1.2.3 From dccd30d481e2e8c9361adbf0b65ac6d7ab579fe3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:46:57 +0000 Subject: xdemineur: Adjust SECTION to gpe/games. --- packages/xdemineur/xdemineur_2.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xdemineur/xdemineur_2.1.1.bb b/packages/xdemineur/xdemineur_2.1.1.bb index 8c1e8ae206..73e3276aac 100644 --- a/packages/xdemineur/xdemineur_2.1.1.bb +++ b/packages/xdemineur/xdemineur_2.1.1.bb @@ -2,7 +2,7 @@ inherit gpe LICENSE = "BSD-X" DEPENDS = "virtual/libx11 libxpm" -SECTION = "gpe" +SECTION = "gpe/games" DESCRIPTION = "Mine-sweeper game for GPE." PRIORITY = "optional" -- cgit v1.2.3 From 5e117926153aaf95c9d08fe91037ab82b4b56d44 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:48:47 +0000 Subject: gpe-othello: Adjust SECTION to gpe/games. --- packages/gpe-othello/gpe-othello_0.2-1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-othello/gpe-othello_0.2-1.bb b/packages/gpe-othello/gpe-othello_0.2-1.bb index a1ceb60157..43d9a197f4 100644 --- a/packages/gpe-othello/gpe-othello_0.2-1.bb +++ b/packages/gpe-othello/gpe-othello_0.2-1.bb @@ -2,7 +2,8 @@ inherit gpe DESCRIPTION = "An Othello clone using GTK, hacked from ugothello." DEPENDS = "gtk+ libgpewidget gpe-icons" -SECTION = "gpe" +SECTION = "gpe/games" PRIORITY = "optional" +PR = "r1" SRC_URI += "file://fix-makefiles.patch;patch=1" -- cgit v1.2.3 From d609c9e162caf6a59328b5622bd64cef3ef8bc63 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:51:21 +0000 Subject: gpe-lights: Adjust SECTION to gpe/games. --- packages/gpe-lights/gpe-lights_0.12.bb | 3 ++- packages/gpe-lights/gpe-lights_0.13.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpe-lights/gpe-lights_0.12.bb b/packages/gpe-lights/gpe-lights_0.12.bb index 67f0ed60e0..4b09058565 100644 --- a/packages/gpe-lights/gpe-lights_0.12.bb +++ b/packages/gpe-lights/gpe-lights_0.12.bb @@ -3,7 +3,8 @@ LICENSE = "PD" DESCRIPTION = "A simple light puzzle." DEPENDS = "gtk+ libgpewidget gpe-icons" -SECTION = "gpe" +SECTION = "gpe/games" PRIORITY = "optional" +PR = "r1" SRC_URI += "file://fix-makefiles.patch;patch=1" diff --git a/packages/gpe-lights/gpe-lights_0.13.bb b/packages/gpe-lights/gpe-lights_0.13.bb index 67f0ed60e0..4b09058565 100644 --- a/packages/gpe-lights/gpe-lights_0.13.bb +++ b/packages/gpe-lights/gpe-lights_0.13.bb @@ -3,7 +3,8 @@ LICENSE = "PD" DESCRIPTION = "A simple light puzzle." DEPENDS = "gtk+ libgpewidget gpe-icons" -SECTION = "gpe" +SECTION = "gpe/games" PRIORITY = "optional" +PR = "r1" SRC_URI += "file://fix-makefiles.patch;patch=1" -- cgit v1.2.3 From 1b6fc7326987f24d91f939e31db89b5657145277 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 16:53:45 +0000 Subject: gpe-life: Adjust SECTION to gpe/games. --- packages/gpe-life/gpe-life_0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-life/gpe-life_0.2.bb b/packages/gpe-life/gpe-life_0.2.bb index c9efc27f64..82ab1b1fc4 100644 --- a/packages/gpe-life/gpe-life_0.2.bb +++ b/packages/gpe-life/gpe-life_0.2.bb @@ -2,7 +2,8 @@ DESCRIPTION = "Conway's Game of Life for GPE" LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Rene Wagner " -SECTION = "gpe" +SECTION = "gpe/games" +PR = "r1" DEPENDS = "glib-2.0 gtk+ libglade" -- cgit v1.2.3 From bfa9cfcaf6fbf4b42eae72f407c4bdb04ed6f31e Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 1 Sep 2006 17:02:05 +0000 Subject: Provides the latest hh.org 2.4 kernel for strongarm based handhelds. --- .../.mtn2git_empty | 0 .../defconfig-h3600 | 1475 ++++++++++++++++++++ .../linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb | 57 + 3 files changed, 1532 insertions(+) create mode 100644 packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty create mode 100644 packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 create mode 100644 packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb (limited to 'packages') diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 new file mode 100644 index 0000000000..ad30591336 --- /dev/null +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh42/defconfig-h3600 @@ -0,0 +1,1475 @@ +# +# Automatically generated by make menuconfig: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +CONFIG_ARCH_SA1100=y +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +CONFIG_SA1100_H3100=y +CONFIG_SA1100_H3600=y +CONFIG_SA1100_H3800=y +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +CONFIG_SA1100_USB=m +CONFIG_SA1100_USB_NETLINK=m +CONFIG_SA1100_USB_CHAR=m +CONFIG_REGISTERS=m + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +# CONFIG_ARCH_H3900 is not set +# CONFIG_ARCH_H1900 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_ARCH_H2200 is not set +# CONFIG_ARCH_AXIM is not set +# CONFIG_PXA_USB is not set +# CONFIG_PXA_USB_NETLINK is not set +# CONFIG_PXA_USB_CHAR is not set + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +CONFIG_CPU_SA1100=y +# CONFIG_CPU_32v3 is not set +CONFIG_CPU_32v4=y +CONFIG_SA1100_IPAQ=y +# CONFIG_PXA_IPAQ is not set +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +CONFIG_H3600_MICRO=m +CONFIG_IPAQ_HAS_ROSELLA=y +# CONFIG_IPAQ_HAS_ASIC3 is not set +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=y +# CONFIG_H5400_ASIC is not set +# CONFIG_H1900_ASIC is not set +# CONFIG_H1900_TS is not set +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set +CONFIG_DISCONTIGMEM=y + +# +# General setup +# +# CONFIG_PCI is not set +CONFIG_ISA=y +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +CONFIG_PCMCIA_SA1100=m +# CONFIG_PCMCIA_PXA is not set +CONFIG_MERCURY_BACKPAQ=m + +# +# MMC/SD Card support +# +CONFIG_MMC=m +CONFIG_MMC_DEBUG=y +CONFIG_MMC_DEBUG_VERBOSE=0 +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +CONFIG_HWTIMER=m +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +# CONFIG_LEDS is not set +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLKMTD=m +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_AIRO is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m +# CONFIG_DONGLE is not set +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_SA1100_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=m +# CONFIG_IDE_TASK_IOCTL is not set +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +CONFIG_CHR_DEV_ST=m +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=m +CONFIG_PCMCIA_NINJA_SCSI=m +CONFIG_PCMCIA_QLOGIC=m + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +CONFIG_ISDN=m +CONFIG_ISDN_BOOL=y +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y + +# +# ISDN feature submodules +# +CONFIG_ISDN_DRV_LOOP=m +CONFIG_ISDN_DIVERSION=m + +# +# Passive ISDN cards +# +CONFIG_ISDN_DRV_HISAX=m +CONFIG_ISDN_HISAX=y +CONFIG_HISAX_EURO=y +# CONFIG_DE_AOC is not set +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 +# CONFIG_HISAX_16_0 is not set +CONFIG_HISAX_16_3=y +# CONFIG_HISAX_TELESPCI is not set +# CONFIG_HISAX_S0BOX is not set +# CONFIG_HISAX_AVM_A1 is not set +# CONFIG_HISAX_FRITZPCI is not set +# CONFIG_HISAX_AVM_A1_PCMCIA is not set +# CONFIG_HISAX_ELSA is not set +# CONFIG_HISAX_IX1MICROR2 is not set +# CONFIG_HISAX_DIEHLDIVA is not set +# CONFIG_HISAX_ASUSCOM is not set +# CONFIG_HISAX_TELEINT is not set +# CONFIG_HISAX_HFCS is not set +# CONFIG_HISAX_SEDLBAUER is not set +# CONFIG_HISAX_SPORTSTER is not set +# CONFIG_HISAX_MIC is not set +# CONFIG_HISAX_NETJET is not set +# CONFIG_HISAX_NETJET_U is not set +# CONFIG_HISAX_NICCY is not set +# CONFIG_HISAX_ISURF is not set +# CONFIG_HISAX_HSTSAPHIR is not set +# CONFIG_HISAX_BKM_A4T is not set +# CONFIG_HISAX_SCT_QUADRO is not set +# CONFIG_HISAX_GAZEL is not set +# CONFIG_HISAX_HFC_PCI is not set +# CONFIG_HISAX_W6692 is not set +CONFIG_HISAX_HFC_SX=y +# CONFIG_HISAX_DEBUG is not set +CONFIG_HISAX_SEDLBAUER_CS=m +CONFIG_HISAX_ELSA_CS=m +# CONFIG_HISAX_AVM_A1_CS is not set +CONFIG_HISAX_ST5481=m +# CONFIG_HISAX_FRITZ_PCIPNP is not set + +# +# Active ISDN cards +# +# CONFIG_ISDN_DRV_ICN is not set +# CONFIG_ISDN_DRV_PCBIT is not set +# CONFIG_ISDN_DRV_SC is not set +# CONFIG_ISDN_DRV_ACT2000 is not set +# CONFIG_ISDN_DRV_EICON is not set +# CONFIG_ISDN_DRV_TPAM is not set +CONFIG_ISDN_CAPI=m +# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set +# CONFIG_ISDN_CAPI_MIDDLEWARE is not set +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIDRV=m +# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set +# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set +# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set +# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +# CONFIG_ISDN_DRV_AVMB1_AVM_CS is not set +# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set +# CONFIG_ISDN_DRV_AVMB1_C4 is not set +# CONFIG_HYSDN is not set +# CONFIG_HYSDN_CAPI is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=m +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +CONFIG_SERIAL_SA1100=y +CONFIG_SERIAL_SA1100_CONSOLE=y +CONFIG_SA1100_DEFAULT_BAUDRATE=115200 +CONFIG_SERIAL_H3800_ASIC=m +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +CONFIG_NEWTONKBD=m +CONFIG_SA1100_PROFILER=m +CONFIG_TOUCHSCREEN_H3600=m +CONFIG_H3600_BACKPAQ_FPGA=m +CONFIG_H3600_BACKPAQ_ACCEL=m +CONFIG_H3600_BACKPAQ_GASGAUGE=m +CONFIG_H3600_BACKPAQ_SRAM=m +CONFIG_H3600_BACKPAQ_AUDIO=m +CONFIG_H3600_STOWAWAY=m +CONFIG_H3800_MICROKBD=m +CONFIG_SA1100_LIRC=m +# CONFIG_H5400_BUZZER is not set +# CONFIG_H5400_FSI is not set + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# L3 serial bus support +# +CONFIG_L3=y +CONFIG_L3_ALGOBIT=y +CONFIG_L3_BIT_SA1100_GPIO=y +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +CONFIG_L3_BACKPAQ=m +CONFIG_BIT_SA1100_GPIO=y + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +CONFIG_SA1100_WATCHDOG=m +# CONFIG_PXA_WATCHDOG is not set +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_SA1100_RTC=m +# CONFIG_PXA_RTC_HACK is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +CONFIG_VIDEO_H3600_BACKPAQ=m +# CONFIG_VIDEO_HAWKEYE is not set +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +# CONFIG_JFFS2_FS_NAND is not set +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +CONFIG_UDF_FS=m +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +CONFIG_CODA_FS=m +CONFIG_INTERMEZZO_FS=m +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_ZISOFS_FS=m + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +CONFIG_FB_SA1100=y +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +# CONFIG_FB_PXA is not set +# CONFIG_FB_MQ1100 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +CONFIG_FBCON_CFB4=y +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +CONFIG_FBCON_FONTWIDTH8_ONLY=y +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_SA1100=m +CONFIG_SOUND_UDA1341=m +# CONFIG_SOUND_SA1100_MONO is not set +# CONFIG_SOUND_ASSABET_UDA1341 is not set +CONFIG_SOUND_H3600_UDA1341=m +# CONFIG_SOUND_PANGOLIN_UDA1341 is not set +# CONFIG_SOUND_SA1111_UDA1341 is not set +# CONFIG_SOUND_SA1100SSP is not set +# CONFIG_SOUND_OSS is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +# CONFIG_SOUND_PXA_AC97 is not set +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +CONFIG_SWITCHES=m +CONFIG_SWITCHES_SA1100=y + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +CONFIG_USB_DEVICEFS=y +CONFIG_USB_BANDWIDTH=y +# CONFIG_USB_LONG_TIMEOUT is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +# CONFIG_USB_OHCI is not set +# CONFIG_USB_OHCI_SA1111 is not set +# CONFIG_USB_OHCI_H5400 is not set +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m +CONFIG_USB_AUDIO=m +CONFIG_USB_EMI26=m +CONFIG_USB_BLUETOOTH=m +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +CONFIG_USB_STORAGE_HP8200e=y +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_JUMPSHOT=y +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +CONFIG_USB_HIDDEV=y +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_WACOM=m +CONFIG_USB_DC2XX=m +CONFIG_USB_MDC800=m +CONFIG_USB_SCANNER=m +CONFIG_USB_MICROTEK=m +CONFIG_USB_HPUSBSCSI=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +CONFIG_USB_QC=m +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +CONFIG_USB_DSBR=m +CONFIG_USB_DABUSB=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_KAWETH=m +CONFIG_USB_CATC=m +CONFIG_USB_CDCETHER=m +CONFIG_USB_USBNET=m +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_RIO500=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_BRLVGER=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +# CONFIG_BLUEZ_CMTP is not set + +# +# Bluetooth device drivers +# +# CONFIG_BLUEZ_HCIUSB is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +CONFIG_BLUEZ_HCIVHCI=m + +# +# Kernel hacking +# +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +CONFIG_CRC32=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb new file mode 100644 index 0000000000..a3d54d1319 --- /dev/null +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh42.bb @@ -0,0 +1,57 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." +MAINTAINER = "Rene Wagner " +LICENSE = "GPL" +PR = "r0" +DEFAULT_PREFERENCE = "-1" + +KERNEL_CCSUFFIX = "-3.3.4" +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3600|simpad)' + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig-${PACKAGE_ARCH} \ + file://ipaq-hal.init" + +S = "${WORKDIR}/kernel" + +inherit kernel update-rc.d + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +RMKV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}" +PXAV = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}" + +module_conf_h3600_micro = "alias ipaq_hal_3600 h3600_micro" +module_conf_h3600_asic = "alias ipaq_hal_3800 h3600_asic" +module_conf_sa1100_ir = "alias irda0 sa1100_ir" +module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1" +module_conf_ppp_async = "alias ppp0 ppp_async" +module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1" +module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1" +module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1" + +module_autoload_h3600_ts = "h3600_ts" +module_autoload_apm = "apm" +module_autoload_h3600-uda1341 = "h3600-uda1341" +module_autoload_af_packet = "af_packet" +module_autoload_ppp_async = "ppp_async" +module_autoload_usb-eth = "usb-eth" + +FILES_kernel += "/etc/init.d/ipaq-hal" +INITSCRIPT_NAME = "ipaq-hal" +INITSCRIPT_PARAMS = "start 21 S ." + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config +} + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal +} -- cgit v1.2.3 From f42a4c6fe7b0250c33335171c8534e9a3174d3da Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 1 Sep 2006 17:06:23 +0000 Subject: gpe-package: Make minor tweaks associated to familiar 0.8.4 release * Use variables instead of hard coded directory paths * Rework DEPENDS and RDEPENDS --- packages/gpe-package/gpe-package_0.3.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb index a6342f4e18..4de6e056df 100644 --- a/packages/gpe-package/gpe-package_0.3.bb +++ b/packages/gpe-package/gpe-package_0.3.bb @@ -3,8 +3,8 @@ PR = "r3" inherit gpe pkgconfig DESCRIPTION = "A package manager GUI for GPE" -DEPENDS = "ipkg pcre libgpewidget gpe-su" -RDEPENDS = "gpe-icons" +DEPENDS = "ipkg pcre libgpewidget" +RDEPENDS = "gpe-icons gpe-su" SECTION = "gpe" PRIORITY = "optional" @@ -18,6 +18,6 @@ CFLAGS += "-DENABLE_PCRE" LDFLAGS += "-lpcre" do_install_append() { - install -d ${D}/usr/bin - install -m 0755 ${WORKDIR}/gpe-package ${D}/usr/bin + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/gpe-package ${D}${bindir} } -- cgit v1.2.3 From bea2e753e4dd603050387685aa8374ae88f233cf Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 17:17:28 +0000 Subject: abiword, abiword-plugins: Add SECTION = "gnome" (or should this be "gpe"? I guess, no, until it is patched to support GPE/handhelds better). --- packages/abiword/abiword-plugins_2.4.4.bb | 3 ++- packages/abiword/abiword-plugins_2.4.5.bb | 3 ++- packages/abiword/abiword_2.4.4.bb | 3 ++- packages/abiword/abiword_2.4.5.bb | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb index 612e81f80f..541c893471 100644 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ b/packages/abiword/abiword-plugins_2.4.4.bb @@ -1,10 +1,11 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +SECTION = "gnome" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" DEPENDS = "abiword libwpd librsvg goffice poppler" -PR="r1" +PR="r2" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index 75861792dd..68c6c19742 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -1,10 +1,11 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +SECTION = "gnome" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" DEPENDS = "abiword libwpd librsvg goffice poppler" -PR="r0" +PR="r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb index 8f6c3adeb6..7798626b7a 100644 --- a/packages/abiword/abiword_2.4.4.bb +++ b/packages/abiword/abiword_2.4.4.bb @@ -1,4 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +SECTION = "gnome" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" @@ -6,7 +7,7 @@ LICENSE="GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r0" +PR="r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" S = "${WORKDIR}/abiword-${PV}/abi" diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb index 8f6c3adeb6..7798626b7a 100644 --- a/packages/abiword/abiword_2.4.5.bb +++ b/packages/abiword/abiword_2.4.5.bb @@ -1,4 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +SECTION = "gnome" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" @@ -6,7 +7,7 @@ LICENSE="GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r0" +PR="r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" S = "${WORKDIR}/abiword-${PV}/abi" -- cgit v1.2.3 From 5d66761dcbccbcbc8b635353c341e07f6423ecff Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 1 Sep 2006 17:34:18 +0000 Subject: abiword, abiword-plugins: Setting new SECTION="gnome/office", suggested by Koen Kooi. --- packages/abiword/abiword-plugins_2.4.4.bb | 2 +- packages/abiword/abiword-plugins_2.4.5.bb | 2 +- packages/abiword/abiword_2.4.4.bb | 2 +- packages/abiword/abiword_2.4.5.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb index 541c893471..3573e87089 100644 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ b/packages/abiword/abiword-plugins_2.4.4.bb @@ -1,5 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome" +SECTION = "gnome/office" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index 68c6c19742..444b0a43c7 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -1,5 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome" +SECTION = "gnome/office" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb index 7798626b7a..1df0303634 100644 --- a/packages/abiword/abiword_2.4.4.bb +++ b/packages/abiword/abiword_2.4.4.bb @@ -1,5 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome" +SECTION = "gnome/office" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb index 7798626b7a..1df0303634 100644 --- a/packages/abiword/abiword_2.4.5.bb +++ b/packages/abiword/abiword_2.4.5.bb @@ -1,5 +1,5 @@ DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome" +SECTION = "gnome/office" HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" -- cgit v1.2.3 From dbfe597f0d9b9c8837dc6a28c0adfea4b281d46c Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 1 Sep 2006 18:26:01 +0000 Subject: busybox 1.00: Incorporate fixes from familiar 0.8.4 release * Add --oknodo argument to start-stop-daemon * df fixes * unzip and libuncompress fixes backported from 1.1.0 * bump rev to r37 since familiar 0.8.4 shipped with r36 --- packages/busybox/busybox-1.00/df.patch | 28 + .../start-stop-daemon-oknodo-support.patch | 73 ++ .../busybox/busybox-1.00/unzip-endian-fixes.patch | 54 ++ .../busybox-1.00/unzip-enhancement-and-fixes.patch | 878 +++++++++++++++++++++ packages/busybox/busybox_1.00.bb | 7 +- 5 files changed, 1039 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/busybox-1.00/df.patch create mode 100644 packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch create mode 100644 packages/busybox/busybox-1.00/unzip-endian-fixes.patch create mode 100644 packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch (limited to 'packages') diff --git a/packages/busybox/busybox-1.00/df.patch b/packages/busybox/busybox-1.00/df.patch new file mode 100644 index 0000000000..49888293fd --- /dev/null +++ b/packages/busybox/busybox-1.00/df.patch @@ -0,0 +1,28 @@ +--- busybox-1.00/coreutils/df.c.orig 2006-07-14 09:50:47.914912750 -0400 ++++ busybox-1.00/coreutils/df.c 2006-07-14 09:52:32.613456000 -0400 +@@ -60,6 +60,7 @@ + struct statfs s; + static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + const char *disp_units_hdr = hdr_1k; ++ int root_done = 0; + + #ifdef CONFIG_FEATURE_HUMAN_READABLE + bb_opt_complementaly = "h-km:k-hm:m-hk"; +@@ -125,14 +126,14 @@ + ) / (blocks_used + s.f_bavail); + } + +- if (strcmp(device, "rootfs") == 0) { +- continue; +- } else if (strcmp(device, "/dev/root") == 0) { ++ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { ++ if (root_done) continue; + /* Adjusts device to be the real root device, + * or leaves device alone if it can't find it */ + if ((device = find_real_root_device_name()) == NULL) { + goto SET_ERROR; + } ++ root_done = 1; + } + + #ifdef CONFIG_FEATURE_HUMAN_READABLE diff --git a/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch b/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch new file mode 100644 index 0000000000..1b8debb021 --- /dev/null +++ b/packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch @@ -0,0 +1,73 @@ +--- busybox-1.00/debianutils/start_stop_daemon.c.orig 2006-07-23 00:06:14.000000000 +0200 ++++ busybox-1.00/debianutils/start_stop_daemon.c 2006-07-23 00:21:39.000000000 +0200 +@@ -160,7 +160,7 @@ + } + + +-static void ++static int + do_stop(void) + { + char what[1024]; +@@ -183,7 +183,7 @@ + if (!found) { + if (!quiet) + printf("no %s found; none killed.\n", what); +- return; ++ return -1; + } + for (p = found; p; p = p->next) { + if (kill(p->pid, signal_nr) == 0) { +@@ -200,6 +200,7 @@ + printf(" %d", -p->pid); + printf(").\n"); + } ++ return killed; + } + + +@@ -209,6 +210,7 @@ + { "background", 0, NULL, 'b' }, + { "quiet", 0, NULL, 'q' }, + { "make-pidfile", 0, NULL, 'm' }, ++ { "oknodo", 0, NULL, 'o' }, + { "startas", 1, NULL, 'a' }, + { "name", 1, NULL, 'n' }, + { "signal", 1, NULL, 's' }, +@@ -223,6 +225,7 @@ + #define SSD_OPT_BACKGROUND 4 + #define SSD_OPT_QUIET 8 + #define SSD_OPT_MAKEPID 16 ++#define SSD_OPT_OKNODO 32 + + int + start_stop_daemon_main(int argc, char **argv) +@@ -234,7 +237,7 @@ + bb_applet_long_options = ssd_long_options; + + bb_opt_complementaly = "K~S:S~K"; +- opt = bb_getopt_ulflags(argc, argv, "KSbqma:n:s:u:x:p:", ++ opt = bb_getopt_ulflags(argc, argv, "KSbqmoa:n:s:u:x:p:", + &startas, &cmdname, &signame, &userspec, &execname, &pidfile); + + /* Check one and only one context option was given */ +@@ -265,8 +268,8 @@ + user_id = my_getpwnam(userspec); + + if (opt & SSD_CTX_STOP) { +- do_stop(); +- return EXIT_SUCCESS; ++ int i = do_stop(); ++ return (opt & SSD_OPT_OKNODO) ? 0 : (i <= 0); + } + + do_procinit(); +@@ -274,7 +277,7 @@ + if (found) { + if (!quiet) + printf("%s already running.\n%d\n", execname ,found->pid); +- return EXIT_SUCCESS; ++ return (opt & SSD_OPT_OKNODO) ? EXIT_SUCCESS : EXIT_FAILURE; + } + *--argv = startas; + if (opt & SSD_OPT_BACKGROUND) { diff --git a/packages/busybox/busybox-1.00/unzip-endian-fixes.patch b/packages/busybox/busybox-1.00/unzip-endian-fixes.patch new file mode 100644 index 0000000000..56af433c30 --- /dev/null +++ b/packages/busybox/busybox-1.00/unzip-endian-fixes.patch @@ -0,0 +1,54 @@ +--- archival/unzip.c.orig 2005-03-17 18:42:45.000000000 -0500 ++++ archival/unzip.c 2005-03-17 17:46:45.000000000 -0500 +@@ -46,10 +46,28 @@ + #include "unarchive.h" + #include "busybox.h" + +-#define ZIP_FILEHEADER_MAGIC 0x04034b50 +-#define ZIP_CDS_MAGIC 0x02014b50 +-#define ZIP_CDS_END_MAGIC 0x06054b50 +-#define ZIP_DD_MAGIC 0x08074b50 ++#if (BYTE_ORDER == BIG_ENDIAN) ++static inline unsigned short ++__swap16(unsigned short x) { ++ return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); ++} ++ ++static inline uint32_t ++__swap32(uint32_t x) { ++ return (((x & 0xFF) << 24) | ++ ((x & 0xFF00) << 8) | ++ ((x & 0xFF0000) >> 8) | ++ ((x & 0xFF000000) >> 24)); ++} ++#else ++#define __swap16(x) (x) ++#define __swap32(x) (x) ++#endif ++ ++#define ZIP_FILEHEADER_MAGIC __swap32(0x04034b50) ++#define ZIP_CDS_MAGIC __swap32(0x02014b50) ++#define ZIP_CDS_END_MAGIC __swap32(0x06054b50) ++#define ZIP_DD_MAGIC __swap32(0x08074b50) + + extern unsigned int gunzip_crc; + extern unsigned int gunzip_bytes_out; +@@ -249,6 +267,18 @@ + + /* Read the file header */ + unzip_read(src_fd, zip_header.raw, 26); ++#if (BYTE_ORDER == BIG_ENDIAN) ++ zip_header.formated.version = __swap16(zip_header.formated.version); ++ zip_header.formated.flags = __swap16(zip_header.formated.flags); ++ zip_header.formated.method = __swap16(zip_header.formated.method); ++ zip_header.formated.modtime = __swap16(zip_header.formated.modtime); ++ zip_header.formated.moddate = __swap16(zip_header.formated.moddate); ++ zip_header.formated.crc32 = __swap32(zip_header.formated.crc32); ++ zip_header.formated.cmpsize = __swap32(zip_header.formated.cmpsize); ++ zip_header.formated.ucmpsize = __swap32(zip_header.formated.ucmpsize); ++ zip_header.formated.filename_len = __swap16(zip_header.formated.filename_len); ++ zip_header.formated.extra_len = __swap16(zip_header.formated.extra_len); ++#endif + if ((zip_header.formated.method != 0) && (zip_header.formated.method != 8)) { + bb_error_msg_and_die("Unsupported compression method %d", zip_header.formated.method); + } diff --git a/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch b/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch new file mode 100644 index 0000000000..49542cab1d --- /dev/null +++ b/packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch @@ -0,0 +1,878 @@ + +Index: archival/unzip.c +=================================================================== +RCS file: /var/cvs/busybox/archival/unzip.c,v +retrieving revision 1.8 +diff -u -r1.8 unzip.c +--- archival/unzip.c 6 Jun 2004 10:22:43 -0000 1.8 ++++ archival/unzip.c 18 Oct 2004 01:32:25 -0000 +@@ -2,7 +2,10 @@ + /* + * Mini unzip implementation for busybox + * +- * Copyright (C) 2001 by Laurence Anderson ++ * Copyright (C) 2004 by Ed Clark ++ * ++ * Loosely based on original busybox unzip applet by Laurence Anderson. ++ * All options and features should work in this version. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -21,17 +24,25 @@ + */ + + /* For reference see +- * http://www.pkware.com/products/enterprise/white_papers/appnote.txt ++ * http://www.pkware.com/company/standards/appnote/ + * http://www.info-zip.org/pub/infozip/doc/appnote-iz-latest.zip + */ + +-/* TODO Endian issues, exclude, should we accept input from stdin ? */ ++/* TODO ++ * Endian issues ++ * Zip64 + other methods ++ * Improve handling of zip format, ie. ++ * - deferred CRC, comp. & uncomp. lengths (zip header flags bit 3) ++ * - unix file permissions, etc. ++ * - central directory ++ */ + + #include + #include + #include + #include + #include ++#include + #include "unarchive.h" + #include "busybox.h" + +@@ -43,205 +54,353 @@ + extern unsigned int gunzip_crc; + extern unsigned int gunzip_bytes_out; + +-static void header_list_unzip(const file_header_t *file_header) ++typedef union { ++ unsigned char raw[26]; ++ struct { ++ unsigned short version; /* 0-1 */ ++ unsigned short flags; /* 2-3 */ ++ unsigned short method; /* 4-5 */ ++ unsigned short modtime; /* 6-7 */ ++ unsigned short moddate; /* 8-9 */ ++ unsigned int crc32 __attribute__ ((packed)); /* 10-13 */ ++ unsigned int cmpsize __attribute__ ((packed)); /* 14-17 */ ++ unsigned int ucmpsize __attribute__ ((packed)); /* 18-21 */ ++ unsigned short filename_len; /* 22-23 */ ++ unsigned short extra_len; /* 24-25 */ ++ } formated __attribute__ ((packed)); ++} zip_header_t; ++ ++static void unzip_skip(int fd, off_t skip) + { +- printf(" inflating: %s\n", file_header->name); ++ if (lseek(fd, skip, SEEK_CUR) == (off_t)-1) { ++ if ((errno != ESPIPE) || (bb_copyfd_size(fd, -1, skip) != skip)) { ++ bb_error_msg_and_die("Seek failure"); ++ } ++ } + } + +-static void header_verbose_list_unzip(const file_header_t *file_header) ++static void unzip_read(int fd, void *buf, size_t count) + { +- unsigned int dostime = (unsigned int) file_header->mtime; ++ if (bb_xread(fd, buf, count) != count) { ++ bb_error_msg_and_die("Read failure"); ++ } ++} + +- /* can printf arguments cut of the decade component ? */ +- unsigned short year = 1980 + ((dostime & 0xfe000000) >> 25); +- while (year >= 100) { +- year -= 100; +- } +- +- printf("%9u %02u-%02u-%02u %02u:%02u %s\n", +- (unsigned int) file_header->size, +- (dostime & 0x01e00000) >> 21, +- (dostime & 0x001f0000) >> 16, +- year, +- (dostime & 0x0000f800) >> 11, +- (dostime & 0x000007e0) >> 5, +- file_header->name); ++static void unzip_create_leading_dirs(char *fn) ++{ ++ /* Create all leading directories */ ++ char *name = bb_xstrdup(fn); ++ if (bb_make_directory(dirname(name), 0777, FILEUTILS_RECUR)) { ++ bb_error_msg_and_die("Failed to create directory"); ++ } ++ free(name); + } + +-extern int unzip_main(int argc, char **argv) ++static void unzip_extract(zip_header_t *zip_header, int src_fd, int dst_fd) + { +- union { +- unsigned char raw[26]; +- struct { +- unsigned short version; /* 0-1 */ +- unsigned short flags; /* 2-3 */ +- unsigned short method; /* 4-5 */ +- unsigned short modtime; /* 6-7 */ +- unsigned short moddate; /* 8-9 */ +- unsigned int crc32 __attribute__ ((packed)); /* 10-13 */ +- unsigned int cmpsize __attribute__ ((packed));; /* 14-17 */ +- unsigned int ucmpsize __attribute__ ((packed));; /* 18-21 */ +- unsigned short filename_len; /* 22-23 */ +- unsigned short extra_len; /* 24-25 */ +- } formated __attribute__ ((packed)); +- } zip_header; ++ if (zip_header->formated.method == 0) { ++ /* Method 0 - stored (not compressed) */ ++ int size = zip_header->formated.ucmpsize; ++ if (size && (bb_copyfd_size(src_fd, dst_fd, size) != size)) { ++ bb_error_msg_and_die("Cannot complete extraction"); ++ } ++ ++ } else { ++ /* Method 8 - inflate */ ++ inflate_init(zip_header->formated.cmpsize); ++ inflate_unzip(src_fd, dst_fd); ++ inflate_cleanup(); ++ /* Validate decompression - crc */ ++ if (zip_header->formated.crc32 != (gunzip_crc ^ 0xffffffffL)) { ++ bb_error_msg("Invalid compressed data--crc error"); ++ } ++ /* Validate decompression - size */ ++ if (zip_header->formated.ucmpsize != gunzip_bytes_out) { ++ bb_error_msg("Invalid compressed data--length error"); ++ } ++ } ++} + +- archive_handle_t *archive_handle; ++extern int unzip_main(int argc, char **argv) ++{ ++ zip_header_t zip_header; ++ enum {v_silent, v_normal, v_list} verbosity = v_normal; ++ enum {o_prompt, o_never, o_always} overwrite = o_prompt; + unsigned int total_size = 0; + unsigned int total_entries = 0; ++ int src_fd = -1, dst_fd = -1; ++ char *src_fn = NULL, *dst_fn = NULL; ++ llist_t *accept = NULL; ++ llist_t *reject = NULL; + char *base_dir = NULL; +- int opt = 0; +- +- /* Initialise */ +- archive_handle = init_handle(); +- archive_handle->action_data = NULL; +- archive_handle->action_header = header_list_unzip; +- +- while ((opt = getopt(argc, argv, "lnopqd:")) != -1) { +- switch (opt) { +- case 'l': /* list */ +- archive_handle->action_header = header_verbose_list_unzip; +- archive_handle->action_data = data_skip; +- break; +- case 'n': /* never overwright existing files */ ++ int i, opt, opt_range = 0, list_header_done = 0; ++ char key_buf[512]; ++ struct stat stat_buf; ++ ++ while((opt = getopt(argc, argv, "-d:lnopqx")) != -1) { ++ switch(opt_range) { ++ case 0: /* Options */ ++ switch(opt) { ++ case 'l': /* List */ ++ verbosity = v_list; + break; +- case 'o': +- archive_handle->flags = ARCHIVE_EXTRACT_UNCONDITIONAL; ++ ++ case 'n': /* Never overwrite existing files */ ++ overwrite = o_never; + break; +- case 'p': /* extract files to stdout */ +- archive_handle->action_data = data_extract_to_stdout; ++ ++ case 'o': /* Always overwrite existing files */ ++ overwrite = o_always; + break; +- case 'q': /* Extract files quietly */ +- archive_handle->action_header = header_skip; ++ ++ case 'p': /* Extract files to stdout and fall through to set verbosity */ ++ dst_fd = STDOUT_FILENO; ++ ++ case 'q': /* Be quiet */ ++ verbosity = (verbosity == v_normal) ? v_silent : verbosity; + break; +- case 'd': /* Extract files to specified base directory*/ +- base_dir = optarg; +- break; +-#if 0 +- case 'x': /* Exclude the specified files */ +- archive_handle->filter = filter_accept_reject_list; ++ ++ case 1 : /* The zip file */ ++ src_fn = bb_xstrndup(optarg, strlen(optarg)+4); ++ opt_range++; + break; +-#endif ++ + default: + bb_show_usage(); ++ ++ } ++ break; ++ ++ case 1: /* Include files */ ++ if (opt == 1) { ++ accept = llist_add_to(accept, optarg); ++ ++ } else if (opt == 'd') { ++ base_dir = optarg; ++ opt_range += 2; ++ ++ } else if (opt == 'x') { ++ opt_range++; ++ ++ } else { ++ bb_show_usage(); ++ } ++ break; ++ ++ case 2 : /* Exclude files */ ++ if (opt == 1) { ++ reject = llist_add_to(reject, optarg); ++ ++ } else if (opt == 'd') { /* Extract to base directory */ ++ base_dir = optarg; ++ opt_range++; ++ ++ } else { ++ bb_show_usage(); ++ } ++ break; ++ ++ default: ++ bb_show_usage(); + } + } +- +- if (argc == optind) { ++ ++ if (src_fn == NULL) { + bb_show_usage(); + } + +- printf("Archive: %s\n", argv[optind]); +- if (archive_handle->action_header == header_verbose_list_unzip) { +- printf(" Length Date Time Name\n"); +- printf(" -------- ---- ---- ----\n"); +- } +- +- if (*argv[optind] == '-') { +- archive_handle->src_fd = STDIN_FILENO; +- archive_handle->seek = seek_by_char; ++ /* Open input file */ ++ if (strcmp("-", src_fn) == 0) { ++ src_fd = STDIN_FILENO; ++ /* Cannot use prompt mode since zip data is arriving on STDIN */ ++ overwrite = (overwrite == o_prompt) ? o_never : overwrite; ++ + } else { +- archive_handle->src_fd = bb_xopen(argv[optind++], O_RDONLY); ++ char *extn[] = {"", ".zip", ".ZIP"}; ++ int orig_src_fn_len = strlen(src_fn); ++ for(i = 0; (i < 3) && (src_fd == -1); i++) { ++ strcpy(src_fn + orig_src_fn_len, extn[i]); ++ src_fd = open(src_fn, O_RDONLY); ++ } ++ if (src_fd == -1) { ++ src_fn[orig_src_fn_len] = 0; ++ bb_error_msg_and_die("Cannot open %s, %s.zip, %s.ZIP", src_fn, src_fn, src_fn); ++ } + } + +- if ((base_dir) && (chdir(base_dir))) { +- bb_perror_msg_and_die("Couldnt chdir"); ++ /* Change dir if necessary */ ++ if (base_dir && chdir(base_dir)) { ++ bb_perror_msg_and_die("Cannot chdir"); + } + +- while (optind < argc) { +- archive_handle->filter = filter_accept_list; +- archive_handle->accept = llist_add_to(archive_handle->accept, argv[optind]); +- optind++; +- } ++ if (verbosity != v_silent) ++ printf("Archive: %s\n", src_fn); + + while (1) { + unsigned int magic; +- int dst_fd; +- +- /* TODO Endian issues */ +- archive_xread_all(archive_handle, &magic, 4); +- archive_handle->offset += 4; + ++ /* Check magic number */ ++ unzip_read(src_fd, &magic, 4); + if (magic == ZIP_CDS_MAGIC) { + break; ++ } else if (magic != ZIP_FILEHEADER_MAGIC) { ++ bb_error_msg_and_die("Invalid zip magic %08X", magic); + } +- else if (magic != ZIP_FILEHEADER_MAGIC) { +- bb_error_msg_and_die("Invlaide zip magic"); +- } +- ++ + /* Read the file header */ +- archive_xread_all(archive_handle, zip_header.raw, 26); +- archive_handle->offset += 26; +- archive_handle->file_header->mode = S_IFREG | 0777; +- +- if (zip_header.formated.method != 8) { +- bb_error_msg_and_die("Unsupported compression method %d\n", zip_header.formated.method); ++ unzip_read(src_fd, zip_header.raw, 26); ++ if ((zip_header.formated.method != 0) && (zip_header.formated.method != 8)) { ++ bb_error_msg_and_die("Unsupported compression method %d", zip_header.formated.method); + } + + /* Read filename */ +- archive_handle->file_header->name = xmalloc(zip_header.formated.filename_len + 1); +- archive_xread_all(archive_handle, archive_handle->file_header->name, zip_header.formated.filename_len); +- archive_handle->offset += zip_header.formated.filename_len; +- archive_handle->file_header->name[zip_header.formated.filename_len] = '\0'; +- +- /* Skip extra header bits */ +- archive_handle->file_header->size = zip_header.formated.extra_len; +- data_skip(archive_handle); +- archive_handle->offset += zip_header.formated.extra_len; +- +- /* Handle directories */ +- archive_handle->file_header->mode = S_IFREG | 0777; +- if (last_char_is(archive_handle->file_header->name, '/')) { +- archive_handle->file_header->mode ^= S_IFREG; +- archive_handle->file_header->mode |= S_IFDIR; +- } +- +- /* Data section */ +- archive_handle->file_header->size = zip_header.formated.cmpsize; +- if (archive_handle->action_data) { +- archive_handle->action_data(archive_handle); +- } else { +- dst_fd = bb_xopen(archive_handle->file_header->name, O_WRONLY | O_CREAT); +- inflate_init(zip_header.formated.cmpsize); +- inflate_unzip(archive_handle->src_fd, dst_fd); +- close(dst_fd); +- chmod(archive_handle->file_header->name, archive_handle->file_header->mode); +- +- /* Validate decompression - crc */ +- if (zip_header.formated.crc32 != (gunzip_crc ^ 0xffffffffL)) { +- bb_error_msg("Invalid compressed data--crc error"); +- } +- +- /* Validate decompression - size */ +- if (gunzip_bytes_out != zip_header.formated.ucmpsize) { +- bb_error_msg("Invalid compressed data--length error"); +- } ++ free(dst_fn); ++ dst_fn = xmalloc(zip_header.formated.filename_len + 1); ++ unzip_read(src_fd, dst_fn, zip_header.formated.filename_len); ++ dst_fn[zip_header.formated.filename_len] = 0; ++ ++ /* Skip extra header bytes */ ++ unzip_skip(src_fd, zip_header.formated.extra_len); ++ ++ if ((verbosity == v_list) && !list_header_done){ ++ printf(" Length Date Time Name\n"); ++ printf(" -------- ---- ---- ----\n"); ++ list_header_done = 1; + } + +- /* local file descriptor section */ +- archive_handle->offset += zip_header.formated.cmpsize; +- /* This ISNT unix time */ +- archive_handle->file_header->mtime = zip_header.formated.modtime | (zip_header.formated.moddate << 16); +- archive_handle->file_header->size = zip_header.formated.ucmpsize; +- total_size += archive_handle->file_header->size; +- total_entries++; ++ /* Filter zip entries */ ++ if (find_list_entry(reject, dst_fn) || ++ (accept && !find_list_entry(accept, dst_fn))) { /* Skip entry */ ++ i = 'n'; ++ ++ } else { /* Extract entry */ ++ total_size += zip_header.formated.ucmpsize; ++ ++ if (verbosity == v_list) { /* List entry */ ++ unsigned int dostime = zip_header.formated.modtime | (zip_header.formated.moddate << 16); ++ printf("%9u %02u-%02u-%02u %02u:%02u %s\n", ++ zip_header.formated.ucmpsize, ++ (dostime & 0x01e00000) >> 21, ++ (dostime & 0x001f0000) >> 16, ++ (((dostime & 0xfe000000) >> 25) + 1980) % 100, ++ (dostime & 0x0000f800) >> 11, ++ (dostime & 0x000007e0) >> 5, ++ dst_fn); ++ total_entries++; ++ i = 'n'; ++ ++ } else if (dst_fd == STDOUT_FILENO) { /* Extracting to STDOUT */ ++ i = -1; ++ ++ } else if (last_char_is(dst_fn, '/')) { /* Extract directory */ ++ if (stat(dst_fn, &stat_buf) == -1) { ++ if (errno != ENOENT) { ++ bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); ++ } ++ if (verbosity == v_normal) { ++ printf(" creating: %s\n", dst_fn); ++ } ++ unzip_create_leading_dirs(dst_fn); ++ if (bb_make_directory(dst_fn, 0777, 0)) { ++ bb_error_msg_and_die("Failed to create directory"); ++ } ++ } else { ++ if (!S_ISDIR(stat_buf.st_mode)) { ++ bb_error_msg_and_die("'%s' exists but is not directory", dst_fn); ++ } ++ } ++ i = 'n'; ++ ++ } else { /* Extract file */ ++ _check_file: ++ if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */ ++ if (errno != ENOENT) { ++ bb_perror_msg_and_die("Cannot stat '%s'",dst_fn); ++ } ++ i = 'y'; ++ ++ } else { /* File already exists */ ++ if (overwrite == o_never) { ++ i = 'n'; ++ ++ } else if (S_ISREG(stat_buf.st_mode)) { /* File is regular file */ ++ if (overwrite == o_always) { ++ i = 'y'; ++ } else { ++ printf("replace %s? [y]es, [n]o, [A]ll, [N]one, [r]ename: ", dst_fn); ++ if (!fgets(key_buf, 512, stdin)) { ++ bb_perror_msg_and_die("Cannot read input"); ++ } ++ i = key_buf[0]; ++ } ++ ++ } else { /* File is not regular file */ ++ bb_error_msg_and_die("'%s' exists but is not regular file",dst_fn); ++ } ++ } ++ } ++ } + +- archive_handle->action_header(archive_handle->file_header); ++ switch (i) { ++ case 'A': ++ overwrite = o_always; ++ case 'y': /* Open file and fall into unzip */ ++ unzip_create_leading_dirs(dst_fn); ++ dst_fd = bb_xopen(dst_fn, O_WRONLY | O_CREAT); ++ case -1: /* Unzip */ ++ if (verbosity == v_normal) { ++ printf(" inflating: %s\n", dst_fn); ++ } ++ unzip_extract(&zip_header, src_fd, dst_fd); ++ if (dst_fd != STDOUT_FILENO) { ++ /* closing STDOUT is potentially bad for future business */ ++ close(dst_fd); ++ } ++ break; + ++ case 'N': ++ overwrite = o_never; ++ case 'n': ++ /* Skip entry data */ ++ unzip_skip(src_fd, zip_header.formated.cmpsize); ++ break; ++ ++ case 'r': ++ /* Prompt for new name */ ++ printf("new name: "); ++ if (!fgets(key_buf, 512, stdin)) { ++ bb_perror_msg_and_die("Cannot read input"); ++ } ++ free(dst_fn); ++ dst_fn = bb_xstrdup(key_buf); ++ chomp(dst_fn); ++ goto _check_file; ++ ++ default: ++ printf("error: invalid response [%c]\n",(char)i); ++ goto _check_file; ++ } ++ + /* Data descriptor section */ + if (zip_header.formated.flags & 4) { + /* skip over duplicate crc, compressed size and uncompressed size */ +- unsigned char data_description[12]; +- archive_xread_all(archive_handle, data_description, 12); +- archive_handle->offset += 12; ++ unzip_skip(src_fd, 12); + } + } +- /* Central directory section */ + +- if (archive_handle->action_header == header_verbose_list_unzip) { ++ if (verbosity == v_list) { + printf(" -------- -------\n"); + printf("%9d %d files\n", total_size, total_entries); + } +- ++ + return(EXIT_SUCCESS); + } ++ ++/* END CODE */ ++/* ++Local Variables: ++c-file-style: "linux" ++c-basic-offset: 4 ++tab-width: 4 ++End: ++*/ +Index: archival/libunarchive/decompress_unzip.c +=================================================================== +RCS file: /var/cvs/busybox/archival/libunarchive/decompress_unzip.c,v +retrieving revision 1.35 +diff -u -r1.35 decompress_unzip.c +--- archival/libunarchive/decompress_unzip.c 25 Apr 2004 05:11:13 -0000 1.35 ++++ archival/libunarchive/decompress_unzip.c 18 Oct 2004 01:32:29 -0000 +@@ -16,6 +16,11 @@ + * + * read_gz interface + associated hacking by Laurence Anderson + * ++ * Fixed huft_build() so decoding end-of-block code does not grab more bits ++ * than necessary (this is required by unzip applet), added inflate_cleanup() ++ * to free leaked bytebuffer memory (used in unzip.c), and some minor style ++ * guide cleanups by Ed Clark ++ * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or +@@ -116,26 +121,26 @@ + /* Copy lengths for literal codes 257..285 */ + static const unsigned short cplens[] = { + 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, +- 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 ++ 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 + }; + + /* note: see note #13 above about the 258 in this list. */ + /* Extra bits for literal codes 257..285 */ + static const unsigned char cplext[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, +- 5, 5, 5, 0, 99, 99 ++ 5, 5, 5, 0, 99, 99 + }; /* 99==invalid */ + + /* Copy offsets for distance codes 0..29 */ + static const unsigned short cpdist[] = { + 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, +- 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 ++ 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 + }; + + /* Extra bits for distance codes */ + static const unsigned char cpdext[] = { + 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, +- 11, 11, 12, 12, 13, 13 ++ 11, 11, 12, 12, 13, 13 + }; + + /* Tables for deflate from PKZIP's appnote.txt. */ +@@ -184,8 +189,8 @@ + table_entry = (table_entry >> 1) ^ poly; + } else { + table_entry >>= 1; +- } +- } ++ } ++ } + gunzip_crc_table[i] = table_entry; + } + } +@@ -225,70 +230,59 @@ + * t: result: starting table + * m: maximum lookup bits, returns actual + */ +-static int huft_build(unsigned int *b, const unsigned int n, +- const unsigned int s, const unsigned short *d, +- const unsigned char *e, huft_t ** t, int *m) ++int huft_build(unsigned int *b, const unsigned int n, ++ const unsigned int s, const unsigned short *d, ++ const unsigned char *e, huft_t ** t, int *m) + { +- unsigned a; /* counter for codes of length k */ ++ unsigned a; /* counter for codes of length k */ + unsigned c[BMAX + 1]; /* bit length count table */ +- unsigned f; /* i repeats in table every f entries */ +- int g; /* maximum code length */ +- int h; /* table level */ ++ unsigned eob_len; /* length of end-of-block code (value 256) */ ++ unsigned f; /* i repeats in table every f entries */ ++ int g; /* maximum code length */ ++ int h; /* table level */ + register unsigned i; /* counter, current code */ + register unsigned j; /* counter */ +- register int k; /* number of bits in current code */ +- int l; /* bits per table (returned in m) */ ++ register int k; /* number of bits in current code */ + register unsigned *p; /* pointer into c[], b[], or v[] */ +- register huft_t *q; /* points to current table */ +- huft_t r; /* table entry for structure assignment */ +- huft_t *u[BMAX]; /* table stack */ +- unsigned v[N_MAX]; /* values in order of bit length */ +- register int w; /* bits before this table == (l * h) */ ++ register huft_t *q; /* points to current table */ ++ huft_t r; /* table entry for structure assignment */ ++ huft_t *u[BMAX]; /* table stack */ ++ unsigned v[N_MAX]; /* values in order of bit length */ ++ int ws[BMAX+1]; /* bits decoded stack */ ++ register int w; /* bits decoded */ + unsigned x[BMAX + 1]; /* bit offsets, then code stack */ +- unsigned *xp; /* pointer into x */ +- int y; /* number of dummy codes added */ +- unsigned z; /* number of entries in current table */ ++ unsigned *xp; /* pointer into x */ ++ int y; /* number of dummy codes added */ ++ unsigned z; /* number of entries in current table */ ++ ++ /* Length of EOB code, if any */ ++ eob_len = n > 256 ? b[256] : BMAX; + + /* Generate counts for each bit length */ +- memset((void *) (c), 0, sizeof(c)); ++ memset((void *)c, 0, sizeof(c)); + p = b; + i = n; + do { +- c[*p]++; /* assume all entries <= BMAX */ +- p++; /* Can't combine with above line (Solaris bug) */ ++ c[*p]++; /* assume all entries <= BMAX */ ++ p++; /* Can't combine with above line (Solaris bug) */ + } while (--i); +- if (c[0] == n) { /* null input--all zero length codes */ ++ if (c[0] == n) { /* null input--all zero length codes */ + *t = (huft_t *) NULL; + *m = 0; + return 0; + } + + /* Find minimum and maximum length, bound *m by those */ +- l = *m; +- for (j = 1; j <= BMAX; j++) { +- if (c[j]) { +- break; +- } +- } +- k = j; /* minimum code length */ +- if ((unsigned) l < j) { +- l = j; +- } +- for (i = BMAX; i; i--) { +- if (c[i]) { +- break; +- } +- } +- g = i; /* maximum code length */ +- if ((unsigned) l > i) { +- l = i; +- } +- *m = l; ++ for (j = 1; (c[j] == 0) && (j <= BMAX); j++); ++ k = j; /* minimum code length */ ++ for (i = BMAX; (c[i] == 0) && i; i--); ++ g = i; /* maximum code length */ ++ *m = (*m < j) ? j : ((*m > i) ? i : *m); + + /* Adjust last length count to fill out codes, if needed */ + for (y = 1 << j; j < i; j++, y <<= 1) { + if ((y -= c[j]) < 0) { +- return 2; /* bad input: more codes than bits */ ++ return 2; /* bad input: more codes than bits */ + } + } + if ((y -= c[i]) < 0) { +@@ -300,7 +294,7 @@ + x[1] = j = 0; + p = c + 1; + xp = x + 2; +- while (--i) { /* note that i == g from above */ ++ while (--i) { /* note that i == g from above */ + *xp++ = (j += *p++); + } + +@@ -314,13 +308,13 @@ + } while (++i < n); + + /* Generate the Huffman codes and for each, make the table entries */ +- x[0] = i = 0; /* first Huffman code is zero */ +- p = v; /* grab values in bit order */ +- h = -1; /* no tables yet--level -1 */ +- w = -l; /* bits decoded == (l * h) */ ++ x[0] = i = 0; /* first Huffman code is zero */ ++ p = v; /* grab values in bit order */ ++ h = -1; /* no tables yet--level -1 */ ++ w = ws[0] = 0; /* bits decoded */ + u[0] = (huft_t *) NULL; /* just to keep compilers happy */ + q = (huft_t *) NULL; /* ditto */ +- z = 0; /* ditto */ ++ z = 0; /* ditto */ + + /* go through the bit lengths (k already is bits in shortest code) */ + for (; k <= g; k++) { +@@ -328,52 +322,52 @@ + while (a--) { + /* here i is the Huffman code of length k bits for value *p */ + /* make tables up to required level */ +- while (k > w + l) { +- h++; +- w += l; /* previous table always l bits */ +- +- /* compute minimum size table less than or equal to l bits */ +- z = (z = g - w) > (unsigned) l ? l : z; /* upper limit on table size */ +- if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table *//* too few codes for k-w bit table */ +- f -= a + 1; /* deduct codes from patterns left */ ++ while (k > ws[h + 1]) { ++ w = ws[++h]; ++ ++ /* compute minimum size table less than or equal to *m bits */ ++ z = (z = g - w) > *m ? *m : z; /* upper limit on table size */ ++ if ((f = 1 << (j = k - w)) > a + 1) { /* try a k-w bit table */ ++ /* too few codes for k-w bit table */ ++ f -= a + 1; /* deduct codes from patterns left */ + xp = c + k; +- while (++j < z) { /* try smaller tables up to z bits */ ++ while (++j < z) { /* try smaller tables up to z bits */ + if ((f <<= 1) <= *++xp) { +- break; /* enough codes to use up j bits */ ++ break; /* enough codes to use up j bits */ + } +- f -= *xp; /* else deduct codes from patterns */ ++ f -= *xp; /* else deduct codes from patterns */ + } + } ++ j = (w + j > eob_len && w < eob_len) ? eob_len - w : j; /* make EOB code end at table */ + z = 1 << j; /* table entries for j-bit table */ ++ ws[h+1] = w + j; /* set bits decoded in stack */ + + /* allocate and link in new table */ + q = (huft_t *) xmalloc((z + 1) * sizeof(huft_t)); +- + *t = q + 1; /* link to list for huft_free() */ + *(t = &(q->v.t)) = NULL; + u[h] = ++q; /* table starts after link */ + + /* connect to last table, if there is one */ + if (h) { +- x[h] = i; /* save pattern for backing up */ +- r.b = (unsigned char) l; /* bits to dump before this table */ +- r.e = (unsigned char) (16 + j); /* bits in this table */ +- r.v.t = q; /* pointer to this table */ +- j = i >> (w - l); /* (get around Turbo C bug) */ +- u[h - 1][j] = r; /* connect to last table */ ++ x[h] = i; /* save pattern for backing up */ ++ r.b = (unsigned char) (w - ws[h - 1]); /* bits to dump before this table */ ++ r.e = (unsigned char) (16 + j); /* bits in this table */ ++ r.v.t = q; /* pointer to this table */ ++ j = (i & ((1 << w) - 1)) >> ws[h - 1]; ++ u[h - 1][j] = r; /* connect to last table */ + } + } +- ++ + /* set up table entry in r */ + r.b = (unsigned char) (k - w); + if (p >= v + n) { +- r.e = 99; /* out of values--invalid code */ ++ r.e = 99; /* out of values--invalid code */ + } else if (*p < s) { +- r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is end-of-block code */ +- r.v.n = (unsigned short) (*p); /* simple code is just the value */ +- p++; /* one compiler does not like *p++ */ ++ r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */ ++ r.v.n = (unsigned short) (*p++); /* simple code is just the value */ + } else { +- r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ ++ r.e = (unsigned char) e[*p - s]; /* non-simple--look up in lists */ + r.v.n = d[*p++ - s]; + } + +@@ -391,11 +385,14 @@ + + /* backup over finished tables */ + while ((i & ((1 << w) - 1)) != x[h]) { +- h--; /* don't need to update q */ +- w -= l; ++ w = ws[--h]; + } + } + } ++ ++ /* return actual size of base table */ ++ *m = ws[1]; ++ + /* Return true (1) if we were given an incomplete table */ + return y != 0 && g != 1; + } +@@ -901,6 +898,11 @@ + bytebuffer_size = 0; + } + ++extern void inflate_cleanup(void) ++{ ++ free(bytebuffer); ++} ++ + extern int inflate_unzip(int in, int out) + { + ssize_t nwrote; +Index: include/unarchive.h +=================================================================== +RCS file: /var/cvs/busybox/include/unarchive.h,v +retrieving revision 1.23 +diff -u -r1.23 unarchive.h +--- include/unarchive.h 15 Mar 2004 08:28:38 -0000 1.23 ++++ include/unarchive.h 18 Oct 2004 01:32:30 -0000 +@@ -98,6 +98,7 @@ + + extern int uncompressStream(int src_fd, int dst_fd); + extern void inflate_init(unsigned int bufsize); ++extern void inflate_cleanup(void); + extern int inflate_unzip(int in, int out); + extern int inflate_gunzip(int in, int out); + +_________________________________________________________________ +Express yourself instantly with MSN Messenger! Download today it's FREE! +http://messenger.msn.com/ + + +--===============0046497949== +Content-Type: text/plain; charset="iso-8859-1" +MIME-Version: 1.0 +Content-Transfer-Encoding: quoted-printable +Content-Disposition: inline + +_______________________________________________ +busybox mailing list +busybox@mail.busybox.net +http://codepoet.org/mailman/listinfo/busybox + +--===============0046497949==-- diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index c0f7c87a6b..743cab0c27 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r32" +PR = "r37" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://add-getkey-applet.patch;patch=1 \ @@ -22,6 +22,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://readlink.patch;patch=1 \ file://iproute-flush-cache.patch;patch=1;pnum=0 \ file://rmmod.patch;patch=1 \ + file://df.patch;patch=1 \ file://below.patch;patch=1 \ file://fbset.patch;patch=1 \ file://mount-all-type.patch;patch=1 \ @@ -29,6 +30,9 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://gzip-spurious-const.patch;patch=1 \ file://ifupdown-spurious-environ.patch;patch=1 \ file://uclibc_posix.patch;patch=1 \ + file://unzip-enhancement-and-fixes.patch;patch=1;pnum=0 \ + file://unzip-endian-fixes.patch;patch=1;pnum=0 \ + file://start-stop-daemon-oknodo-support.patch;patch=1 \ file://defconfig \ file://busybox-cron \ file://busybox-httpd \ @@ -146,6 +150,7 @@ pkg_prerm_${PN} () { # providing its files, this will make update-alternatives work, but the update-rc.d part # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + cp -a /bin/busybox $tmpdir/ ln -s /bin/busybox $tmpdir/[ ln -s /bin/busybox $tmpdir/test ln -s /bin/busybox $tmpdir/head -- cgit v1.2.3 From b7d82774dfae26fa96f9163fc3475ead917eecba Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:13:37 +0000 Subject: hh-pxa 2.6.16hh6: add it --- packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb | 69 ++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb (limited to 'packages') diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb b/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb new file mode 100644 index 0000000000..e8048ae641 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.6_2.6.16-hh6.bb @@ -0,0 +1,69 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel for PXA based devices." +LICENSE = "GPL" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = '(h3900|h2200|h4000|h5xxx|htcuniversal|ipaq-pxa270)' + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://24-hostap_cs_id.diff;patch=1 \ + file://hrw-pcmcia-ids-r2.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +FILES_kernel-image_ipaq-pxa270 = "" +ALLOW_EMPTY_ipaq_pxa270 = 1 +FILES_kernel-image_htcuniversal = "" +ALLOW_EMPTY_htcuniversal = 1 + + + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" + +do_configure() { + + if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then + die "-hh version mismatch" + fi + + rm -f ${S}/.config + + if [ ! -e ${WORKDIR}/defconfig ]; then + die "No default configuration for ${MACHINE} available." + fi + + + if [ "${TARGET_OS}" == "linux-gnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' + + yes '' | oe_runmake oldconfig + +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From 4cf0e7ef269b8f2be828c0cc30f2fa81cf9d8474 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:27:08 +0000 Subject: cairo 1.2.4: libx11 -> virtual/libx11 --- packages/cairo/cairo_1.2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index bad6da8bde..662f685fb9 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -1,7 +1,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " -DEPENDS = "libx11 libpng fontconfig libxrender" +DEPENDS = "virtual/libx11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" -- cgit v1.2.3 From 87ae50230b26c98c639327a6beee7bbab4012c4b Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 1 Sep 2006 21:29:45 +0000 Subject: gtk+ 2.8.16: Activate all the patches used in previous versions. For some reason several were commented out, but they apply and compile cleanly, so I've re-enabled them. --- packages/gtk+/gtk+_2.8.16.bb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/gtk+/gtk+_2.8.16.bb b/packages/gtk+/gtk+_2.8.16.bb index ef7f20e4ac..d870b0e0b1 100644 --- a/packages/gtk+/gtk+_2.8.16.bb +++ b/packages/gtk+/gtk+_2.8.16.bb @@ -18,14 +18,14 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ file://gtktreeview-316689.patch;patch=1 \ -# file://menu-deactivate.patch;patch=1 \ -# file://xsettings.patch;patch=1 \ -# file://scroll-timings.patch;patch=1 \ -# file://small-gtkfilesel.patch;patch=1 \ -# file://migration.patch;patch=1;pnum=0 \ - file://no-demos.patch;patch=1" -# file://gtk+-handhelds.patch;patch=1 \ -# file://single-click.patch;patch=1" + file://menu-deactivate.patch;patch=1 \ + file://xsettings.patch;patch=1 \ + file://scroll-timings.patch;patch=1 \ + file://small-gtkfilesel.patch;patch=1 \ + file://migration.patch;patch=1;pnum=0 \ + file://no-demos.patch;patch=1" \ + file://gtk+-handhelds.patch;patch=1 \ + file://single-click.patch;patch=1" inherit autotools pkgconfig -- cgit v1.2.3 From 0fd3efb404b5e56a2fb05c25653931b5771f58b3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:44:47 +0000 Subject: gpe-login 0.87: replace highdpi patch with one that just sets a normal theme, since the dpi issues should have been resolved --- packages/gpe-login/files/removeblue-fontsize8.patch | 14 ++++++++++++++ packages/gpe-login/gpe-login_0.87.bb | 9 ++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 packages/gpe-login/files/removeblue-fontsize8.patch (limited to 'packages') diff --git a/packages/gpe-login/files/removeblue-fontsize8.patch b/packages/gpe-login/files/removeblue-fontsize8.patch new file mode 100644 index 0000000000..4962c8401f --- /dev/null +++ b/packages/gpe-login/files/removeblue-fontsize8.patch @@ -0,0 +1,14 @@ +--- /tmp/gpe-login.gtkrc 2005-11-08 17:15:50.363302568 +0100 ++++ gpe-login-0.83/X11/gpe-login.gtkrc 2005-11-08 17:16:22.659392816 +0100 +@@ -1,9 +1,2 @@ +-gtk-font-name = "Sans 8" +-include "/usr/share/themes/Angelistic/gtk-2.0/gtkrc" +- +-style "default" +-{ +- bg[NORMAL] = "#90d8ff" +-} +- +-widget "*" style "default" ++gtk-font-name = "Sans 8" ++include "/usr/share/themes/Industrial/gtk-2.0/gtkrc" diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb index 5d7f00530c..b548a1ad6b 100644 --- a/packages/gpe-login/gpe-login_0.87.bb +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -7,13 +7,8 @@ PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r0" +PR = "r1" -#apply a patch to set the fontsize for bigdpi (200+) devices to 5 -SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" -SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" SRC_URI += " file://chvt-keylaunch.patch;patch=1 " -- cgit v1.2.3 From 4db47cb621b73ca6b178152846c0d52eb3ce50ca Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 00:10:57 +0000 Subject: ixp4xx-kernel: Match 2.6.16 defconfig with svn repo --- packages/linux/ixp4xx-kernel/2.6.16/defconfig | 2 +- packages/linux/ixp4xx-kernel_2.6.16.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index 441d382c4f..c3b711f9c9 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1167,7 +1167,7 @@ CONFIG_VIDEO_CX88_ALSA=m # CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_OVCAMCHIP=m CONFIG_VIDEO_AUDIO_DECODER=m -# CONFIG_VIDEO_DECODER is not set +CONFIG_VIDEO_DECODER=m # # Radio Adapters diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index b7354755ef..be8855cc57 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "4" +PR_CONFIG = "5" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches -- cgit v1.2.3 From 07f7ad8d3c04026aad55f1d808e0a9d7769dbce3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 00:16:13 +0000 Subject: ixp4xx-kernel: Add YEALINK module --- packages/linux/ixp4xx-kernel/2.6.16/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig index c3b711f9c9..dda2e790b0 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig @@ -1361,7 +1361,7 @@ CONFIG_USB_KBD=m # CONFIG_USB_MTOUCH is not set # CONFIG_USB_ITMTOUCH is not set # CONFIG_USB_EGALAX is not set -# CONFIG_USB_YEALINK is not set +CONFIG_USB_YEALINK=m # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set # CONFIG_USB_ATI_REMOTE2 is not set -- cgit v1.2.3 From e5ac50ad59a9b404eabbc287ad0df03a68002405 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 00:25:45 +0000 Subject: ixp4xx-kernel: bump PR to force rebuild from svn --- packages/linux/ixp4xx-kernel_2.6.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel_2.6.17.bb b/packages/linux/ixp4xx-kernel_2.6.17.bb index 9025cca893..b08129799a 100644 --- a/packages/linux/ixp4xx-kernel_2.6.17.bb +++ b/packages/linux/ixp4xx-kernel_2.6.17.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "2" +PR_CONFIG = "3" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches -- cgit v1.2.3 From d676aacf9d7461fc140131ad65a6871689e66f38 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Sep 2006 10:19:20 +0000 Subject: xserver-kdrive: w100 accelerated kdrive for people to play with - enable compilation of Xw100 and package it as xserver-kdrive-w100 - thanks to Mardy, RP, sirfred, Spyro and XorA! --- packages/xorg-xserver/xserver-kdrive/w100.patch | 6385 ++++++++++++++++++++ .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 12 +- packages/xorg-xserver/xserver-kdrive_git.bb | 12 +- 3 files changed, 6401 insertions(+), 8 deletions(-) create mode 100644 packages/xorg-xserver/xserver-kdrive/w100.patch (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/w100.patch b/packages/xorg-xserver/xserver-kdrive/w100.patch new file mode 100644 index 0000000000..2ff1639b9a --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/w100.patch @@ -0,0 +1,6385 @@ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,434 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++#include "ati.h" ++#include "w100_regs.h" ++ ++ ++struct pci_id_entry ati_pci_ids[] = { ++ {0x1002, 0x5644, 0, "ATI Imageon 3200"}, ++ {0x1002, 0x5741, 0, "ATI Imageon 100"}, ++ {0x1002, 0x5744, 0, "ATI Imageon 3220"}, ++ {0, 0, 0, NULL} ++}; ++ ++ ++static Bool ++ATICardInit(KdCardInfo * card) ++{ ++ ATICardInfo *atic; ++ int i; ++ Bool initialized = FALSE; ++ ++ atic = xcalloc(sizeof(ATICardInfo), 1); ++ if (atic == NULL) ++ return FALSE; ++ ++#ifdef KDRIVEFBDEV ++ if (!initialized && fbdevInitialize(card, &atic->backend_priv.fbdev)) { ++ atic->use_fbdev = TRUE; ++ initialized = TRUE; ++ atic->backend_funcs.cardfini = fbdevCardFini; ++ atic->backend_funcs.scrfini = fbdevScreenFini; ++ atic->backend_funcs.initScreen = fbdevInitScreen; ++ atic->backend_funcs.finishInitScreen = fbdevFinishInitScreen; ++ atic->backend_funcs.createRes = fbdevCreateResources; ++ atic->backend_funcs.preserve = fbdevPreserve; ++ atic->backend_funcs.restore = fbdevRestore; ++ atic->backend_funcs.dpms = fbdevDPMS; ++ atic->backend_funcs.enable = fbdevEnable; ++ atic->backend_funcs.disable = fbdevDisable; ++ atic->backend_funcs.getColors = fbdevGetColors; ++ atic->backend_funcs.putColors = fbdevPutColors; ++#ifdef RANDR ++ atic->backend_funcs.randrSetConfig = fbdevRandRSetConfig; ++#endif ++ } ++#endif ++#ifdef KDRIVEVESA ++ if (!initialized && vesaInitialize(card, &atic->backend_priv.vesa)) { ++ atic->use_vesa = TRUE; ++ initialized = TRUE; ++ atic->backend_funcs.cardfini = vesaCardFini; ++ atic->backend_funcs.scrfini = vesaScreenFini; ++ atic->backend_funcs.initScreen = vesaInitScreen; ++ atic->backend_funcs.finishInitScreen = vesaFinishInitScreen; ++ atic->backend_funcs.createRes = vesaCreateResources; ++ atic->backend_funcs.preserve = vesaPreserve; ++ atic->backend_funcs.restore = vesaRestore; ++ atic->backend_funcs.dpms = vesaDPMS; ++ atic->backend_funcs.enable = vesaEnable; ++ atic->backend_funcs.disable = vesaDisable; ++ atic->backend_funcs.getColors = vesaGetColors; ++ atic->backend_funcs.putColors = vesaPutColors; ++#ifdef RANDR ++ atic->backend_funcs.randrSetConfig = vesaRandRSetConfig; ++#endif ++ } ++#endif ++ ++ if (!initialized || !ATIMap(card, atic)) { ++ xfree(atic); ++ return FALSE; ++ } ++ ++ card->driver = atic; ++ ++ for (i = 0; ati_pci_ids[i].name != NULL; i++) { ++ if (ati_pci_ids[i].device == card->attr.deviceID) { ++ atic->pci_id = &ati_pci_ids[i]; ++ break; ++ } ++ } ++ ++ ErrorF("Using ATI card: %s\n", atic->pci_id->name); ++ ++ return TRUE; ++} ++ ++static void ++ATICardFini(KdCardInfo * card) ++{ ++ ATICardInfo *atic = (ATICardInfo *) card->driver; ++ ++ ATIUnmap(card, atic); ++ atic->backend_funcs.cardfini(card); ++} ++ ++/* ++ * Once screen->off_screen_base is set, this function ++ * allocates the remaining memory appropriately ++ */ ++ ++static void ++ATISetOffscreen(KdScreenInfo * screen) ++{ ++ ATICardInfo(screen); ++ int screen_size; ++ char *mmio = atic->reg_base; ++ ++ /* check (and adjust) pitch */ ++ if (mmio) { ++ int byteStride = screen->fb[0].byteStride; ++ int bitStride; ++ int pixelStride; ++ int bpp = screen->fb[0].bitsPerPixel; ++ ++ /* ++ * Ensure frame buffer is correctly aligned ++ */ ++ if (byteStride & 0x3f) { ++ byteStride = (byteStride + 0x3f) & ~0x3f; ++ bitStride = byteStride * 8; ++ pixelStride = bitStride / bpp; ++ ++ screen->fb[0].byteStride = byteStride; ++ screen->fb[0].pixelStride = pixelStride; ++ } ++ } ++ ++ screen_size = screen->fb[0].byteStride * screen->height; ++ ++ screen->off_screen_base = screen_size; ++ ++} ++ ++static Bool ++ATIScreenInit(KdScreenInfo * screen) ++{ ++ ATIScreenInfo *atis; ++ ATICardInfo(screen); ++ Bool success = FALSE; ++ ++ atis = xcalloc(sizeof(ATIScreenInfo), 1); ++ if (atis == NULL) ++ return FALSE; ++ ++ atis->atic = atic; ++ atis->screen = screen; ++ screen->driver = atis; ++ ++ if (screen->fb[0].depth == 0) ++ screen->fb[0].depth = 16; ++#ifdef KDRIVEFBDEV ++ if (atic->use_fbdev) { ++ success = fbdevScreenInitialize(screen, &atis->backend_priv.fbdev); ++ } ++#endif ++#ifdef KDRIVEVESA ++ if (atic->use_vesa) { ++ success = vesaScreenInitialize(screen, &atis->backend_priv.vesa); ++ } ++#endif ++ ++ if (!success) { ++ screen->driver = NULL; ++ xfree(atis); ++ return FALSE; ++ } ++ ++ ErrorF ++ ("Offscreen memory at offset %08x, memory base %08x, size %08x\n", ++ screen->off_screen_base, screen->memory_base, ++ screen->memory_size); ++ ATISetOffscreen(screen); ++ ++ return TRUE; ++} ++ ++#ifdef RANDR ++static Bool ++ATIRandRSetConfig(ScreenPtr pScreen, ++ Rotation randr, int rate, RRScreenSizePtr pSize) ++{ ++ KdScreenPriv(pScreen); ++ KdScreenInfo *screen = pScreenPriv->screen; ++ ATICardInfo *atic = screen->card->driver; ++ Bool ret; ++ ++ ATIDrawDisable(pScreen); ++ ret = atic->backend_funcs.randrSetConfig(pScreen, randr, rate, pSize); ++ ATISetOffscreen(screen); ++ /* ++ * Set frame buffer mapping ++ */ ++ (*pScreen->ModifyPixmapHeader) (fbGetScreenPixmap(pScreen), ++ pScreen->width, ++ pScreen->height, ++ screen->fb[0].depth, ++ screen->fb[0].bitsPerPixel, ++ screen->fb[0].byteStride, ++ screen->fb[0].frameBuffer); ++ ++ ATIDrawEnable(pScreen); ++ return ret; ++} ++ ++static Bool ++ATIRandRInit(ScreenPtr pScreen) ++{ ++ rrScrPrivPtr pScrPriv; ++ ++ pScrPriv = rrGetScrPriv(pScreen); ++ pScrPriv->rrSetConfig = ATIRandRSetConfig; ++ return TRUE; ++} ++#endif ++ ++static void ++ATIScreenFini(KdScreenInfo * screen) ++{ ++ ATIScreenInfo *atis = (ATIScreenInfo *) screen->driver; ++ ATICardInfo *atic = screen->card->driver; ++ ++ atic->backend_funcs.scrfini(screen); ++ xfree(atis); ++ screen->driver = 0; ++} ++ ++Bool ++ATIMap(KdCardInfo * card, ATICardInfo * atic) ++{ ++ atic->mem_base = (CARD8 *) KdMapDevice(ATI_MEM_BASE(card), ++ ATI_MEM_SIZE(card)); ++ ++ if (atic->mem_base == NULL) ++ return FALSE; ++ atic->reg_base = atic->mem_base + 0x10000; /* XXX */ ++ ++ KdSetMappedMode(ATI_MEM_BASE(card), ATI_MEM_SIZE(card), ++ KD_MAPPED_MODE_REGISTERS); ++ ++ return TRUE; ++} ++ ++void ++ATIUnmap(KdCardInfo * card, ATICardInfo * atic) ++{ ++ if (atic->reg_base) { ++ KdResetMappedMode(ATI_REG_BASE(card), ATI_REG_SIZE(card), ++ KD_MAPPED_MODE_REGISTERS); ++ KdUnmapDevice((void *) atic->reg_base, ATI_REG_SIZE(card)); ++ atic->reg_base = 0; ++ } ++} ++ ++static Bool ++ATIInitScreen(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ return atic->backend_funcs.initScreen(pScreen); ++} ++ ++static Bool ++ATIFinishInitScreen(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ if (!atic->backend_funcs.finishInitScreen(pScreen)) ++ return FALSE; ++#ifdef RANDR ++ if (!ATIRandRInit(pScreen)) ++ return FALSE; ++#endif ++ return TRUE; ++} ++ ++static Bool ++ATICreateResources(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ return atic->backend_funcs.createRes(pScreen); ++} ++ ++static void ++ATIPreserve(KdCardInfo * card) ++{ ++ ATICardInfo *atic = card->driver; ++ ++ atic->backend_funcs.preserve(card); ++} ++ ++static void ++ATIRestore(KdCardInfo * card) ++{ ++ ATICardInfo *atic = card->driver; ++ ++ ATIUnmap(card, atic); ++ ++ atic->backend_funcs.restore(card); ++} ++ ++static Bool ++ATIDPMS(ScreenPtr pScreen, int mode) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ return atic->backend_funcs.dpms(pScreen, mode); ++} ++ ++static Bool ++ATIEnable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ mc_ext_mem_location_u eml; ++ char *mmio; ++ ++ if (!atic->backend_funcs.enable(pScreen)) ++ return FALSE; ++ ++ if ((atic->reg_base == NULL) ++ && !ATIMap(pScreenPriv->screen->card, atic)) ++ return FALSE; ++ ++ mmio = atic->reg_base; ++ eml.val = MMIO_IN32(mmio, mmMC_EXT_MEM_LOCATION); ++ atic->ext_mem_location = eml.f.mc_ext_mem_start << 8; ++ ATISetOffscreen(pScreenPriv->screen); ++ ++ return TRUE; ++} ++ ++static void ++ATIDisable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ ATIUnmap(pScreenPriv->card, atic); ++ ++ atic->backend_funcs.disable(pScreen); ++} ++ ++static void ++ATIGetColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ atic->backend_funcs.getColors(pScreen, fb, n, pdefs); ++} ++ ++static void ++ATIPutColors(ScreenPtr pScreen, int fb, int n, xColorItem * pdefs) ++{ ++ KdScreenPriv(pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ atic->backend_funcs.putColors(pScreen, fb, n, pdefs); ++} ++ ++/* Compute log base 2 of val. */ ++int ++ATILog2(int val) ++{ ++ int bits; ++ ++ for (bits = 0; val != 0; val >>= 1, ++bits); ++ return bits - 1; ++} ++ ++ ++ ++KdCardFuncs ATIFuncs = { ++ ATICardInit, /* cardinit */ ++ ATIScreenInit, /* scrinit */ ++ ATIInitScreen, /* initScreen */ ++ ATIFinishInitScreen, /* finishInitScreen */ ++ ATICreateResources, /* createRes */ ++ ATIPreserve, /* preserve */ ++ ATIEnable, /* enable */ ++ ATIDPMS, /* dpms */ ++ ATIDisable, /* disable */ ++ ATIRestore, /* restore */ ++ ATIScreenFini, /* scrfini */ ++ ATICardFini, /* cardfini */ ++ ++#define ATICursorInit 0 ++#define ATICursorEnable 0 ++#define ATICursorDisable 0 ++#define ATICursorFini 0 ++#define ATIRecolorCursor 0 ++ ATICursorInit, /* initCursor */ ++ ATICursorEnable, /* enableCursor */ ++ ATICursorDisable, /* disableCursor */ ++ ATICursorFini, /* finiCursor */ ++ ATIRecolorCursor, /* recolorCursor */ ++ ++ ATIDrawInit, /* initAccel */ ++ ATIDrawEnable, /* enableAccel */ ++ ATIDrawDisable, /* disableAccel */ ++ ATIDrawFini, /* finiAccel */ ++ ++ ATIGetColors, /* getColors */ ++ ATIPutColors, /* putColors */ ++}; +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_cursor.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_cursor.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,93 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++#include "ati.h" ++#include "cursorstr.h" ++#include "ati_draw.h" ++ ++static void ++ATIMoveCursor(ScreenPtr pScreen, int x, int y) ++{ ++} ++ ++ ++static Bool ++ATIRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) ++{ ++ return FALSE; ++} ++ ++ ++static Bool ++ATIUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) ++{ ++ return TRUE; ++} ++ ++ ++static void ++ATISetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y) ++{ ++} ++ ++ ++miPointerSpriteFuncRec ATIPointerSpriteFuncs = { ++ ATIRealizeCursor, ++ ATIUnrealizeCursor, ++ ATISetCursor, ++ ATIMoveCursor, ++}; ++ ++ ++void ++ATICursorEnable(ScreenPtr pScreen) ++{ ++} ++ ++ ++void ++ATICursorDisable(ScreenPtr pScreen) ++{ ++} ++ ++ ++Bool ++ATICursorInit(ScreenPtr pScreen) ++{ ++ return FALSE; ++} ++ ++ ++void ++ATIRecolorCursor(ScreenPtr pScreen, int ndef, xColorItem * pdef) ++{ ++ return; ++} ++ ++ ++void ++ATICursorFini(ScreenPtr pScreen) ++{ ++} +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,333 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++ ++#include "ati.h" ++#include "w100_regs.h" ++#include "w100_const.h" ++#include "ati_dma.h" ++#include "ati_draw.h" ++ ++ ++#define DEBUG_FIFO 0 ++ ++extern CARD32 w100_microcode[][2]; ++ ++#if DEBUG_FIFO ++static void ++ATIDebugFifo(ATIScreenInfo * atis) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ ++ ErrorF("mmCP_CSQ_CNTL: 0x%08x\n", MMIO_IN32(mmio, mmCP_CSQ_CNTL)); ++ ErrorF("mmCP_CSQ_STAT: 0x%08x\n", MMIO_IN32(mmio, mmCP_CSQ_STAT)); ++ ErrorF("mmRBBM_STATUS: 0x%08x\n", MMIO_IN32(mmio, mmRBBM_STATUS)); ++} ++#endif ++ ++static void ++ATIUploadMicrocode(ATIScreenInfo * atis) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ int i; ++ ++ MMIO_OUT32(mmio, mmCP_ME_RAM_ADDR, 0); ++ for (i = 0; i < 256; i++) { ++ MMIO_OUT32(mmio, mmCP_ME_RAM_DATAH, w100_microcode[i][1]); ++ MMIO_OUT32(mmio, mmCP_ME_RAM_DATAL, w100_microcode[i][0]); ++ } ++} ++ ++/* Required when reading from video memory after acceleration to make sure all ++ * data has been flushed to video memory from the pixel cache. ++ */ ++static void ++ATIFlushPixelCache(ATIScreenInfo * atis) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ rbbm_status_u rs; ++ TIMEOUT_LOCALS; ++ ++ WHILE_NOT_TIMEOUT(.2) { ++ rs.val = MMIO_IN32(mmio, mmRBBM_STATUS); ++ if (!rs.f.gui_active) ++ break; ++ } ++ if (TIMEDOUT()) ++ ErrorF("Timeout flushing pixel cache.\n"); ++} ++ ++static void ++ATIEngineReset(ATIScreenInfo * atis) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ CARD32 sclk_cntl; ++ sclk_cntl_u sc; ++ rbbm_soft_reset_u rsr; ++ ++#if DEBUG_FIFO ++ ErrorF("Engine Reset!\n"); ++ ATIDebugFifo(atis); ++#endif ++ ++ ATIFlushPixelCache(atis); ++ ++ sc.val = sclk_cntl = MMIO_IN32(mmio, mmSCLK_CNTL); ++ sc.f.sclk_force_e2 = sc.f.sclk_force_e3 = sc.f.sclk_force_idct = 1; ++ MMIO_OUT32(mmio, mmSCLK_CNTL, sc.val); ++ ++ rsr.val = 0; ++ rsr.f.soft_reset_e2 = 1; ++ MMIO_OUT32(mmio, mmRBBM_SOFT_RESET, rsr.val); ++ MMIO_OUT32(mmio, mmRBBM_SOFT_RESET, 0); ++ ++ MMIO_OUT32(mmio, mmSCLK_CNTL, sclk_cntl); ++} ++ ++inline void ++ATIWaitAvailMMIO(ATIScreenInfo * atis, int n) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ rbbm_status_u rs; ++ TIMEOUT_LOCALS; ++ ++ if (atis->mmio_avail >= n) { ++ atis->mmio_avail -= n; ++ return; ++ } ++ WHILE_NOT_TIMEOUT(.2) { ++ rs.val = MMIO_IN32(mmio, mmRBBM_STATUS); ++ atis->mmio_avail = rs.f.cmdfifo_avail; ++ if (atis->mmio_avail >= n) ++ break; ++ ErrorF("Available %d slots.\n", atis->mmio_avail); ++ } ++ if (TIMEDOUT()) { ++ ErrorF("Timeout waiting for %d MMIO slots.\n", n); ++ ATIEngineReset(atis); ++ ATIDrawSetup(atis->screen->pScreen); ++ } ++ atis->mmio_avail -= n; ++} ++ ++ ++void ++ATIWaitIdle(ATIScreenInfo * atis) ++{ ++ ATICardInfo *atic = atis->atic; ++ char *mmio = atic->reg_base; ++ rbbm_status_u rs; ++ TIMEOUT_LOCALS; ++ ++ /* Empty the fifo */ ++ ATIWaitAvailMMIO(atis, 16); ++ ++ WHILE_NOT_TIMEOUT(.2) { ++ rs.val = MMIO_IN32(mmio, mmRBBM_STATUS); ++ if (!rs.f.gui_active) ++ break; ++#if DEBUG_FIFO ++ ATIDebugFifo(atis); ++#endif ++ /* don't know if this is needed, but it's in aticore */ ++ MMIO_IN32(mmio, mmCP_RB_RPTR); ++ } ++ if (TIMEDOUT()) { ++ ErrorF("Timeout idling accelerator, resetting...\n"); ++ ATIEngineReset(atis); ++ ATIDrawSetup(atis->screen->pScreen); ++ } ++ ++ ATIFlushPixelCache(atis); ++ ++#if DEBUG_FIFO ++ ErrorF("Idle?\n"); ++ ATIDebugFifo(atis); ++#endif ++} ++ ++ ++static Bool ++ATIDMAInit(ScreenPtr pScreen, Bool use_agp) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ATICardInfo(pScreenPriv); ++ char *mmio = atic->reg_base; ++ int dma_offset, rbsize = 10; ++ wrap_start_dir_u wsd; ++ wrap_buf_a_u wba; ++ cp_rb_cntl_u rc; ++ cp_csq_cntl_u cc; ++ CARD32 mem_offset; ++ ++ /* with rbsize = 10, DMA buffer will be of 0x2000 (8192) bytes */ ++ atis->ring_count = 1 << (rbsize + 1); ++ atis->ring_mask = atis->ring_count - 1; ++ atis->ring_len = atis->ring_count * 4; ++ atis->dma_space = KdOffscreenAlloc(pScreen, atis->ring_len, ++ 16, TRUE, NULL, NULL); ++ if (atis->dma_space == NULL) ++ return FALSE; ++ ++ wsd.val = MMIO_IN32(mmio, mmWRAP_START_DIR); ++ atis->ring_addr = ++ (CARD32 *) (atic->mem_base + (wsd.f.start_addr << 1)); ++ dma_offset = atis->dma_space->offset; ++ ++ ATIUploadMicrocode(atis); ++ ATIEngineReset(atis); ++ ++ atis->ring_read = 0; ++ atis->ring_write = 0; ++ atis->ring_free = atis->ring_count; ++ ++ mem_offset = atic->ext_mem_location + atis->dma_space->offset; ++ MMIO_OUT32(mmio, mmCP_RB_BASE, mem_offset); ++ MMIO_OUT32(mmio, mmCP_RB_WPTR, atis->ring_write); ++ MMIO_OUT32(mmio, mmCP_RB_RPTR, atis->ring_read); ++ MMIO_OUT32(mmio, mmCP_RB_RPTR_ADDR, 0); ++ ++ wba.val = 0; ++ wba.f.offset_addr_a = mem_offset; ++ switch (rbsize) { ++ case 9: ++ wba.f.block_size_a = WB_BLOCK_SIZE_A_0; ++ break; ++ case 10: ++ wba.f.block_size_a = WB_BLOCK_SIZE_A_1; ++ break; ++ case 11: ++ wba.f.block_size_a = WB_BLOCK_SIZE_A_2; ++ break; ++ case 12: ++ wba.f.block_size_a = WB_BLOCK_SIZE_A_3; ++ break; ++ case 13: ++ wba.f.block_size_a = WB_BLOCK_SIZE_A_4; ++ break; ++ } ++ MMIO_OUT32(mmio, mmWRAP_BUF_A, wba.val); ++ ++ rc.val = 0; ++ rc.f.rb_no_update = 1; ++ rc.f.rb_bufsz = rbsize; ++ MMIO_OUT32(mmio, mmCP_RB_CNTL, rc.val); ++ ++ cc.val = 0; ++ cc.f.csq_mode = CSQ_CNTL_MODE_FREERUN; ++ MMIO_OUT32(mmio, mmCP_CSQ_CNTL, cc.val); ++ ++ return TRUE; ++} ++ ++static Bool ++ATIDMAFini(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ATICardInfo(pScreenPriv); ++ char *mmio = atic->reg_base; ++ ++ MMIO_OUT32(mmio, mmCP_CSQ_CNTL, 0); ++ ++ ATIEngineReset(atis); ++ ++ //KdOffscreenFree(pScreen, atis->dma_space); ++ ++ return TRUE; ++} ++ ++void ++ATIDMASetup(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ++ atis->using_dma = FALSE; ++ atis->using_pio = FALSE; ++ if (ATIDMAInit(pScreen, FALSE)) ++ atis->using_dma = TRUE; ++ ++ if (atis->using_dma) ++ ErrorF("Initialized DMA\n"); ++} ++ ++void ++ATIDMATeardown(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ++ ATIWaitIdle(atis); ++ ++ if (atis->using_dma) ++ ATIDMAFini(pScreen); ++ ++ atis->using_pio = FALSE; ++ atis->using_dma = FALSE; ++} ++ ++ ++CARD32 * ++ATIRequestEntries(ATIScreenInfo * atis, int n) ++{ ++ char *mmio = atis->atic->reg_base; ++ CARD32 *ptr; ++ TIMEOUT_LOCALS; ++ ++ WHILE_NOT_TIMEOUT(1) { ++ if (atis->ring_free > n) { ++ ptr = atis->ring_addr + atis->ring_write; ++ return ptr; ++ } ++ atis->ring_read = MMIO_IN32(mmio, mmCP_RB_RPTR); ++ atis->ring_write = MMIO_IN32(mmio, mmCP_RB_WPTR); ++ ++ if (atis->ring_read == atis->ring_write) { ++ atis->ring_free = atis->ring_count; ++ } else { ++ atis->ring_free = ++ (atis->ring_count + ++ atis->ring_read - atis->ring_write) & atis->ring_mask; ++ } ++ } ++ if (TIMEDOUT()) ++ ErrorF("Timeout waiting for %d entries.\n", n); ++ return NULL; ++} ++ ++void ++ATISubmitEntries(ATIScreenInfo * atis, int n) ++{ ++ char *mmio = atis->atic->reg_base; ++ atis->ring_free -= n; ++ atis->ring_write += n; ++ atis->ring_write &= atis->ring_mask; ++ MMIO_OUT32(mmio, mmCP_RB_WPTR, atis->ring_write); ++} +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.h 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,176 @@ ++/* ++ * Copyright © 2004 Eric Anholt ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Eric Anholt not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Eric Anholt makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++/* $Header: /cvs/xserver/xserver/hw/kdrive/ati/ati_dma.h,v 1.5 2005-01-27 05:25:57 anholt Exp $ */ ++ ++#ifndef _ATI_DMA_H_ ++#define _ATI_DMA_H_ ++ ++#define CCE_DEBUG 1 ++ ++/* CCE packet defines */ ++ ++#define ATI_CCE_PACKETTYPE_MASK 0xc0000000 ++#define ATI_CCE_PACKET0 0x00000000 ++#define ATI_CCE_PACKET0_COUNT_MASK 0x3fff0000 ++#define ATI_CCE_PACKET0_ONE_REG_WR 0x00008000 ++#define ATI_CCE_PACKET0_REG_MASK 0x000007ff ++#define ATI_CCE_PACKET1 0x40000000 ++#define ATI_CCE_PACKET1_REG_1 0x000007ff ++#define ATI_CCE_PACKET1_REG_2 0x003ff800 ++#define ATI_CCE_PACKET1_REG_2_SHIFT 10 ++#define ATI_CCE_PACKET2 0x80000000 ++#define ATI_CCE_PACKET3 0xc0000000 ++#define ATI_CCE_PACKET3_COUNT_MASK 0x3fff0000 ++#define ATI_CCE_PACKET3_IT_OPCODE_MASK 0x0000ff00 ++ ++ ++#if !CCE_DEBUG ++#define DMA_PACKET0(reg, count) \ ++ (ATI_CCE_PACKET0 | (((count) - 1) << 16) | ((reg) >> 2)) ++#else ++#define DMA_PACKET0(reg, count) \ ++ (__packet0count = (count), __reg = (reg), \ ++ ATI_CCE_PACKET0 | (((count) - 1) << 16) | ((reg) >> 2)) ++#endif ++#define DMA_PACKET1(reg1, reg2) \ ++ (ATI_CCE_PACKET1 | \ ++ (((reg2) >> 2) << ATI_CCE_PACKET1_REG_2_SHIFT) | ((reg1) >> 2)) ++#define DMA_PACKET3(type, count) \ ++ ((type) | (((count) - 1) << 16)) ++ ++ ++ ++#ifdef USE_DMA ++ ++#if !CCE_DEBUG ++ ++#define RING_LOCALS \ ++ CARD32 *__head; int __count ++#define BEGIN_DMA(n) \ ++do { \ ++ __head = ATIRequestEntries(atis, n); \ ++ __count = 0; \ ++} while (0) ++#define END_DMA() do { \ ++ ATISubmitEntries(atis, __count); \ ++} while (0) ++ ++#else /* CCE_DEBUG */ ++#define RING_LOCALS \ ++ CARD32 *__head; int __count, __total, __reg, __packet0count ++#define BEGIN_DMA(n) \ ++do { \ ++ __head = ATIRequestEntries(atis, n); \ ++ __count = 0; \ ++ __total = n; \ ++ __reg = 0; \ ++ __packet0count = 0; \ ++} while (0) ++#define END_DMA() do { \ ++ if (__count != __total) \ ++ FatalError("count != total (%d vs %d) at %s:%d\n", \ ++ __count, __total, __FILE__, __LINE__); \ ++ ATISubmitEntries(atis, __count); \ ++} while (0) ++ ++#endif /* CCE_DEBUG */ ++ ++#define BEGIN_DMA_REG(n) BEGIN_DMA(n * 2) ++#define END_DMA_REG() END_DMA() ++ ++#define OUT_REG(reg, val) \ ++do { \ ++ OUT_RING(DMA_PACKET0(reg, 1)); \ ++ OUT_RING(val); \ ++} while (0) ++ ++ ++#else /* USE_DMA */ ++ ++ ++#define RING_LOCALS char *__mmio = atis->atic->reg_base ++#define BEGIN_DMA_REG(n) \ ++do { \ ++ ATIWaitAvailMMIO(atis, n); \ ++} while (0) ++#define END_DMA_REG() do {} while (0) ++#define OUT_REG(reg, val) MMIO_OUT32(__mmio, reg, val) ++#endif /* USE_DMA */ ++ ++ ++#define OUT_RING(val) do { \ ++ __head[__count++] = (val); \ ++} while (0) ++ ++#define OUT_RING_REG(reg, val) do { \ ++ if (__reg != reg) \ ++ FatalError("unexpected reg (0x%x vs 0x%x) at %s:%d\n", \ ++ reg, __reg, __FILE__, __LINE__); \ ++ if (__packet0count-- <= 0) \ ++ FatalError("overrun of packet0 at %s:%d\n", \ ++ __FILE__, __LINE__); \ ++ __head[__count++] = (val); \ ++ __reg += 4; \ ++} while (0) ++ ++#define OUT_RING_F(x) OUT_RING(GET_FLOAT_BITS(x)) ++ ++#define TIMEOUT_LOCALS struct timeval _target, _curtime ++ ++static inline Bool ++tv_le(struct timeval *tv1, struct timeval *tv2) ++{ ++ if (tv1->tv_sec < tv2->tv_sec || ++ (tv1->tv_sec == tv2->tv_sec && tv1->tv_usec < tv2->tv_usec)) ++ return TRUE; ++ else ++ return FALSE; ++} ++ ++#define WHILE_NOT_TIMEOUT(_timeout) \ ++ gettimeofday(&_target, NULL); \ ++ _target.tv_usec += ((_timeout) * 1000000); \ ++ _target.tv_sec += _target.tv_usec / 1000000; \ ++ _target.tv_usec = _target.tv_usec % 1000000; \ ++ while (gettimeofday(&_curtime, NULL), tv_le(&_curtime, &_target)) ++ ++#define TIMEDOUT() (!tv_le(&_curtime, &_target)) ++ ++ ++void ++ATIFlushIndirect(ATIScreenInfo *atis, Bool discard); ++ ++void ++ATIDMASetup(ScreenPtr pScreen); ++ ++void ++ATIDMATeardown(ScreenPtr pScreen); ++ ++CARD32 * ++ATIRequestEntries(ATIScreenInfo *atis, int n); ++ ++void ++ATISubmitEntries(ATIScreenInfo *atis, int n); ++ ++inline void ++ATIWaitAvailMMIO(ATIScreenInfo *atis, int n); ++#endif /* _ATI_DMA_H_ */ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,477 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#define USE_DMA ++#define DRAW_USING_PACKET3 ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++#include "ati.h" ++#include "w100_regs.h" ++#include "w100_const.h" ++#include "ati_dma.h" ++#include "ati_draw.h" ++#include "kaa.h" ++ ++ ++CARD8 ATISolidRop[16] = { ++ /* GXclear */ 0x00, ++ /* 0 */ ++ /* GXand */ 0xa0, ++ /* src AND dst */ ++ /* GXandReverse */ 0x50, ++ /* src AND NOT dst */ ++ /* GXcopy */ 0xf0, ++ /* src */ ++ /* GXandInverted */ 0x0a, ++ /* NOT src AND dst */ ++ /* GXnoop */ 0xaa, ++ /* dst */ ++ /* GXxor */ 0x5a, ++ /* src XOR dst */ ++ /* GXor */ 0xfa, ++ /* src OR dst */ ++ /* GXnor */ 0x05, ++ /* NOT src AND NOT dst */ ++ /* GXequiv */ 0xa5, ++ /* NOT src XOR dst */ ++ /* GXinvert */ 0x55, ++ /* NOT dst */ ++ /* GXorReverse */ 0xf5, ++ /* src OR NOT dst */ ++ /* GXcopyInverted */ 0x0f, ++ /* NOT src */ ++ /* GXorInverted */ 0xaf, ++ /* NOT src OR dst */ ++ /* GXnand */ 0x5f, ++ /* NOT src OR NOT dst */ ++ /* GXset */ 0xff, ++ /* 1 */ ++}; ++ ++CARD8 ATIBltRop[16] = { ++ /* GXclear */ 0x00, ++ /* 0 */ ++ /* GXand */ 0x88, ++ /* src AND dst */ ++ /* GXandReverse */ 0x44, ++ /* src AND NOT dst */ ++ /* GXcopy */ 0xcc, ++ /* src */ ++ /* GXandInverted */ 0x22, ++ /* NOT src AND dst */ ++ /* GXnoop */ 0xaa, ++ /* dst */ ++ /* GXxor */ 0x66, ++ /* src XOR dst */ ++ /* GXor */ 0xee, ++ /* src OR dst */ ++ /* GXnor */ 0x11, ++ /* NOT src AND NOT dst */ ++ /* GXequiv */ 0x99, ++ /* NOT src XOR dst */ ++ /* GXinvert */ 0x55, ++ /* NOT dst */ ++ /* GXorReverse */ 0xdd, ++ /* src OR NOT dst */ ++ /* GXcopyInverted */ 0x33, ++ /* NOT src */ ++ /* GXorInverted */ 0xbb, ++ /* NOT src OR dst */ ++ /* GXnand */ 0x77, ++ /* NOT src OR NOT dst */ ++ /* GXset */ 0xff, ++ /* 1 */ ++}; ++ ++static int copydx, copydy; ++static ATIScreenInfo *accel_atis; ++static char *accel_mmio; ++ ++ ++void ++ATIDrawSetup(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ default_sc_bottom_right_u dsbr; ++ RING_LOCALS; ++ ++ dsbr.val = 0; ++ dsbr.f.default_sc_right = dsbr.f.default_sc_bottom = W100_MAXINT; ++ ++ BEGIN_DMA_REG(2); ++ OUT_REG(mmDEFAULT_SC_BOTTOM_RIGHT, dsbr.val); ++ OUT_REG(mmSRC_SC_BOTTOM_RIGHT, dsbr.val); ++ END_DMA_REG(); ++} ++ ++static void ++ATIWaitMarker(ScreenPtr pScreen, int marker) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ++ ENTER_DRAW(0); ++ ATIWaitIdle(atis); ++ LEAVE_DRAW(0); ++} ++ ++ ++#if ATI_TRACE_DRAW ++void ++ATIEnterDraw(PixmapPtr pPix, const char *function) ++{ ++ if (pPix != NULL) { ++ KdScreenPriv(pPix->drawable.pScreen); ++ CARD32 offset; ++ ++ offset = ((CARD8 *) pPix->devPrivate.ptr - ++ pScreenPriv->screen->memory_base); ++ ++ ErrorF("Enter %s 0x%x (%dx%dx%d/%d)\n", function, offset, ++ pPix->drawable.width, pPix->drawable.height, ++ pPix->drawable.depth, pPix->drawable.bitsPerPixel); ++ } else ++ ErrorF("Enter %s\n", function); ++} ++ ++void ++ATILeaveDraw(PixmapPtr pPix, const char *function) ++{ ++ if (pPix != NULL) { ++ KdScreenPriv(pPix->drawable.pScreen); ++ CARD32 offset; ++ ++ offset = ((CARD8 *) pPix->devPrivate.ptr - ++ pScreenPriv->screen->memory_base); ++ ++ ErrorF("Leave %s 0x%x\n", function, offset); ++ } else ++ ErrorF("Leave %s\n", function); ++} ++#endif ++ ++/* Assumes that depth 15 and 16 can be used as depth 16, which is okay since we ++ * require src and dest datatypes to be equal. ++ */ ++static Bool ++ATIGetDatatypeBpp(int bpp, CARD32 * type) ++{ ++ switch (bpp) { ++ case 8: ++ *type = DATATYPE_8BPP; ++ return TRUE; ++ case 16: ++ *type = DATATYPE_ARGB1555; ++ return TRUE; ++ default: ++ ATI_FALLBACK(("Unsupported bpp: %d\n", bpp)); ++ return FALSE; ++ } ++} ++ ++ ++Bool ++ATIGetPixmapOffsetPitch(PixmapPtr pPix, CARD32 * pitch, CARD32 * offset) ++{ ++ KdScreenPriv(pPix->drawable.pScreen); ++ ATICardInfo(pScreenPriv); ++ ++ /* XXX this only works for surfaces allocated in external memory */ ++ *offset = ((CARD8 *) pPix->devPrivate.ptr - ++ pScreenPriv->screen->memory_base) + atic->ext_mem_location; ++ *pitch = pPix->devKind >> 1; ++ ++ return TRUE; ++} ++ ++ ++static Bool ++ATIPrepareSolid(PixmapPtr pPix, int alu, Pixel pm, Pixel fg) ++{ ++ KdScreenPriv(pPix->drawable.pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ATICardInfo(pScreenPriv); ++ CARD32 datatype, dst_pitch, dst_offset; ++ dp_gui_master_cntl_u gmc; ++ dp_cntl_u dp_cntl; ++ RING_LOCALS; ++ ++ accel_atis = atis; ++ accel_mmio = atic->reg_base; ++ ++ if (!ATIGetDatatypeBpp(pPix->drawable.bitsPerPixel, &datatype)) ++ return FALSE; ++ if (!ATIGetPixmapOffsetPitch(pPix, &dst_pitch, &dst_offset)) ++ return FALSE; ++ ++ ENTER_DRAW(pPix); ++ ++ gmc.val = 0; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_clipping = 1; ++ gmc.f.gmc_brush_datatype = BRUSH_SOLIDCOLOR; ++ gmc.f.gmc_dst_datatype = datatype; ++ gmc.f.gmc_src_datatype = datatype; ++ gmc.f.gmc_byte_pix_order = 1; ++ gmc.f.gmc_rop3 = ATISolidRop[alu]; ++ gmc.f.gmc_dp_src_source = SOURCE_MEM_RECTANGULAR; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ gmc.f.gmc_dp_op = OP_ROP; ++ ++ dp_cntl.val = 0; ++ dp_cntl.f.dst_x_dir = 1; ++ dp_cntl.f.dst_y_dir = 1; ++ ++ BEGIN_DMA_REG(6); ++ OUT_REG(mmDST_PITCH, dst_pitch); ++ OUT_REG(mmDST_OFFSET, dst_offset); ++ OUT_REG(mmDP_GUI_MASTER_CNTL, gmc.val); ++ OUT_REG(mmDP_BRUSH_FRGD_CLR, fg); ++ OUT_REG(mmDP_WRITE_MSK, pm); ++ OUT_REG(mmDP_CNTL, dp_cntl.val); ++ END_DMA_REG(); ++ ++ LEAVE_DRAW(pPix); ++ return TRUE; ++} ++ ++static void ++ATISolid(int x1, int y1, int x2, int y2) ++{ ++ ENTER_DRAW(0); ++ ATIScreenInfo *atis = accel_atis; ++ RING_LOCALS; ++ ++#ifdef DRAW_USING_PACKET3 ++ BEGIN_DMA(3); ++ OUT_RING(DMA_PACKET3(W100_CCE_PACKET3_PAINT_MULTI, 2)); ++ OUT_RING((x1 << 16) | y1); ++ OUT_RING(((x2 - x1) << 16) | (y2 - y1)); ++ END_DMA(); ++#elif defined DRAW_USING_PACKET0 ++ BEGIN_DMA(3); ++ OUT_RING(DMA_PACKET0(mmDST_Y_X, 2)); ++ OUT_RING_REG(mmDST_Y_X, (y1 << 16) | x1); ++ OUT_RING_REG(mmDST_HEIGHT_WIDTH, ((y2 - y1) << 16) | (x2 - x1)); ++ END_DMA(); ++#else ++ BEGIN_DMA_REG(2); ++ OUT_REG(mmDST_Y_X, (y1 << 16) | x1); ++ OUT_REG(mmDST_HEIGHT_WIDTH, ((y2 - y1) << 16) | (x2 - x1)); ++ END_DMA_REG(); ++#endif ++ LEAVE_DRAW(0); ++} ++ ++ ++static void ++ATIDoneSolid(void) ++{ ++ ENTER_DRAW(0); ++ LEAVE_DRAW(0); ++} ++ ++ ++static Bool ++ATIPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, ++ Pixel pm) ++{ ++ KdScreenPriv(pDst->drawable.pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ATICardInfo(pScreenPriv); ++ CARD32 datatype, src_pitch, src_offset, dst_pitch, dst_offset; ++ dp_gui_master_cntl_u gmc; ++ dp_cntl_u dp_cntl; ++ dp_datatype_u dpdt; ++ RING_LOCALS; ++ ++ accel_mmio = atic->reg_base; ++ copydx = dx; ++ copydy = dy; ++ accel_atis = atis; ++ ++ if (!ATIGetDatatypeBpp(pDst->drawable.bitsPerPixel, &datatype)) ++ return FALSE; ++ if (!ATIGetPixmapOffsetPitch(pSrc, &src_pitch, &src_offset)) ++ return FALSE; ++ if (!ATIGetPixmapOffsetPitch(pDst, &dst_pitch, &dst_offset)) ++ return FALSE; ++ ++ ENTER_DRAW(pDst); ++ ++ gmc.val = 0; ++ gmc.f.gmc_src_pitch_offset_cntl = 1; ++ gmc.f.gmc_dst_pitch_offset_cntl = 1; ++ gmc.f.gmc_src_clipping = 1; ++ gmc.f.gmc_dst_clipping = 1; ++ gmc.f.gmc_brush_datatype = BRUSH_NONE; ++ gmc.f.gmc_dst_datatype = datatype; ++ gmc.f.gmc_src_datatype = datatype; ++ gmc.f.gmc_byte_pix_order = 1; ++ gmc.f.gmc_rop3 = ATIBltRop[alu]; ++ gmc.f.gmc_dp_src_source = SOURCE_MEM_RECTANGULAR; ++ gmc.f.gmc_clr_cmp_fcn_dis = 1; ++ gmc.f.gmc_dp_op = OP_ROP; ++ ++ dp_cntl.val = 0; ++ if (dx >= 0) ++ dp_cntl.f.dst_x_dir = 1; ++ if (dy >= 0) ++ dp_cntl.f.dst_y_dir = 1; ++ ++ dpdt.val = 0; ++ dpdt.f.dp_dst_datatype = datatype; ++ dpdt.f.dp_src_datatype = datatype; ++ dpdt.f.dp_byte_pix_order = 1; ++ ++ BEGIN_DMA_REG(8); ++ OUT_REG(mmSRC_PITCH, src_pitch); ++ OUT_REG(mmSRC_OFFSET, src_offset); ++ OUT_REG(mmDST_PITCH, dst_pitch); ++ OUT_REG(mmDST_OFFSET, dst_offset); ++ OUT_REG(mmDP_GUI_MASTER_CNTL, gmc.val); ++ OUT_REG(mmDP_WRITE_MSK, pm); ++ OUT_REG(mmDP_CNTL, dp_cntl.val); ++ OUT_REG(mmDP_DATATYPE, dpdt.val); ++ END_DMA_REG(); ++ ++ LEAVE_DRAW(pDst); ++ return TRUE; ++} ++ ++static void ++ATICopy(int srcX, int srcY, int dstX, int dstY, int w, int h) ++{ ++ ATIScreenInfo *atis = accel_atis; ++ RING_LOCALS; ++ ++ ENTER_DRAW(0); ++#ifndef DRAW_USING_PACKET3 ++ if (copydx < 0) { ++ srcX += w - 1; ++ dstX += w - 1; ++ } ++ if (copydy < 0) { ++ srcY += h - 1; ++ dstY += h - 1; ++ } ++#endif ++ ++#ifdef DRAW_USING_PACKET3 ++ BEGIN_DMA(4); ++ OUT_RING(DMA_PACKET3(W100_CCE_PACKET3_BITBLT_MULTI, 3)); ++ OUT_RING((srcX << 16) | srcY); ++ OUT_RING((dstX << 16) | dstY); ++ OUT_RING((w << 16) | h); ++ END_DMA(); ++#elif defined DRAW_USING_PACKET0 ++ BEGIN_DMA(4); ++ OUT_RING(DMA_PACKET0(mmSRC_Y_X, 3)); ++ OUT_RING_REG(mmSRC_Y_X, (srcY << 16) | srcX); ++ OUT_RING_REG(mmDST_Y_X, (dstY << 16) | dstX); ++ OUT_RING_REG(mmDST_HEIGHT_WIDTH, (h << 16) | w); ++ END_DMA(); ++#else ++ BEGIN_DMA_REG(3); ++ OUT_REG(mmSRC_Y_X, (srcY << 16) | srcX); ++ OUT_REG(mmDST_Y_X, (dstY << 16) | dstX); ++ OUT_REG(mmDST_HEIGHT_WIDTH, (h << 16) | w); ++ END_DMA_REG(); ++#endif ++ LEAVE_DRAW(0); ++} ++ ++ ++static void ++ATIDoneCopy(void) ++{ ++ ENTER_DRAW(0); ++ LEAVE_DRAW(0); ++} ++ ++ ++Bool ++ATIDrawInit(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ++ ErrorF("Screen: %d/%d depth/bpp\n", pScreenPriv->screen->fb[0].depth, ++ pScreenPriv->screen->fb[0].bitsPerPixel); ++ ++ memset(&atis->kaa, 0, sizeof(KaaScreenInfoRec)); ++ atis->kaa.waitMarker = ATIWaitMarker; ++ atis->kaa.PrepareSolid = ATIPrepareSolid; ++ atis->kaa.Solid = ATISolid; ++ atis->kaa.DoneSolid = ATIDoneSolid; ++ atis->kaa.PrepareCopy = ATIPrepareCopy; ++ atis->kaa.Copy = ATICopy; ++ atis->kaa.DoneCopy = ATIDoneCopy; ++ /* XXX if this flag isn't specified, Kdrive crashes in kaaPixmapUseMemory ++ * or kaaPixmapUseScreen. But this is probably caused by some bug in this ++ * driver... */ ++ atis->kaa.flags |= KAA_OFFSCREEN_PIXMAPS; ++ if (!kaaDrawInit(pScreen, &atis->kaa)) ++ return FALSE; ++ ++ return TRUE; ++} ++ ++ ++void ++ATIDrawEnable(ScreenPtr pScreen) ++{ ++ KdScreenPriv(pScreen); ++ ATIScreenInfo(pScreenPriv); ++ ++ ATIDMASetup(pScreen); ++ ATIDrawSetup(pScreen); ++ ++ atis->scratch_area = NULL; ++ atis->kaa.PrepareBlend = NULL; ++ atis->kaa.Blend = NULL; ++ atis->kaa.DoneBlend = NULL; ++ atis->kaa.CheckComposite = NULL; ++ atis->kaa.PrepareComposite = NULL; ++ atis->kaa.Composite = NULL; ++ atis->kaa.DoneComposite = NULL; ++ atis->kaa.UploadToScreen = NULL; ++ atis->kaa.UploadToScratch = NULL; ++ ++ ++ kaaMarkSync(pScreen); ++} ++ ++void ++ATIDrawDisable(ScreenPtr pScreen) ++{ ++ ATIDMATeardown(pScreen); ++} ++ ++void ++ATIDrawFini(ScreenPtr pScreen) ++{ ++ kaaDrawFini(pScreen); ++} +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.h 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,107 @@ ++/* ++ * Copyright © 2004 Eric Anholt ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Eric Anholt not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Eric Anholt makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++/* $Header: /cvs/xserver/xserver/hw/kdrive/ati/ati_draw.h,v 1.9 2005-02-21 03:44:10 anholt Exp $ */ ++ ++#ifndef _ATI_DRAW_H_ ++#define _ATI_DRAW_H_ ++ ++Bool ATIGetOffsetPitch(ATIScreenInfo *atis, int bpp, CARD32 *pitch_offset, ++ int offset, int pitch); ++Bool ATIGetPixmapOffsetPitch(PixmapPtr pPix, CARD32 *pitch, CARD32 *offset); ++ ++Bool R128CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, ++ PicturePtr pDstPicture); ++Bool R128PrepareComposite(int op, PicturePtr pSrcPicture, ++ PicturePtr pMaskPicture, PicturePtr pDstPicture, PixmapPtr pSrc, ++ PixmapPtr pMask, PixmapPtr pDst); ++void R128Composite(int srcX, int srcY, int maskX, int maskY, int dstX, int dstY, ++ int w, int h); ++void R128DoneComposite(void); ++ ++Bool R128PrepareTrapezoids(PicturePtr pDstPicture, PixmapPtr pDst); ++void R128Trapezoids(KaaTrapezoid *traps, int ntraps); ++void R128DoneTrapezoids(void); ++ ++Bool R100CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, ++ PicturePtr pDstPicture); ++Bool R100PrepareComposite(int op, PicturePtr pSrcPicture, ++ PicturePtr pMaskPicture, PicturePtr pDstPicture, PixmapPtr pSrc, ++ PixmapPtr pMask, PixmapPtr pDst); ++Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, ++ PicturePtr pDstPicture); ++Bool R200PrepareComposite(int op, PicturePtr pSrcPicture, ++ PicturePtr pMaskPicture, PicturePtr pDstPicture, PixmapPtr pSrc, ++ PixmapPtr pMask, PixmapPtr pDst); ++void RadeonComposite(int srcX, int srcY, int maskX, int maskY, int dstX, ++ int dstY, int w, int h); ++void RadeonDoneComposite(void); ++ ++Bool RadeonPrepareTrapezoids(PicturePtr pDstPicture, PixmapPtr pDst); ++void RadeonTrapezoids(KaaTrapezoid *traps, int ntraps); ++void RadeonDoneTrapezoids(void); ++ ++void RadeonSwitchTo2D(ATIScreenInfo *atis); ++void RadeonSwitchTo3D(ATIScreenInfo *atis); ++void ATIWaitIdle(ATIScreenInfo *atis); ++ ++#define ATI_TRACE_FALL 0 ++#define ATI_TRACE_DRAW 1 ++ ++#if ATI_TRACE_FALL ++#define ATI_FALLBACK(x) \ ++do { \ ++ ErrorF("%s: ", __FUNCTION__); \ ++ ErrorF x; \ ++ return FALSE; \ ++} while (0) ++#else ++#define ATI_FALLBACK(x) return FALSE ++#endif ++ ++#if ATI_TRACE_DRAW ++#define ENTER_DRAW(pix) ATIEnterDraw(pix, __FUNCTION__) ++#define LEAVE_DRAW(pix) ATILeaveDraw(pix, __FUNCTION__) ++ ++void ++ATIEnterDraw (PixmapPtr pPixmap, const char *function); ++ ++void ++ATILeaveDraw (PixmapPtr pPixmap, const char *function); ++#else /* ATI_TRACE */ ++#define ENTER_DRAW(pix) ++#define LEAVE_DRAW(pix) ++#endif /* !ATI_TRACE */ ++ ++#ifndef USE_DMA ++/* if DMA is not going to be used, drawing using PACKET3 or PACKET0 won't ++ * be possible */ ++#ifdef DRAW_USING_PACKET3 ++#undef DRAW_USING_PACKET3 ++#endif ++ ++#ifdef DRAW_USING_PACKET0 ++#undef DRAW_USING_PACKET0 ++#endif ++ ++#endif /* USE_DMA */ ++ ++#endif /* _ATI_DRAW_H_ */ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.h 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,256 @@ ++/* ++ * $Id: ati.h,v 1.18 2005-06-10 02:14:44 anholt Exp $ ++ * ++ * Copyright © 2003 Eric Anholt ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Eric Anholt not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Eric Anholt makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++/* $Header: /cvs/xserver/xserver/hw/kdrive/ati/ati.h,v 1.18 2005-06-10 02:14:44 anholt Exp $ */ ++ ++#ifndef _ATI_H_ ++#define _ATI_H_ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#ifdef KDRIVEFBDEV ++#include ++#endif ++#ifdef KDRIVEVESA ++#include ++#endif ++ ++#include "kxv.h" ++ ++ ++#define ATI_MEM_BASE(c) (0x08000000) ++#define ATI_MEM_SIZE(c) (0x01000000) ++#define ATI_REG_BASE(c) (ATI_MEM_BASE(c) + 0x10000) /* the 0x08000000 must be obtained from /proc/iomem, the 0x10000 from ReadCfgReg(cfgREG_BASE) << 16) & 0xff0000 */ ++#define ATI_REG_SIZE(c) (0x2000) ++ ++#ifdef __powerpc__ ++ ++static __inline__ void ++MMIO_OUT32(__volatile__ void *base, const unsigned long offset, ++ const unsigned int val) ++{ ++ __asm__ __volatile__( ++ "stwbrx %1,%2,%3\n\t" ++ "eieio" ++ : "=m" (*((volatile unsigned char *)base+offset)) ++ : "r" (val), "b" (base), "r" (offset)); ++} ++ ++static __inline__ CARD32 ++MMIO_IN32(__volatile__ void *base, const unsigned long offset) ++{ ++ register unsigned int val; ++ __asm__ __volatile__( ++ "lwbrx %0,%1,%2\n\t" ++ "eieio" ++ : "=r" (val) ++ : "b" (base), "r" (offset), ++ "m" (*((volatile unsigned char *)base+offset))); ++ return val; ++} ++ ++#else ++ ++#define MMIO_OUT32(mmio, a, v) (*(VOL32 *)((mmio) + (a)) = (v)) ++#define MMIO_IN32(mmio, a) (*(VOL32 *)((mmio) + (a))) ++ ++#endif ++ ++#define MMIO_OUT8(mmio, a, v) (*(VOL8 *)((mmio) + (a)) = (v)) ++#define MMIO_IN8(mmio, a, v) (*(VOL8 *)((mmio) + (a))) ++ ++ ++typedef volatile CARD8 VOL8; ++typedef volatile CARD16 VOL16; ++typedef volatile CARD32 VOL32; ++ ++struct pci_id_entry { ++ CARD16 vendor; ++ CARD16 device; ++ CARD8 caps; ++ char *name; ++}; ++ ++struct backend_funcs { ++ void (*cardfini)(KdCardInfo *); ++ void (*scrfini)(KdScreenInfo *); ++ Bool (*initScreen)(ScreenPtr); ++ Bool (*finishInitScreen)(ScreenPtr pScreen); ++ Bool (*createRes)(ScreenPtr); ++ void (*preserve)(KdCardInfo *); ++ void (*restore)(KdCardInfo *); ++ Bool (*dpms)(ScreenPtr, int); ++ Bool (*enable)(ScreenPtr); ++ void (*disable)(ScreenPtr); ++ void (*getColors)(ScreenPtr, int, int, xColorItem *); ++ void (*putColors)(ScreenPtr, int, int, xColorItem *); ++#ifdef RANDR ++ Bool (*randrSetConfig) (ScreenPtr, Rotation, int, RRScreenSizePtr); ++#endif ++}; ++ ++typedef struct _ATICardInfo { ++ union { ++#ifdef KDRIVEFBDEV ++ FbdevPriv fbdev; ++#endif ++#ifdef KDRIVEVESA ++ VesaCardPrivRec vesa; ++#endif ++ } backend_priv; ++ struct backend_funcs backend_funcs; ++ ++ struct pci_id_entry *pci_id; ++ CARD8 *mem_base; ++ CARD8 *reg_base; ++ CARD32 fb_location; ++ CARD32 ext_mem_location; ++ Bool use_fbdev, use_vesa; ++} ATICardInfo; ++ ++#define getATICardInfo(kd) ((ATICardInfo *) ((kd)->card->driver)) ++#define ATICardInfo(kd) ATICardInfo *atic = getATICardInfo(kd) ++ ++typedef struct _ATICursor { ++ int width, height; ++ int xhot, yhot; ++ ++ Bool has_cursor; ++ CursorPtr pCursor; ++ Pixel source, mask; ++ KdOffscreenArea *area; ++} ATICursor; ++ ++typedef struct _ATIPortPriv { ++ int brightness; ++ int saturation; ++ RegionRec clip; ++ CARD32 size; ++ KdOffscreenArea *off_screen; ++ DrawablePtr pDraw; ++ PixmapPtr pPixmap; ++ ++ CARD32 src_offset; ++ CARD32 src_pitch; ++ CARD8 *src_addr; ++ ++ int id; ++ int src_x1, src_y1, src_x2, src_y2; ++ int dst_x1, dst_y1, dst_x2, dst_y2; ++ int src_w, src_h, dst_w, dst_h; ++} ATIPortPrivRec, *ATIPortPrivPtr; ++ ++typedef struct _ATIScreenInfo { ++ union { ++#ifdef KDRIVEFBDEV ++ FbdevScrPriv fbdev; ++#endif ++#ifdef KDRIVEVESA ++ VesaScreenPrivRec vesa; ++#endif ++ } backend_priv; ++ KaaScreenInfoRec kaa; ++ ++ ATICardInfo *atic; ++ KdScreenInfo *screen; ++ ++ int scratch_offset; ++ int scratch_next; ++ KdOffscreenArea *scratch_area; ++ ++ ATICursor cursor; ++ ++ KdVideoAdaptorPtr pAdaptor; ++ int num_texture_ports; ++ ++ Bool using_pio; /* If we use decode DMA packets to MMIO. */ ++ Bool using_dma; /* If we use non-DRI DMA to submit packets. */ ++ ++ KdOffscreenArea *dma_space; /* For "DMA" from framebuffer. */ ++ CARD32 *ring_addr; /* Beginning of ring buffer. */ ++ int ring_write; /* Index of write ptr in ring. */ ++ int ring_read; /* Index of read ptr in ring. */ ++ int ring_len; ++ int ring_mask; ++ int ring_count; ++ int ring_free; ++ ++ ++ int mmio_avail; ++} ATIScreenInfo; ++ ++#define getATIScreenInfo(kd) ((ATIScreenInfo *) ((kd)->screen->driver)) ++#define ATIScreenInfo(kd) ATIScreenInfo *atis = getATIScreenInfo(kd) ++ ++typedef union { float f; CARD32 i; } fi_type; ++ ++ ++/* ati.c */ ++Bool ++ATIMap(KdCardInfo *card, ATICardInfo *atic); ++ ++void ++ATIUnmap(KdCardInfo *card, ATICardInfo *atic); ++ ++/* ati_draw.c */ ++void ++ATIDrawSetup(ScreenPtr pScreen); ++ ++Bool ++ATIDrawInit(ScreenPtr pScreen); ++ ++void ++ATIDrawEnable(ScreenPtr pScreen); ++ ++void ++ATIDrawDisable(ScreenPtr pScreen); ++ ++void ++ATIDrawFini(ScreenPtr pScreen); ++ ++ ++/* ati_cursor.c */ ++Bool ++ATICursorInit(ScreenPtr pScreen); ++ ++void ++ATICursorEnable(ScreenPtr pScreen); ++ ++void ++ATICursorDisable(ScreenPtr pScreen); ++ ++void ++ATICursorFini(ScreenPtr pScreen); ++ ++void ++ATIRecolorCursor(ScreenPtr pScreen, int ndef, xColorItem *pdef); ++ ++int ++ATILog2(int val); ++ ++ ++extern KdCardFuncs ATIFuncs; ++ ++#endif /* _ATI_H_ */ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_microcode.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_microcode.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,412 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++/* CCE microcode (from ATI) */ ++ ++#include "ati.h" ++ ++ ++CARD32 w100_microcode[][2] = { ++ {0x21007000, 0x00000000} ++ , ++ {0x20007000, 0x00000000} ++ , ++ {0x00000098, 0x00000004} ++ , ++ {0x0000009c, 0x00000004} ++ , ++ {0x66544a49, 0x00000000} ++ , ++ {0x49494174, 0x00000000} ++ , ++ {0x54517d83, 0x00000000} ++ , ++ {0x498d8b64, 0x00000000} ++ , ++ {0x49494949, 0x00000000} ++ , ++ {0x49b6493c, 0x00000000} ++ , ++ {0x49494949, 0x00000000} ++ , ++ {0x49494949, 0x00000000} ++ , ++ {0x49490d10, 0x00000000} ++ , ++ {0x000f0000, 0x00000016} ++ , ++ {0x30292027, 0x00000000} ++ , ++ {0x00000012, 0x00000004} ++ , ++ {0x000f0000, 0x00000016} ++ , ++ {0x30292427, 0x00000000} ++ , ++ {0x0000730f, 0x00000002} ++ , /* mmIDCT_CONTROL */ ++ {0x00061000, 0x00000002} ++ , ++ {0x0000001d, 0x0000001a} ++ , ++ {0x00004000, 0x0000001e} ++ , ++ {0x00061000, 0x00000002} ++ , ++ {0x0000001d, 0x0000001a} ++ , ++ {0x00004000, 0x0000001e} ++ , ++ {0x00061000, 0x00000002} ++ , ++ {0x0000001d, 0x0000001a} ++ , ++ {0x00004000, 0x0000001e} ++ , ++ {0x00000013, 0x00000004} ++ , ++ {0x0003803a, 0x00000002} ++ , ++ {0x04006300, 0x00000002} ++ , /* mmIDCT_RUNS */ ++ {0x00000013, 0x00000004} ++ , ++ {0x00007300, 0x00000002} ++ , /* mmIDCT_RUNS */ ++ {0x00065000, 0x00000002} ++ , ++ {0x00003301, 0x00000002} ++ , /* mmIDCT_LEVELS */ ++ {0x04006301, 0x00000006} ++ , /* mmIDCT_LEVELS */ ++ {0x00007300, 0x00000002} ++ , /* mmIDCT_RUNS */ ++ {0x00007301, 0x00000002} ++ , /* mmIDCT_LEVELS */ ++ {0x00007301, 0x00000006} ++ , /* mmIDCT_LEVELS */ ++ {0x0003803a, 0x00000002} ++ , ++ {0x04006300, 0x00000006} ++ , /* mmIDCT_RUNS */ ++ {0x00a05000, 0x00000002} ++ , ++ {0x00000039, 0x0000000c} ++ , ++ {0x00000000, 0x00000002} ++ , ++ {0x00007300, 0x00000002} ++ , /* mmIDCT_RUNS */ ++ {0x00007301, 0x00000002} ++ , /* mmIDCT_LEVELS */ ++ {0x00007301, 0x00000002} ++ , /* mmIDCT_LEVELS */ ++ {0x0060002a, 0x00000004} ++ , ++ {0x00007488, 0x00000002} ++ , /* mmE2_ARITHMETIC_CNTL */ ++ {0x0003803b, 0x00000002} ++ , ++ {0x00098000, 0x00000002} ++ , ++ {0x00200000, 0x00000002} ++ , ++ {0x00000039, 0x0000000c} ++ , ++ {0x00007465, 0x00000002} ++ , /* mmDST_X_Y */ ++ {0x00007464, 0x00000002} ++ , /* mmSRC_X_Y */ ++ {0x00007478, 0x00000002} ++ , /* mmMVC_CNTL_START */ ++ {0x00600034, 0x00000004} ++ , ++ {0x00000000, 0x00000006} ++ , ++ {0xffffffff, 0x00000000} ++ , ++ {0x00000006, 0x00000000} ++ , ++ {0x01605000, 0x00000002} ++ , ++ {0x00065000, 0x00000002} ++ , ++ {0x00098000, 0x00000002} ++ , ++ {0x00061000, 0x00000002} ++ , ++ {0x64c0603d, 0x00000004} ++ , ++ {0x00080000, 0x00000016} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x0400241d, 0x00000002} ++ , /* mmBRUSH_Y_X */ ++ {0x00007424, 0x00000002} ++ , /* mmDST_LINE_START */ ++ {0x00067425, 0x00000002} ++ , /* mmDST_LINE_END */ ++ {0x04002424, 0x00000002} ++ , /* mmDST_LINE_START */ ++ {0x00067425, 0x00000002} ++ , /* mmDST_LINE_END */ ++ {0x00000046, 0x00000004} ++ , ++ {0x00005000, 0x00000000} ++ , ++ {0x00061000, 0x00000002} ++ , ++ {0x0000740e, 0x00000002} ++ , /* mmDST_Y_X */ ++ {0x00019000, 0x00000002} ++ , ++ {0x00011050, 0x00000014} ++ , ++ {0x00000050, 0x00000012} ++ , ++ {0x0400240f, 0x00000002} ++ , /* mmDST_HEIGHT_WIDTH */ ++ {0x0000504a, 0x00000004} ++ , ++ {0x00007465, 0x00000002} ++ , /* mmDST_X_Y */ ++ {0x00007466, 0x00000002} ++ , /* mmDST_WIDTH_HEIGHT */ ++ {0x00000051, 0x00000004} ++ , ++ {0x01e65473, 0x00000002} ++ , /* mmDP_CNTL_DST_DIR */ ++ {0x4401b0b9, 0x00000002} ++ , ++ {0x01c110b9, 0x00000002} ++ , ++ {0x2666705d, 0x00000018} ++ , ++ {0x040c2465, 0x00000002} ++ , /* mmDST_X_Y */ ++ {0x0000005d, 0x00000018} ++ , ++ {0x04002464, 0x00000002} ++ , /* mmSRC_X_Y */ ++ {0x00007466, 0x00000002} ++ , /* mmDST_WIDTH_HEIGHT */ ++ {0x00000054, 0x00000004} ++ , ++ {0x00401060, 0x00000008} ++ , ++ {0x00101000, 0x00000002} ++ , ++ {0x000d80ff, 0x00000002} ++ , ++ {0x00800063, 0x00000008} ++ , ++ {0x000f9000, 0x00000002} ++ , ++ {0x000e00ff, 0x00000002} ++ , ++ {0x00000000, 0x00000006} ++ , ++ {0x00000080, 0x00000018} ++ , ++ {0x00000054, 0x00000004} ++ , ++ {0x00007490, 0x00000002} ++ , /* mmDP_SRC_FRGD_CLR */ ++ {0x00065000, 0x00000002} ++ , ++ {0x00009000, 0x00000002} ++ , ++ {0x00041000, 0x00000002} ++ , ++ {0x0c00340e, 0x00000002} ++ , /* mmDST_Y_X */ ++ {0x00049000, 0x00000002} ++ , ++ {0x00051000, 0x00000002} ++ , ++ {0x01e784f8, 0x00000002} ++ , ++ {0x00200000, 0x00000002} ++ , ++ {0x00600073, 0x0000000c} ++ , ++ {0x00007463, 0x00000002} ++ , /* mmDST_HEIGHT_WIDTH_8 */ ++ {0x006074f0, 0x00000021} ++ , /* mmHOST_DATA0 */ ++ {0x20007068, 0x00000004} ++ , ++ {0x00005068, 0x00000004} ++ , ++ {0x00007490, 0x00000002} ++ , /* mmDP_SRC_FRGD_CLR */ ++ {0x00007491, 0x00000002} ++ , /* mmDP_SRC_BKGD_CLR */ ++ {0x0000740e, 0x00000002} ++ , /* mmDST_Y_X */ ++ {0x0000740f, 0x00000002} ++ , /* mmDST_HEIGHT_WIDTH */ ++ {0x00a05000, 0x00000002} ++ , ++ {0x00600076, 0x0000000c} ++ , ++ {0x006074f0, 0x00000021} ++ , /* mmHOST_DATA0 */ ++ {0x000074f8, 0x00000002} ++ , /* mmHOST_DATA_LAST */ ++ {0x00000076, 0x00000004} ++ , ++ {0x000a740e, 0x00000002} ++ , /* mmDST_Y_X */ ++ {0x0020740f, 0x00000002} ++ , /* mmDST_HEIGHT_WIDTH */ ++ {0x00600079, 0x00000004} ++ , ++ {0x0000748c, 0x00000002} ++ , /* mmCLR_CMP_CNTL */ ++ {0x0000748d, 0x00000002} ++ , /* mmCLR_CMP_CLR_SRC */ ++ {0x0000748e, 0x00000006} ++ , /* mmCLR_CMP_CLR_DST */ ++ {0x00005000, 0x00000002} ++ , ++ {0x00a05000, 0x00000002} ++ , ++ {0x00007468, 0x00000002} ++ , /* mmDST_HEIGHT_Y */ ++ {0x00061000, 0x00000002} ++ , ++ {0x00000084, 0x0000000c} ++ , ++ {0x00058000, 0x00000002} ++ , ++ {0x0c607462, 0x00000002} ++ , /* mmDST_WIDTH_X */ ++ {0x00000086, 0x00000004} ++ , ++ {0x00600085, 0x00000004} ++ , ++ {0x400070ba, 0x00000000} ++ , ++ {0x000380ba, 0x00000002} ++ , ++ {0x00000093, 0x0000001c} ++ , ++ {0x00065095, 0x00000018} ++ , ++ {0x0400246f, 0x00000002} ++ , /* mmSC_TOP_LEFT */ ++ {0x00061096, 0x00000018} ++ , ++ {0x04007470, 0x00000000} ++ , /* mmSC_BOTTOM_RIGHT */ ++ {0x0000746f, 0x00000002} ++ , /* mmSC_TOP_LEFT */ ++ {0x00007470, 0x00000000} ++ , /* mmSC_BOTTOM_RIGHT */ ++ {0x00090000, 0x00000006} ++ , ++ {0x00090000, 0x00000002} ++ , ++ {0x000d8002, 0x00000006} ++ , ++ {0x01200000, 0x00000002} ++ , ++ {0x20077000, 0x00000002} ++ , ++ {0x01200000, 0x00000002} ++ , ++ {0x20007000, 0x00000002} ++ , ++ {0x00061000, 0x00000002} ++ , ++ {0x0120741b, 0x00000002} ++ , /* mmDP_GUI_MASTER_CNTL */ ++ {0x8040740a, 0x00000002} ++ , /* mmSRC_PITCH_OFFSET */ ++ {0x8040740b, 0x00000002} ++ , /* mmDST_PITCH_OFFSET */ ++ {0x00110000, 0x00000002} ++ , ++ {0x000380ba, 0x00000002} ++ , ++ {0x000000aa, 0x0000001c} ++ , ++ {0x00061096, 0x00000018} ++ , ++ {0x84407471, 0x00000002} ++ , /* mmSRC_SC_BOTTOM_RIGHT */ ++ {0x00061095, 0x00000018} ++ , ++ {0x8400746f, 0x00000002} ++ , /* mmSC_TOP_LEFT */ ++ {0x00061096, 0x00000018} ++ , ++ {0x84407470, 0x00000002} ++ , /* mmSC_BOTTOM_RIGHT */ ++ {0x000000ad, 0x00000004} ++ , ++ {0x80407471, 0x00000002} ++ , /* mmSRC_SC_BOTTOM_RIGHT */ ++ {0x8000746f, 0x00000002} ++ , /* mmSC_TOP_LEFT */ ++ {0x80407470, 0x00000002} ++ , /* mmSC_BOTTOM_RIGHT */ ++ {0x00108000, 0x00000002} ++ , ++ {0x01400000, 0x00000002} ++ , ++ {0x006000b1, 0x0000000c} ++ , ++ {0x20c07000, 0x00000020} ++ , ++ {0x000000b3, 0x00000012} ++ , ++ {0x00800000, 0x00000006} ++ , ++ {0x0080741d, 0x00000006} ++ , /* mmBRUSH_Y_X */ ++ {0x00000000, 0x00000000} ++ , ++ {0x00000001, 0x00000000} ++ , ++ {0x000380b5, 0x00000002} ++ , ++ {0x04002054, 0x00000002} ++ , /* mmNQWAIT_UNTIL */ ++ {0x00005000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++ , ++ {0x00000000, 0x00000000} ++}; +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_stub.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_stub.c 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,103 @@ ++/* ++ * Copyright © 2006 Alberto Mardegan ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Alberto Mardegan not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Alberto Mardegan makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * ALBERTO MARDEGAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL ALBERTO MARDEGAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++#include "ati.h" ++#include "w100_regs.h" ++#include "klinux.h" ++ ++extern struct pci_id_entry ati_pci_ids[]; ++ ++static Bool ++FindW100(CARD16 vendor, CARD16 device, CARD32 count, KdCardAttr * attr) ++{ ++ char *mmio; ++ CARD32 chip_id; ++ Bool found = FALSE; ++ ++ mmio = KdMapDevice(ATI_REG_BASE(0), ATI_REG_SIZE(0)); ++ KdSetMappedMode((CARD32) mmio, ATI_REG_SIZE(0), ++ KD_MAPPED_MODE_REGISTERS); ++ ++ chip_id = MMIO_IN32(mmio, mmCHIP_ID); ++ if ((vendor | (device << 16)) == chip_id) { ++ ErrorF("Found Chip ID: %08x\n\n", chip_id); ++ attr->deviceID = device; ++ attr->vendorID = vendor; ++ found = TRUE; ++ } ++ KdUnmapDevice(mmio, ATI_REG_SIZE(0)); ++ return found; ++} ++ ++ ++void ++InitCard(char *name) ++{ ++ struct pci_id_entry *id; ++ KdCardAttr attr; ++ ++ for (id = ati_pci_ids; id->name != NULL; id++) { ++ int j = 0; ++ if (FindW100(id->vendor, id->device, j++, &attr)) ++ KdCardInfoAdd(&ATIFuncs, &attr, 0); ++ } ++} ++ ++void ++InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) ++{ ++ KdInitOutput(pScreenInfo, argc, argv); ++} ++ ++void ++InitInput(int argc, char **argv) ++{ ++ KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs); ++#ifdef TOUCHSCREEN ++ KdAddMouseDriver(&TsFuncs); ++#endif ++} ++ ++void ++ddxUseMsg(void) ++{ ++ KdUseMsg(); ++#ifdef KDRIVEVESA ++ vesaUseMsg(); ++#endif ++} ++ ++int ++ddxProcessArgument(int argc, char **argv, int i) ++{ ++ int ret; ++ ++#ifdef KDRIVEVESA ++ if (!(ret = vesaProcessArgument(argc, argv, i))) ++#endif ++ ret = KdProcessArgument(argc, argv, i); ++ ++ return ret; ++} +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/Makefile.am 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,53 @@ ++if KDRIVEFBDEV ++FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev ++FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a ++endif ++ ++if KDRIVEVESA ++VESA_INCLUDES = -I$(top_srcdir)/hw/kdrive/vesa ++VESA_LIBS = $(top_builddir)/hw/kdrive/vesa/libvesa.a ++endif ++ ++INCLUDES = \ ++ @KDRIVE_INCS@ \ ++ $(FBDEV_INCLUDES) \ ++ $(VESA_INCLUDES) \ ++ @KDRIVE_CFLAGS@ ++ ++bin_PROGRAMS = Xw100 ++ ++if TSLIB ++TSLIB_FLAG = -lts ++endif ++ ++noinst_LIBRARIES = libw100.a ++ ++libw100_a_SOURCES = \ ++ ati_cursor.c \ ++ ati_dma.c \ ++ ati_dma.h \ ++ ati_draw.c \ ++ ati_draw.h \ ++ ati_microcode.c \ ++ ati.c \ ++ ati.h \ ++ w100_regs.h \ ++ w100_const.h ++ ++Xw100_SOURCES = \ ++ ati_stub.c ++ ++W100_LIBS = \ ++ libw100.a \ ++ $(FBDEV_LIBS) \ ++ $(VESA_LIBS) \ ++ $(DRI_LIBS) \ ++ @KDRIVE_LIBS@ ++ ++Xw100_LDADD = \ ++ $(W100_LIBS) \ ++ @XSERVER_LIBS@ \ ++ $(TSLIB_FLAG) ++ ++ ++Xw100_DEPENDENCIES = $(W100_LIBS) @KDRIVE_LIBS@ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_const.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_const.h 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,25 @@ ++#define CSQ_CNTL_MODE_FREERUN 0x8 ++ ++#define WB_BLOCK_SIZE_A_0 0 ++#define WB_BLOCK_SIZE_A_1 1 ++#define WB_BLOCK_SIZE_A_2 2 ++#define WB_BLOCK_SIZE_A_3 3 ++#define WB_BLOCK_SIZE_A_4 4 ++ ++#define DATATYPE_8BPP 2 ++#define DATATYPE_ARGB1555 3 ++#define DATATYPE_ARGB4444 5 ++ ++#define BRUSH_SOLIDCOLOR 13 ++#define BRUSH_NONE 15 ++ ++#define OP_ROP 0 ++#define OP_ARITHMETIC 1 ++ ++#define SOURCE_MEM_RECTANGULAR 2 ++ ++#define W100_MAXINT 0x1fff ++ ++#define W100_CCE_PACKET3_PAINT_MULTI 0xc0001a00 ++#define W100_CCE_PACKET3_BITBLT_MULTI 0xc0001b00 ++ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_regs.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_regs.h 2006-09-02 11:47:21.000000000 +0200 +@@ -0,0 +1,3802 @@ ++#ifndef _W100_REGS_H_ ++#define _W100_REGS_H_ ++ ++/* Block CIF Start: */ ++#define mmCHIP_ID 0x0000 ++#define mmREVISION_ID 0x0004 ++#define mmWRAP_BUF_A 0x0008 ++#define mmWRAP_BUF_B 0x000C ++#define mmWRAP_TOP_DIR 0x0010 ++#define mmWRAP_START_DIR 0x0014 ++#define mmCIF_CNTL 0x0018 ++#define mmCFGREG_BASE 0x001C ++#define mmCIF_IO 0x0020 ++#define mmCIF_READ_DBG 0x0024 ++#define mmCIF_WRITE_DBG 0x0028 ++#define cfgIND_ADDR_A_0 0x0000 ++#define cfgIND_ADDR_A_1 0x0001 ++#define cfgIND_ADDR_A_2 0x0002 ++#define cfgIND_DATA_A 0x0003 ++#define cfgREG_BASE 0x0004 ++#define cfgINTF_CNTL 0x0005 ++#define cfgSTATUS 0x0006 ++#define cfgCPU_DEFAULTS 0x0007 ++#define cfgIND_ADDR_B_0 0x0008 ++#define cfgIND_ADDR_B_1 0x0009 ++#define cfgIND_ADDR_B_2 0x000A ++#define cfgIND_DATA_B 0x000B ++#define cfgPM4_RPTR 0x000C ++#define cfgSCRATCH 0x000D ++#define cfgPM4_WRPTR_0 0x000E ++#define cfgPM4_WRPTR_1 0x000F ++/* Block CIF End: */ ++ ++/* Block CP Start: */ ++#define mmCP_RB_CNTL 0x0210 ++#define mmCP_RB_BASE 0x0214 ++#define mmCP_RB_RPTR_ADDR 0x0218 ++#define mmCP_RB_RPTR 0x021C ++#define mmCP_RB_RPTR_WR 0x02F8 ++#define mmCP_RB_WPTR 0x0220 ++#define mmCP_IB_BASE 0x0228 ++#define mmCP_IB_BUFSZ 0x022C ++#define mmCP_CSQ_CNTL 0x0230 ++#define mmCP_CSQ_APER_PRIMARY 0x0300 ++#define mmCP_CSQ_APER_INDIRECT 0x0340 ++#define mmCP_ME_CNTL 0x0240 ++#define mmCP_ME_RAM_ADDR 0x0244 ++#define mmCP_ME_RAM_RADDR 0x0248 ++#define mmCP_ME_RAM_DATAH 0x024C ++#define mmCP_ME_RAM_DATAL 0x0250 ++#define mmCP_DEBUG 0x025C ++#define mmSCRATCH_REG0 0x0260 ++#define mmSCRATCH_REG1 0x0264 ++#define mmSCRATCH_REG2 0x0268 ++#define mmSCRATCH_REG3 0x026C ++#define mmSCRATCH_REG4 0x0270 ++#define mmSCRATCH_REG5 0x0274 ++#define mmSCRATCH_UMSK 0x0280 ++#define mmSCRATCH_ADDR 0x0284 ++#define mmCP_CSQ_ADDR 0x02E4 ++#define mmCP_CSQ_DATA 0x02E8 ++#define mmCP_CSQ_STAT 0x02EC ++#define mmCP_STAT 0x02F0 ++#define mmGEN_INT_CNTL 0x0200 ++#define mmGEN_INT_STATUS 0x0204 ++/* Block CP End: */ ++ ++/* Block DISPLAY Start: */ ++#define mmLCD_FORMAT 0x0410 ++#define mmGRAPHIC_CTRL 0x0414 ++#define mmGRAPHIC_OFFSET 0x0418 ++#define mmGRAPHIC_PITCH 0x041C ++#define mmCRTC_TOTAL 0x0420 ++#define mmACTIVE_H_DISP 0x0424 ++#define mmACTIVE_V_DISP 0x0428 ++#define mmGRAPHIC_H_DISP 0x042C ++#define mmGRAPHIC_V_DISP 0x0430 ++#define mmVIDEO_CTRL 0x0434 ++#define mmGRAPHIC_KEY 0x0438 ++#define mmVIDEO_Y_OFFSET 0x043C ++#define mmVIDEO_Y_PITCH 0x0440 ++#define mmVIDEO_U_OFFSET 0x0444 ++#define mmVIDEO_U_PITCH 0x0448 ++#define mmVIDEO_V_OFFSET 0x044C ++#define mmVIDEO_V_PITCH 0x0450 ++#define mmVIDEO_H_POS 0x0454 ++#define mmVIDEO_V_POS 0x0458 ++#define mmBRIGHTNESS_CNTL 0x045C ++#define mmCURSOR1_OFFSET 0x0460 ++#define mmCURSOR1_H_POS 0x0464 ++#define mmCURSOR1_V_POS 0x0468 ++#define mmCURSOR1_COLOR0 0x046C ++#define mmCURSOR1_COLOR1 0x0470 ++#define mmCURSOR2_OFFSET 0x0474 ++#define mmCURSOR2_H_POS 0x0478 ++#define mmCURSOR2_V_POS 0x047C ++#define mmCURSOR2_COLOR0 0x0480 ++#define mmCURSOR2_COLOR1 0x0484 ++#define mmDISP_INT_CNTL 0x0488 ++#define mmCRTC_SS 0x048C ++#define mmCRTC_LS 0x0490 ++#define mmCRTC_REV 0x0494 ++#define mmCRTC_DCLK 0x049C ++#define mmCRTC_GS 0x04A0 ++#define mmCRTC_VPOS_GS 0x04A4 ++#define mmCRTC_GCLK 0x04A8 ++#define mmCRTC_GOE 0x04AC ++#define mmCRTC_FRAME 0x04B0 ++#define mmCRTC_FRAME_VPOS 0x04B4 ++#define mmGPIO_DATA 0x04B8 ++#define mmGPIO_CNTL1 0x04BC ++#define mmGPIO_CNTL2 0x04C0 ++#define mmLCDD_CNTL1 0x04C4 ++#define mmLCDD_CNTL2 0x04C8 ++#define mmGENLCD_CNTL1 0x04CC ++#define mmGENLCD_CNTL2 0x04D0 ++#define mmDISP_DEBUG 0x04D4 ++#define mmDISP_DB_BUF_CNTL 0x04D8 ++#define mmDISP_CRC_SIG 0x04DC ++#define mmCRTC_DEFAULT_COUNT 0x04E0 ++#define mmLCD_BACKGROUND_COLOR 0x04E4 ++#define mmCRTC_PS2 0x04E8 ++#define mmCRTC_PS2_VPOS 0x04EC ++#define mmCRTC_PS1_ACTIVE 0x04F0 ++#define mmCRTC_PS1_NACTIVE 0x04F4 ++#define mmCRTC_GCLK_EXT 0x04F8 ++#define mmCRTC_ALW 0x04FC ++#define mmCRTC_ALW_VPOS 0x0500 ++#define mmCRTC_PSK 0x0504 ++#define mmCRTC_PSK_HPOS 0x0508 ++#define mmCRTC_CV4_START 0x050C ++#define mmCRTC_CV4_END 0x0510 ++#define mmCRTC_CV4_HPOS 0x0514 ++#define mmCRTC_ECK 0x051C ++#define mmREFRESH_CNTL 0x0520 ++#define mmGENLCD_CNTL3 0x0524 ++#define mmGPIO_DATA2 0x0528 ++#define mmGPIO_CNTL3 0x052C ++#define mmGPIO_CNTL4 0x0530 ++#define mmCHIP_STRAP 0x0534 ++#define mmDISP_DEBUG2 0x0538 ++#define mmDEBUG_BUS_CNTL 0x053C ++#define mmGAMMA_VALUE1 0x0540 ++#define mmGAMMA_VALUE2 0x0544 ++#define mmGAMMA_SLOPE 0x0548 ++#define mmGEN_STATUS 0x054C ++#define mmHW_INT 0x0550 ++/* Block DISPLAY End: */ ++ ++/* Block GFX Start: */ ++#define mmDST_OFFSET 0x1004 ++#define mmDST_PITCH 0x1008 ++#define mmDST_PITCH_OFFSET 0x102C ++#define mmDST_X 0x101C ++#define mmDST_Y 0x1020 ++#define mmDST_X_Y 0x1194 ++#define mmDST_Y_X 0x1038 ++#define mmDST_WIDTH 0x100C ++#define mmDST_HEIGHT 0x1010 ++#define mmDST_WIDTH_HEIGHT 0x1198 ++#define mmDST_HEIGHT_WIDTH 0x103C ++#define mmDST_HEIGHT_WIDTH_8 0x118C ++#define mmDST_HEIGHT_Y 0x11A0 ++#define mmDST_WIDTH_X 0x1188 ++#define mmDST_WIDTH_X_INCY 0x119C ++#define mmDST_LINE_START 0x1090 ++#define mmDST_LINE_END 0x1094 ++#define mmBRUSH_OFFSET 0x108C ++#define mmBRUSH_Y_X 0x1074 ++#define mmDP_BRUSH_FRGD_CLR 0x107C ++#define mmDP_BRUSH_BKGD_CLR 0x1078 ++#define mmSRC2_OFFSET 0x1060 ++#define mmSRC2_PITCH 0x1064 ++#define mmSRC2_PITCH_OFFSET 0x1068 ++#define mmSRC2_X 0x1050 ++#define mmSRC2_Y 0x1054 ++#define mmSRC2_X_Y 0x1058 ++#define mmSRC2_WIDTH 0x1080 ++#define mmSRC2_HEIGHT 0x1084 ++#define mmSRC2_INC 0x1088 ++#define mmSRC_OFFSET 0x11AC ++#define mmSRC_PITCH 0x11B0 ++#define mmSRC_PITCH_OFFSET 0x1028 ++#define mmSRC_X 0x1014 ++#define mmSRC_Y 0x1018 ++#define mmSRC_X_Y 0x1190 ++#define mmSRC_Y_X 0x1034 ++#define mmSRC_WIDTH 0x1040 ++#define mmSRC_HEIGHT 0x1044 ++#define mmSRC_INC 0x1048 ++#define mmHOST_DATA0 0x13C0 ++#define mmHOST_DATA1 0x13C4 ++#define mmHOST_DATA2 0x13C8 ++#define mmHOST_DATA3 0x13CC ++#define mmHOST_DATA4 0x13D0 ++#define mmHOST_DATA5 0x13D4 ++#define mmHOST_DATA6 0x13D8 ++#define mmHOST_DATA7 0x13DC ++#define mmHOST_DATA_LAST 0x13E0 ++#define mmDP_SRC_FRGD_CLR 0x1240 ++#define mmDP_SRC_BKGD_CLR 0x1244 ++#define mmSC_LEFT 0x1140 ++#define mmSC_RIGHT 0x1144 ++#define mmSC_TOP 0x1148 ++#define mmSC_BOTTOM 0x114C ++#define mmSRC_SC_RIGHT 0x1154 ++#define mmSRC_SC_BOTTOM 0x115C ++#define mmDP_CNTL 0x11C8 ++#define mmDP_CNTL_DST_DIR 0x11CC ++#define mmDP_DATATYPE 0x12C4 ++#define mmDP_MIX 0x12C8 ++#define mmDP_WRITE_MSK 0x12CC ++#define mmCLR_CMP_CLR_SRC 0x1234 ++#define mmCLR_CMP_CLR_DST 0x1238 ++#define mmCLR_CMP_CNTL 0x1230 ++#define mmCLR_CMP_MSK 0x123C ++#define mmDEFAULT_PITCH_OFFSET 0x10A0 ++#define mmDEFAULT_SC_BOTTOM_RIGHT 0x10A8 ++#define mmDEFAULT2_SC_BOTTOM_RIGHT 0x10AC ++#define mmREF1_PITCH_OFFSET 0x10B8 ++#define mmREF2_PITCH_OFFSET 0x10BC ++#define mmREF3_PITCH_OFFSET 0x10C0 ++#define mmREF4_PITCH_OFFSET 0x10C4 ++#define mmREF5_PITCH_OFFSET 0x10C8 ++#define mmREF6_PITCH_OFFSET 0x10CC ++#define mmDP_GUI_MASTER_CNTL 0x106C ++#define mmSC_TOP_LEFT 0x11BC ++#define mmSC_BOTTOM_RIGHT 0x11C0 ++#define mmSRC_SC_BOTTOM_RIGHT 0x11C4 ++#define mmGLOBAL_ALPHA 0x1210 ++#define mmFILTER_COEF 0x1214 ++#define mmMVC_CNTL_START 0x11E0 ++#define mmE2_ARITHMETIC_CNTL 0x1220 ++#define mmDEBUG0 0x1280 ++#define mmDEBUG1 0x1284 ++#define mmDEBUG2 0x1288 ++#define mmDEBUG3 0x128C ++#define mmDEBUG4 0x1290 ++#define mmDEBUG5 0x1294 ++#define mmDEBUG6 0x1298 ++#define mmDEBUG7 0x129C ++#define mmDEBUG8 0x12A0 ++#define mmDEBUG9 0x12A4 ++#define mmDEBUG10 0x12A8 ++#define mmDEBUG11 0x12AC ++#define mmDEBUG12 0x12B0 ++#define mmDEBUG13 0x12B4 ++#define mmDEBUG14 0x12B8 ++#define mmDEBUG15 0x12BC ++#define mmENG_CNTL 0x13E8 ++#define mmENG_PERF_CNT 0x13F0 ++/* Block GFX End: */ ++ ++/* Block IDCT Start: */ ++#define mmIDCT_RUNS 0x0C00 ++#define mmIDCT_LEVELS 0x0C04 ++#define mmIDCT_CONTROL 0x0C3C ++#define mmIDCT_AUTH_CONTROL 0x0C08 ++#define mmIDCT_AUTH 0x0C0C ++/* Block IDCT End: */ ++ ++/* Block MC Start: */ ++#define mmMEM_CNTL 0x0180 ++#define mmMEM_ARB 0x0184 ++#define mmMC_FB_LOCATION 0x0188 ++#define mmMEM_EXT_CNTL 0x018C ++#define mmMC_EXT_MEM_LOCATION 0x0190 ++#define mmMEM_EXT_TIMING_CNTL 0x0194 ++#define mmMEM_SDRAM_MODE_REG 0x0198 ++#define mmMEM_IO_CNTL 0x019C ++#define mmMC_DEBUG 0x01A0 ++#define mmMC_BIST_CTRL 0x01A4 ++#define mmMC_BIST_COLLAR_READ 0x01A8 ++#define mmTC_MISMATCH 0x01AC ++#define mmMC_PERF_MON_CNTL 0x01B0 ++#define mmMC_PERF_COUNTERS 0x01B4 ++/* Block MC End: */ ++ ++/* Block RBBM Start: */ ++#define mmWAIT_UNTIL 0x1400 ++#define mmISYNC_CNTL 0x1404 ++#define mmRBBM_GUICNTL 0x1408 ++#define mmRBBM_STATUS 0x0140 ++#define mmRBBM_STATUS_alt_1 0x140C ++#define mmRBBM_CNTL 0x0144 ++#define mmRBBM_SOFT_RESET 0x0148 ++#define mmNQWAIT_UNTIL 0x0150 ++#define mmRBBM_DEBUG 0x016C ++#define mmRBBM_CMDFIFO_ADDR 0x0170 ++#define mmRBBM_CMDFIFO_DATAL 0x0174 ++#define mmRBBM_CMDFIFO_DATAH 0x0178 ++#define mmRBBM_CMDFIFO_STAT 0x017C ++/* Block RBBM End: */ ++ ++/* Block CG Start: */ ++#define mmCLK_PIN_CNTL 0x0080 ++#define mmPLL_REF_FB_DIV 0x0084 ++#define mmPLL_CNTL 0x0088 ++#define mmSCLK_CNTL 0x008C ++#define mmPCLK_CNTL 0x0090 ++#define mmCLK_TEST_CNTL 0x0094 ++#define mmPWRMGT_CNTL 0x0098 ++#define mmPWRMGT_STATUS 0x009C ++/* Block CG End: */ ++ ++ ++/* data structure definitions */ ++ ++typedef struct _chip_id_t { ++ unsigned long vendor_id : 16; ++ unsigned long device_id : 16; ++ } chip_id_t; ++ ++typedef union { ++ unsigned long val : 32; ++ chip_id_t f; ++} chip_id_u; ++ ++typedef struct _revision_id_t { ++ unsigned long minor_rev_id : 4; ++ unsigned long major_rev_id : 4; ++ unsigned long : 24; ++ } revision_id_t; ++ ++typedef union { ++ unsigned long val : 32; ++ revision_id_t f; ++} revision_id_u; ++ ++typedef struct _wrap_buf_a_t { ++ unsigned long offset_addr_a : 24; ++ unsigned long block_size_a : 3; ++ unsigned long : 5; ++ } wrap_buf_a_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_buf_a_t f; ++} wrap_buf_a_u; ++ ++typedef struct _wrap_buf_b_t { ++ unsigned long offset_addr_b : 24; ++ unsigned long block_size_b : 3; ++ unsigned long : 5; ++ } wrap_buf_b_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_buf_b_t f; ++} wrap_buf_b_u; ++ ++typedef struct _wrap_top_dir_t { ++ unsigned long top_addr : 23; ++ unsigned long : 9; ++ } wrap_top_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_top_dir_t f; ++} wrap_top_dir_u; ++ ++typedef struct _wrap_start_dir_t { ++ unsigned long start_addr : 23; ++ unsigned long : 9; ++ } wrap_start_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wrap_start_dir_t f; ++} wrap_start_dir_u; ++ ++typedef struct _cif_cntl_t { ++ unsigned long swap_reg : 2; ++ unsigned long swap_fbuf_1 : 2; ++ unsigned long swap_fbuf_2 : 2; ++ unsigned long swap_fbuf_3 : 2; ++ unsigned long pmi_int_disable : 1; ++ unsigned long pmi_schmen_disable : 1; ++ unsigned long intb_oe : 1; ++ unsigned long en_wait_to_compensate_dq_prop_dly : 1; ++ unsigned long compensate_wait_rd_size : 2; ++ unsigned long wait_asserted_timeout_val : 2; ++ unsigned long wait_masked_val : 2; ++ unsigned long en_wait_timeout : 1; ++ unsigned long en_one_clk_setup_before_wait : 1; ++ unsigned long interrupt_active_high : 1; ++ unsigned long en_overwrite_straps : 1; ++ unsigned long strap_wait_active_hi : 1; ++ unsigned long lat_busy_count : 2; ++ unsigned long lat_rd_pm4_sclk_busy : 1; ++ unsigned long dis_system_bits : 1; ++ unsigned long dis_mr : 1; ++ unsigned long cif_spare_1 : 4; ++ } cif_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_cntl_t f; ++} cif_cntl_u; ++ ++typedef struct _cfgreg_base_t { ++ unsigned long cfgreg_base : 24; ++ unsigned long : 8; ++ } cfgreg_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cfgreg_base_t f; ++} cfgreg_base_u; ++ ++typedef struct _cif_io_t { ++ unsigned long dq_srp : 1; ++ unsigned long dq_srn : 1; ++ unsigned long dq_sp : 4; ++ unsigned long dq_sn : 4; ++ unsigned long waitb_srp : 1; ++ unsigned long waitb_srn : 1; ++ unsigned long waitb_sp : 4; ++ unsigned long waitb_sn : 4; ++ unsigned long intb_srp : 1; ++ unsigned long intb_srn : 1; ++ unsigned long intb_sp : 4; ++ unsigned long intb_sn : 4; ++ unsigned long : 2; ++ } cif_io_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_io_t f; ++} cif_io_u; ++ ++typedef struct _cif_read_dbg_t { ++ unsigned long unpacker_pre_fetch_trig_gen : 2; ++ unsigned long dly_second_rd_fetch_trig : 1; ++ unsigned long rst_rd_burst_id : 1; ++ unsigned long dis_rd_burst_id : 1; ++ unsigned long en_block_rd_when_packer_is_not_emp : 1; ++ unsigned long dis_pre_fetch_cntl_sm : 1; ++ unsigned long rbbm_chrncy_dis : 1; ++ unsigned long rbbm_rd_after_wr_lat : 2; ++ unsigned long dis_be_during_rd : 1; ++ unsigned long one_clk_invalidate_pulse : 1; ++ unsigned long dis_chnl_priority : 1; ++ unsigned long rst_read_path_a_pls : 1; ++ unsigned long rst_read_path_b_pls : 1; ++ unsigned long dis_reg_rd_fetch_trig : 1; ++ unsigned long dis_rd_fetch_trig_from_ind_addr : 1; ++ unsigned long dis_rd_same_byte_to_trig_fetch : 1; ++ unsigned long dis_dir_wrap : 1; ++ unsigned long dis_ring_buf_to_force_dec : 1; ++ unsigned long dis_addr_comp_in_16bit : 1; ++ unsigned long clr_w : 1; ++ unsigned long err_rd_tag_is_3 : 1; ++ unsigned long err_load_when_ful_a : 1; ++ unsigned long err_load_when_ful_b : 1; ++ unsigned long : 7; ++ } cif_read_dbg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_read_dbg_t f; ++} cif_read_dbg_u; ++ ++typedef struct _cif_write_dbg_t { ++ unsigned long packer_timeout_count : 2; ++ unsigned long en_upper_load_cond : 1; ++ unsigned long en_chnl_change_cond : 1; ++ unsigned long dis_addr_comp_cond : 1; ++ unsigned long dis_load_same_byte_addr_cond : 1; ++ unsigned long dis_timeout_cond : 1; ++ unsigned long dis_timeout_during_rbbm : 1; ++ unsigned long dis_packer_ful_during_rbbm_timeout : 1; ++ unsigned long en_dword_split_to_rbbm : 1; ++ unsigned long en_dummy_val : 1; ++ unsigned long dummy_val_sel : 1; ++ unsigned long mask_pm4_wrptr_dec : 1; ++ unsigned long dis_mc_clean_cond : 1; ++ unsigned long err_two_reqi_during_ful : 1; ++ unsigned long err_reqi_during_idle_clk : 1; ++ unsigned long err_global : 1; ++ unsigned long en_wr_buf_dbg_load : 1; ++ unsigned long en_wr_buf_dbg_path : 1; ++ unsigned long sel_wr_buf_byte : 3; ++ unsigned long dis_rd_flush_wr : 1; ++ unsigned long dis_packer_ful_cond : 1; ++ unsigned long dis_invalidate_by_ops_chnl : 1; ++ unsigned long en_halt_when_reqi_err : 1; ++ unsigned long cif_spare_2 : 5; ++ unsigned long : 1; ++ } cif_write_dbg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cif_write_dbg_t f; ++} cif_write_dbg_u; ++ ++typedef struct _ind_addr_a_0_t { ++ unsigned char ind_addr_a_0 : 8; ++ } ind_addr_a_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_0_t f; ++} ind_addr_a_0_u; ++ ++typedef struct _ind_addr_a_1_t { ++ unsigned char ind_addr_a_1 : 8; ++ } ind_addr_a_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_1_t f; ++} ind_addr_a_1_u; ++ ++typedef struct _ind_addr_a_2_t { ++ unsigned char ind_addr_a_2 : 8; ++ } ind_addr_a_2_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_a_2_t f; ++} ind_addr_a_2_u; ++ ++typedef struct _ind_data_a_t { ++ unsigned char ind_data_a : 8; ++ } ind_data_a_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_data_a_t f; ++} ind_data_a_u; ++ ++typedef struct _reg_base_t { ++ unsigned char reg_base : 8; ++ } reg_base_t; ++ ++typedef union { ++ unsigned char val : 8; ++ reg_base_t f; ++} reg_base_u; ++ ++typedef struct _intf_cntl_t { ++ unsigned char ad_inc_a : 1; ++ unsigned char ring_buf_a : 1; ++ unsigned char rd_fetch_trigger_a : 1; ++ unsigned char rd_data_rdy_a : 1; ++ unsigned char ad_inc_b : 1; ++ unsigned char ring_buf_b : 1; ++ unsigned char rd_fetch_trigger_b : 1; ++ unsigned char rd_data_rdy_b : 1; ++ } intf_cntl_t; ++ ++typedef union { ++ unsigned char val : 8; ++ intf_cntl_t f; ++} intf_cntl_u; ++ ++typedef struct _status_t { ++ unsigned char wr_fifo_available_space : 2; ++ unsigned char fbuf_wr_pipe_emp : 1; ++ unsigned char soft_reset : 1; ++ unsigned char system_pwm_mode : 2; ++ unsigned char mem_access_dis : 1; ++ unsigned char en_pre_fetch : 1; ++ } status_t; ++ ++typedef union { ++ unsigned char val : 8; ++ status_t f; ++} status_u; ++ ++typedef struct _cpu_defaults_t { ++ unsigned char unpack_rd_data : 1; ++ unsigned char access_ind_addr_a : 1; ++ unsigned char access_ind_addr_b : 1; ++ unsigned char access_scratch_reg : 1; ++ unsigned char pack_wr_data : 1; ++ unsigned char transition_size : 1; ++ unsigned char en_read_buf_mode : 1; ++ unsigned char rd_fetch_scratch : 1; ++ } cpu_defaults_t; ++ ++typedef union { ++ unsigned char val : 8; ++ cpu_defaults_t f; ++} cpu_defaults_u; ++ ++typedef struct _ind_addr_b_0_t { ++ unsigned char ind_addr_b_0 : 8; ++ } ind_addr_b_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_0_t f; ++} ind_addr_b_0_u; ++ ++typedef struct _ind_addr_b_1_t { ++ unsigned char ind_addr_b_1 : 8; ++ } ind_addr_b_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_1_t f; ++} ind_addr_b_1_u; ++ ++typedef struct _ind_addr_b_2_t { ++ unsigned char ind_addr_b_2 : 8; ++ } ind_addr_b_2_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_addr_b_2_t f; ++} ind_addr_b_2_u; ++ ++typedef struct _ind_data_b_t { ++ unsigned char ind_data_b : 8; ++ } ind_data_b_t; ++ ++typedef union { ++ unsigned char val : 8; ++ ind_data_b_t f; ++} ind_data_b_u; ++ ++typedef struct _pm4_rptr_t { ++ unsigned char pm4_rptr : 8; ++ } pm4_rptr_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_rptr_t f; ++} pm4_rptr_u; ++ ++typedef struct _scratch_t { ++ unsigned char scratch : 8; ++ } scratch_t; ++ ++typedef union { ++ unsigned char val : 8; ++ scratch_t f; ++} scratch_u; ++ ++typedef struct _pm4_wrptr_0_t { ++ unsigned char pm4_wrptr_0 : 8; ++ } pm4_wrptr_0_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_wrptr_0_t f; ++} pm4_wrptr_0_u; ++ ++typedef struct _pm4_wrptr_1_t { ++ unsigned char pm4_wrptr_1 : 6; ++ unsigned char rd_fetch_pm4_rptr : 1; ++ unsigned char wrptr_atomic_update_w : 1; ++ } pm4_wrptr_1_t; ++ ++typedef union { ++ unsigned char val : 8; ++ pm4_wrptr_1_t f; ++} pm4_wrptr_1_u; ++ ++typedef struct _cp_rb_cntl_t { ++ unsigned long rb_bufsz : 6; ++ unsigned long : 2; ++ unsigned long rb_blksz : 6; ++ unsigned long : 2; ++ unsigned long buf_swap : 2; ++ unsigned long max_fetch : 2; ++ unsigned long : 7; ++ unsigned long rb_no_update : 1; ++ unsigned long : 3; ++ unsigned long rb_rptr_wr_ena : 1; ++ } cp_rb_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_cntl_t f; ++} cp_rb_cntl_u; ++ ++typedef struct _cp_rb_base_t { ++ unsigned long : 2; ++ unsigned long rb_base : 22; ++ unsigned long : 8; ++ } cp_rb_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_base_t f; ++} cp_rb_base_u; ++ ++typedef struct _cp_rb_rptr_addr_t { ++ unsigned long rb_rptr_swap : 2; ++ unsigned long rb_rptr_addr : 22; ++ unsigned long : 8; ++ } cp_rb_rptr_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_addr_t f; ++} cp_rb_rptr_addr_u; ++ ++typedef struct _cp_rb_rptr_t { ++ unsigned long rb_rptr : 23; ++ unsigned long : 9; ++ } cp_rb_rptr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_t f; ++} cp_rb_rptr_u; ++ ++typedef struct _cp_rb_rptr_wr_t { ++ unsigned long rb_rptr_wr : 23; ++ unsigned long : 9; ++ } cp_rb_rptr_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_rptr_wr_t f; ++} cp_rb_rptr_wr_u; ++ ++typedef struct _cp_rb_wptr_t { ++ unsigned long rb_wptr : 23; ++ unsigned long : 9; ++ } cp_rb_wptr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_rb_wptr_t f; ++} cp_rb_wptr_u; ++ ++typedef struct _cp_ib_base_t { ++ unsigned long : 2; ++ unsigned long ib_base : 22; ++ unsigned long : 8; ++ } cp_ib_base_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_ib_base_t f; ++} cp_ib_base_u; ++ ++typedef struct _cp_ib_bufsz_t { ++ unsigned long ib_bufsz : 23; ++ unsigned long : 9; ++ } cp_ib_bufsz_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_ib_bufsz_t f; ++} cp_ib_bufsz_u; ++ ++typedef struct _cp_csq_cntl_t { ++ unsigned long csq_cnt_primary : 8; ++ unsigned long csq_cnt_indirect : 8; ++ unsigned long : 12; ++ unsigned long csq_mode : 4; ++ } cp_csq_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_cntl_t f; ++} cp_csq_cntl_u; ++ ++typedef struct _cp_csq_aper_primary_t { ++ unsigned long cp_csq_aper_primary : 32; ++ } cp_csq_aper_primary_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_aper_primary_t f; ++} cp_csq_aper_primary_u; ++ ++typedef struct _cp_csq_aper_indirect_t { ++ unsigned long cp_csq_aper_indirect : 32; ++ } cp_csq_aper_indirect_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_aper_indirect_t f; ++} cp_csq_aper_indirect_u; ++ ++typedef struct _cp_me_cntl_t { ++ unsigned long me_stat : 16; ++ unsigned long me_statmux : 5; ++ unsigned long : 8; ++ unsigned long me_busy : 1; ++ unsigned long me_mode : 1; ++ unsigned long me_step : 1; ++ } cp_me_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_cntl_t f; ++} cp_me_cntl_u; ++ ++typedef struct _cp_me_ram_addr_t { ++ unsigned long me_ram_addr : 8; ++ unsigned long : 24; ++ } cp_me_ram_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_addr_t f; ++} cp_me_ram_addr_u; ++ ++typedef struct _cp_me_ram_raddr_t { ++ unsigned long me_ram_raddr : 8; ++ unsigned long : 24; ++ } cp_me_ram_raddr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_raddr_t f; ++} cp_me_ram_raddr_u; ++ ++typedef struct _cp_me_ram_datah_t { ++ unsigned long me_ram_datah : 6; ++ unsigned long : 26; ++ } cp_me_ram_datah_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_datah_t f; ++} cp_me_ram_datah_u; ++ ++typedef struct _cp_me_ram_datal_t { ++ unsigned long me_ram_datal : 32; ++ } cp_me_ram_datal_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_me_ram_datal_t f; ++} cp_me_ram_datal_u; ++ ++typedef struct _cp_debug_t { ++ unsigned long cp_debug : 32; ++ } cp_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_debug_t f; ++} cp_debug_u; ++ ++typedef struct _scratch_reg0_t { ++ unsigned long scratch_reg0 : 32; ++ } scratch_reg0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg0_t f; ++} scratch_reg0_u; ++ ++typedef struct _scratch_reg1_t { ++ unsigned long scratch_reg1 : 32; ++ } scratch_reg1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg1_t f; ++} scratch_reg1_u; ++ ++typedef struct _scratch_reg2_t { ++ unsigned long scratch_reg2 : 32; ++ } scratch_reg2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg2_t f; ++} scratch_reg2_u; ++ ++typedef struct _scratch_reg3_t { ++ unsigned long scratch_reg3 : 32; ++ } scratch_reg3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg3_t f; ++} scratch_reg3_u; ++ ++typedef struct _scratch_reg4_t { ++ unsigned long scratch_reg4 : 32; ++ } scratch_reg4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg4_t f; ++} scratch_reg4_u; ++ ++typedef struct _scratch_reg5_t { ++ unsigned long scratch_reg5 : 32; ++ } scratch_reg5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_reg5_t f; ++} scratch_reg5_u; ++ ++typedef struct _scratch_umsk_t { ++ unsigned long scratch_umsk : 6; ++ unsigned long : 10; ++ unsigned long scratch_swap : 2; ++ unsigned long : 14; ++ } scratch_umsk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_umsk_t f; ++} scratch_umsk_u; ++ ++typedef struct _scratch_addr_t { ++ unsigned long : 5; ++ unsigned long scratch_addr : 27; ++ } scratch_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ scratch_addr_t f; ++} scratch_addr_u; ++ ++typedef struct _cp_csq_addr_t { ++ unsigned long : 2; ++ unsigned long csq_addr : 8; ++ unsigned long : 22; ++ } cp_csq_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_addr_t f; ++} cp_csq_addr_u; ++ ++typedef struct _cp_csq_data_t { ++ unsigned long csq_data : 32; ++ } cp_csq_data_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_data_t f; ++} cp_csq_data_u; ++ ++typedef struct _cp_csq_stat_t { ++ unsigned long csq_rptr_primary : 8; ++ unsigned long csq_wptr_primary : 8; ++ unsigned long csq_rptr_indirect : 8; ++ unsigned long csq_wptr_indirect : 8; ++ } cp_csq_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_csq_stat_t f; ++} cp_csq_stat_u; ++ ++typedef struct _cp_stat_t { ++ unsigned long mru_busy : 1; ++ unsigned long mwu_busy : 1; ++ unsigned long rsiu_busy : 1; ++ unsigned long rciu_busy : 1; ++ unsigned long : 5; ++ unsigned long csf_primary_busy : 1; ++ unsigned long csf_indirect_busy : 1; ++ unsigned long csq_primary_busy : 1; ++ unsigned long csq_indirect_busy : 1; ++ unsigned long csi_busy : 1; ++ unsigned long : 14; ++ unsigned long guidma_busy : 1; ++ unsigned long viddma_busy : 1; ++ unsigned long cmdstrm_busy : 1; ++ unsigned long cp_busy : 1; ++ } cp_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cp_stat_t f; ++} cp_stat_u; ++ ++typedef struct _gen_int_cntl_t { ++ unsigned long crtc_vblank_mask : 1; ++ unsigned long crtc_vline_mask : 1; ++ unsigned long crtc_hwint1_mask : 1; ++ unsigned long crtc_hwint2_mask : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_mask : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_mask : 1; ++ unsigned long dvi_i2c_int_mask : 1; ++ unsigned long : 2; ++ } gen_int_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_cntl_t f; ++} gen_int_cntl_u; ++ ++typedef struct _gen_int_status_rd_t { ++ unsigned long crtc_vblank_stat : 1; ++ unsigned long crtc_vline_stat : 1; ++ unsigned long crtc_hwint1_stat : 1; ++ unsigned long crtc_hwint2_stat : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_stat : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_stat : 1; ++ unsigned long dvi_i2c_int_stat : 1; ++ unsigned long : 2; ++ } gen_int_status_rd_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_status_rd_t f; ++} gen_int_status_rd_u; ++ ++typedef struct _gen_int_status_wr_t { ++ unsigned long crtc_vblank_stat_ak : 1; ++ unsigned long crtc_vline_stat_ak : 1; ++ unsigned long crtc_hwint1_stat_ak : 1; ++ unsigned long crtc_hwint2_stat_ak : 1; ++ unsigned long : 15; ++ unsigned long gui_idle_stat_ak : 1; ++ unsigned long : 8; ++ unsigned long pm4_idle_int_ak : 1; ++ unsigned long dvi_i2c_int_ak : 1; ++ unsigned long : 2; ++ } gen_int_status_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_int_status_wr_t f; ++} gen_int_status_wr_u; ++ ++typedef struct _lcd_format_t { ++ unsigned long lcd_type : 4; ++ unsigned long color_to_mono : 1; ++ unsigned long data_inv : 1; ++ unsigned long stn_fm : 2; ++ unsigned long tft_fm : 2; ++ unsigned long scan_lr_en : 1; ++ unsigned long scan_ud_en : 1; ++ unsigned long pol_inv : 1; ++ unsigned long rst_fm : 1; ++ unsigned long yuv_to_rgb : 1; ++ unsigned long hr_tft : 1; ++ unsigned long ulc_panel : 1; ++ unsigned long : 15; ++ } lcd_format_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcd_format_t f; ++} lcd_format_u; ++ ++typedef struct _graphic_ctrl_t { ++ unsigned long color_depth : 3; ++ unsigned long portrait_mode : 2; ++ unsigned long low_power_on : 1; ++ unsigned long req_freq : 4; ++ unsigned long en_crtc : 1; ++ unsigned long en_graphic_req : 1; ++ unsigned long en_graphic_crtc : 1; ++ unsigned long total_req_graphic : 9; ++ unsigned long lcd_pclk_on : 1; ++ unsigned long lcd_sclk_on : 1; ++ unsigned long pclk_running : 1; ++ unsigned long sclk_running : 1; ++ unsigned long : 6; ++ } graphic_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_ctrl_t f; ++} graphic_ctrl_u; ++ ++typedef struct _graphic_offset_t { ++ unsigned long graphic_offset : 24; ++ unsigned long : 8; ++ } graphic_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_offset_t f; ++} graphic_offset_u; ++ ++typedef struct _graphic_pitch_t { ++ unsigned long graphic_pitch : 11; ++ unsigned long : 21; ++ } graphic_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_pitch_t f; ++} graphic_pitch_u; ++ ++typedef struct _crtc_total_t { ++ unsigned long crtc_h_total : 10; ++ unsigned long : 6; ++ unsigned long crtc_v_total : 10; ++ unsigned long : 6; ++ } crtc_total_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_total_t f; ++} crtc_total_u; ++ ++typedef struct _active_h_disp_t { ++ unsigned long active_h_start : 10; ++ unsigned long : 6; ++ unsigned long active_h_end : 10; ++ unsigned long : 6; ++ } active_h_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ active_h_disp_t f; ++} active_h_disp_u; ++ ++typedef struct _active_v_disp_t { ++ unsigned long active_v_start : 10; ++ unsigned long : 6; ++ unsigned long active_v_end : 10; ++ unsigned long : 6; ++ } active_v_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ active_v_disp_t f; ++} active_v_disp_u; ++ ++typedef struct _graphic_h_disp_t { ++ unsigned long graphic_h_start : 10; ++ unsigned long : 6; ++ unsigned long graphic_h_end : 10; ++ unsigned long : 6; ++ } graphic_h_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_h_disp_t f; ++} graphic_h_disp_u; ++ ++typedef struct _graphic_v_disp_t { ++ unsigned long graphic_v_start : 10; ++ unsigned long : 6; ++ unsigned long graphic_v_end : 10; ++ unsigned long : 6; ++ } graphic_v_disp_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_v_disp_t f; ++} graphic_v_disp_u; ++ ++typedef struct _video_ctrl_t { ++ unsigned long video_mode : 1; ++ unsigned long keyer_en : 1; ++ unsigned long en_video_req : 1; ++ unsigned long en_graphic_req_video : 1; ++ unsigned long en_video_crtc : 1; ++ unsigned long video_hor_exp : 2; ++ unsigned long video_ver_exp : 2; ++ unsigned long uv_combine : 1; ++ unsigned long total_req_video : 9; ++ unsigned long video_ch_sel : 1; ++ unsigned long video_portrait : 2; ++ unsigned long yuv2rgb_en : 1; ++ unsigned long yuv2rgb_option : 1; ++ unsigned long video_inv_hor : 1; ++ unsigned long video_inv_ver : 1; ++ unsigned long gamma_sel : 2; ++ unsigned long dis_limit : 1; ++ unsigned long en_uv_hblend : 1; ++ unsigned long rgb_gamma_sel : 2; ++ } video_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_ctrl_t f; ++} video_ctrl_u; ++ ++typedef struct _graphic_key_t { ++ unsigned long keyer_color : 16; ++ unsigned long keyer_mask : 16; ++ } graphic_key_t; ++ ++typedef union { ++ unsigned long val : 32; ++ graphic_key_t f; ++} graphic_key_u; ++ ++typedef struct _video_y_offset_t { ++ unsigned long y_offset : 24; ++ unsigned long : 8; ++ } video_y_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_y_offset_t f; ++} video_y_offset_u; ++ ++typedef struct _video_y_pitch_t { ++ unsigned long y_pitch : 11; ++ unsigned long : 21; ++ } video_y_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_y_pitch_t f; ++} video_y_pitch_u; ++ ++typedef struct _video_u_offset_t { ++ unsigned long u_offset : 24; ++ unsigned long : 8; ++ } video_u_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_u_offset_t f; ++} video_u_offset_u; ++ ++typedef struct _video_u_pitch_t { ++ unsigned long u_pitch : 11; ++ unsigned long : 21; ++ } video_u_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_u_pitch_t f; ++} video_u_pitch_u; ++ ++typedef struct _video_v_offset_t { ++ unsigned long v_offset : 24; ++ unsigned long : 8; ++ } video_v_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_offset_t f; ++} video_v_offset_u; ++ ++typedef struct _video_v_pitch_t { ++ unsigned long v_pitch : 11; ++ unsigned long : 21; ++ } video_v_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_pitch_t f; ++} video_v_pitch_u; ++ ++typedef struct _video_h_pos_t { ++ unsigned long video_h_start : 10; ++ unsigned long : 6; ++ unsigned long video_h_end : 10; ++ unsigned long : 6; ++ } video_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_h_pos_t f; ++} video_h_pos_u; ++ ++typedef struct _video_v_pos_t { ++ unsigned long video_v_start : 10; ++ unsigned long : 6; ++ unsigned long video_v_end : 10; ++ unsigned long : 6; ++ } video_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ video_v_pos_t f; ++} video_v_pos_u; ++ ++typedef struct _brightness_cntl_t { ++ unsigned long brightness : 7; ++ unsigned long : 25; ++ } brightness_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brightness_cntl_t f; ++} brightness_cntl_u; ++ ++typedef struct _cursor1_offset_t { ++ unsigned long cur1_offset : 24; ++ unsigned long cur1_x_offset : 4; ++ unsigned long cur1_y_offset : 4; ++ } cursor1_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_offset_t f; ++} cursor1_offset_u; ++ ++typedef struct _cursor1_h_pos_t { ++ unsigned long cur1_h_start : 10; ++ unsigned long : 6; ++ unsigned long cur1_h_end : 10; ++ unsigned long : 5; ++ unsigned long cur1_en : 1; ++ } cursor1_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_h_pos_t f; ++} cursor1_h_pos_u; ++ ++typedef struct _cursor1_v_pos_t { ++ unsigned long cur1_v_start : 10; ++ unsigned long : 6; ++ unsigned long cur1_v_end : 10; ++ unsigned long : 6; ++ } cursor1_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_v_pos_t f; ++} cursor1_v_pos_u; ++ ++typedef struct _cursor1_color0_t { ++ unsigned long cur1_color0_r : 8; ++ unsigned long cur1_color0_g : 8; ++ unsigned long cur1_color0_b : 8; ++ unsigned long : 8; ++ } cursor1_color0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_color0_t f; ++} cursor1_color0_u; ++ ++typedef struct _cursor1_color1_t { ++ unsigned long cur1_color1_r : 8; ++ unsigned long cur1_color1_g : 8; ++ unsigned long cur1_color1_b : 8; ++ unsigned long : 8; ++ } cursor1_color1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor1_color1_t f; ++} cursor1_color1_u; ++ ++typedef struct _cursor2_offset_t { ++ unsigned long cur2_offset : 24; ++ unsigned long cur2_x_offset : 4; ++ unsigned long cur2_y_offset : 4; ++ } cursor2_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_offset_t f; ++} cursor2_offset_u; ++ ++typedef struct _cursor2_h_pos_t { ++ unsigned long cur2_h_start : 10; ++ unsigned long : 6; ++ unsigned long cur2_h_end : 10; ++ unsigned long : 5; ++ unsigned long cur2_en : 1; ++ } cursor2_h_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_h_pos_t f; ++} cursor2_h_pos_u; ++ ++typedef struct _cursor2_v_pos_t { ++ unsigned long cur2_v_start : 10; ++ unsigned long : 6; ++ unsigned long cur2_v_end : 10; ++ unsigned long : 6; ++ } cursor2_v_pos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_v_pos_t f; ++} cursor2_v_pos_u; ++ ++typedef struct _cursor2_color0_t { ++ unsigned long cur2_color0_r : 8; ++ unsigned long cur2_color0_g : 8; ++ unsigned long cur2_color0_b : 8; ++ unsigned long : 8; ++ } cursor2_color0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_color0_t f; ++} cursor2_color0_u; ++ ++typedef struct _cursor2_color1_t { ++ unsigned long cur2_color1_r : 8; ++ unsigned long cur2_color1_g : 8; ++ unsigned long cur2_color1_b : 8; ++ unsigned long : 8; ++ } cursor2_color1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ cursor2_color1_t f; ++} cursor2_color1_u; ++ ++typedef struct _disp_int_cntl_t { ++ unsigned long vline_int_pos : 10; ++ unsigned long : 6; ++ unsigned long hpos_int_pos : 10; ++ unsigned long : 4; ++ unsigned long vblank_int_pol : 1; ++ unsigned long frame_int_pol : 1; ++ } disp_int_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_int_cntl_t f; ++} disp_int_cntl_u; ++ ++typedef struct _crtc_ss_t { ++ unsigned long ss_start : 10; ++ unsigned long : 6; ++ unsigned long ss_end : 10; ++ unsigned long : 2; ++ unsigned long ss_align : 1; ++ unsigned long ss_pol : 1; ++ unsigned long ss_run_mode : 1; ++ unsigned long ss_en : 1; ++ } crtc_ss_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ss_t f; ++} crtc_ss_u; ++ ++typedef struct _crtc_ls_t { ++ unsigned long ls_start : 10; ++ unsigned long : 6; ++ unsigned long ls_end : 10; ++ unsigned long : 2; ++ unsigned long ls_align : 1; ++ unsigned long ls_pol : 1; ++ unsigned long ls_run_mode : 1; ++ unsigned long ls_en : 1; ++ } crtc_ls_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ls_t f; ++} crtc_ls_u; ++ ++typedef struct _crtc_rev_t { ++ unsigned long rev_pos : 10; ++ unsigned long : 6; ++ unsigned long rev_align : 1; ++ unsigned long rev_freq_nref : 5; ++ unsigned long rev_en : 1; ++ unsigned long : 9; ++ } crtc_rev_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_rev_t f; ++} crtc_rev_u; ++ ++typedef struct _crtc_dclk_t { ++ unsigned long dclk_start : 10; ++ unsigned long : 6; ++ unsigned long dclk_end : 10; ++ unsigned long : 1; ++ unsigned long dclk_run_mode : 2; ++ unsigned long dclk_pol : 1; ++ unsigned long dclk_align : 1; ++ unsigned long dclk_en : 1; ++ } crtc_dclk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_dclk_t f; ++} crtc_dclk_u; ++ ++typedef struct _crtc_gs_t { ++ unsigned long gs_start : 10; ++ unsigned long : 6; ++ unsigned long gs_end : 10; ++ unsigned long : 3; ++ unsigned long gs_align : 1; ++ unsigned long gs_pol : 1; ++ unsigned long gs_en : 1; ++ } crtc_gs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gs_t f; ++} crtc_gs_u; ++ ++typedef struct _crtc_vpos_gs_t { ++ unsigned long gs_vpos_start : 10; ++ unsigned long : 6; ++ unsigned long gs_vpos_end : 10; ++ unsigned long : 6; ++ } crtc_vpos_gs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_vpos_gs_t f; ++} crtc_vpos_gs_u; ++ ++typedef struct _crtc_gclk_t { ++ unsigned long gclk_start : 10; ++ unsigned long : 6; ++ unsigned long gclk_end : 10; ++ unsigned long : 3; ++ unsigned long gclk_align : 1; ++ unsigned long gclk_pol : 1; ++ unsigned long gclk_en : 1; ++ } crtc_gclk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gclk_t f; ++} crtc_gclk_u; ++ ++typedef struct _crtc_goe_t { ++ unsigned long goe_start : 10; ++ unsigned long : 6; ++ unsigned long goe_end : 10; ++ unsigned long : 3; ++ unsigned long goe_align : 1; ++ unsigned long goe_pol : 1; ++ unsigned long goe_en : 1; ++ } crtc_goe_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_goe_t f; ++} crtc_goe_u; ++ ++typedef struct _crtc_frame_t { ++ unsigned long crtc_fr_start : 10; ++ unsigned long : 6; ++ unsigned long crtc_fr_end : 10; ++ unsigned long : 4; ++ unsigned long crtc_frame_en : 1; ++ unsigned long crtc_frame_align : 1; ++ } crtc_frame_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_frame_t f; ++} crtc_frame_u; ++ ++typedef struct _crtc_frame_vpos_t { ++ unsigned long crtc_fr_vpos : 10; ++ unsigned long : 22; ++ } crtc_frame_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_frame_vpos_t f; ++} crtc_frame_vpos_u; ++ ++typedef struct _gpio_data_t { ++ unsigned long gio_out : 16; ++ unsigned long gio_in : 16; ++ } gpio_data_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_data_t f; ++} gpio_data_u; ++ ++typedef struct _gpio_cntl1_t { ++ unsigned long gio_pd : 16; ++ unsigned long gio_schmen : 16; ++ } gpio_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl1_t f; ++} gpio_cntl1_u; ++ ++typedef struct _gpio_cntl2_t { ++ unsigned long gio_oe : 16; ++ unsigned long gio_srp : 1; ++ unsigned long gio_srn : 1; ++ unsigned long gio_sp : 4; ++ unsigned long gio_sn : 4; ++ unsigned long : 6; ++ } gpio_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl2_t f; ++} gpio_cntl2_u; ++ ++typedef struct _lcdd_cntl1_t { ++ unsigned long lcdd_pd : 18; ++ unsigned long lcdd_srp : 1; ++ unsigned long lcdd_srn : 1; ++ unsigned long lcdd_sp : 4; ++ unsigned long lcdd_sn : 4; ++ unsigned long lcdd_align : 1; ++ unsigned long : 3; ++ } lcdd_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcdd_cntl1_t f; ++} lcdd_cntl1_u; ++ ++typedef struct _lcdd_cntl2_t { ++ unsigned long lcdd_oe : 18; ++ unsigned long : 14; ++ } lcdd_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcdd_cntl2_t f; ++} lcdd_cntl2_u; ++ ++typedef struct _genlcd_cntl1_t { ++ unsigned long dclk_oe : 1; ++ unsigned long dclk_pd : 1; ++ unsigned long dclk_srp : 1; ++ unsigned long dclk_srn : 1; ++ unsigned long dclk_sp : 4; ++ unsigned long dclk_sn : 4; ++ unsigned long ss_oe : 1; ++ unsigned long ss_pd : 1; ++ unsigned long ls_oe : 1; ++ unsigned long ls_pd : 1; ++ unsigned long gs_oe : 1; ++ unsigned long gs_pd : 1; ++ unsigned long goe_oe : 1; ++ unsigned long goe_pd : 1; ++ unsigned long rev_oe : 1; ++ unsigned long rev_pd : 1; ++ unsigned long frame_oe : 1; ++ unsigned long frame_pd : 1; ++ unsigned long : 8; ++ } genlcd_cntl1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl1_t f; ++} genlcd_cntl1_u; ++ ++typedef struct _genlcd_cntl2_t { ++ unsigned long gclk_oe : 1; ++ unsigned long gclk_pd : 1; ++ unsigned long gclk_srp : 1; ++ unsigned long gclk_srn : 1; ++ unsigned long gclk_sp : 4; ++ unsigned long gclk_sn : 4; ++ unsigned long genlcd_srp : 1; ++ unsigned long genlcd_srn : 1; ++ unsigned long genlcd_sp : 4; ++ unsigned long genlcd_sn : 4; ++ unsigned long : 10; ++ } genlcd_cntl2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl2_t f; ++} genlcd_cntl2_u; ++ ++typedef struct _disp_debug_t { ++ unsigned long disp_debug : 32; ++ } disp_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_debug_t f; ++} disp_debug_u; ++ ++typedef struct _disp_db_buf_cntl_rd_t { ++ unsigned long en_db_buf : 1; ++ unsigned long update_db_buf_done : 1; ++ unsigned long db_buf_cntl : 6; ++ unsigned long : 24; ++ } disp_db_buf_cntl_rd_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_db_buf_cntl_rd_t f; ++} disp_db_buf_cntl_rd_u; ++ ++typedef struct _disp_db_buf_cntl_wr_t { ++ unsigned long en_db_buf : 1; ++ unsigned long update_db_buf : 1; ++ unsigned long db_buf_cntl : 6; ++ unsigned long : 24; ++ } disp_db_buf_cntl_wr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_db_buf_cntl_wr_t f; ++} disp_db_buf_cntl_wr_u; ++ ++typedef struct _disp_crc_sig_t { ++ unsigned long crc_sig_r : 6; ++ unsigned long crc_sig_g : 6; ++ unsigned long crc_sig_b : 6; ++ unsigned long crc_cont_en : 1; ++ unsigned long crc_en : 1; ++ unsigned long crc_mask_en : 1; ++ unsigned long crc_sig_cntl : 6; ++ unsigned long : 5; ++ } disp_crc_sig_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_crc_sig_t f; ++} disp_crc_sig_u; ++ ++typedef struct _crtc_default_count_t { ++ unsigned long crtc_hcount_def : 10; ++ unsigned long : 6; ++ unsigned long crtc_vcount_def : 10; ++ unsigned long : 6; ++ } crtc_default_count_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_default_count_t f; ++} crtc_default_count_u; ++ ++typedef struct _lcd_background_color_t { ++ unsigned long lcd_bg_red : 8; ++ unsigned long lcd_bg_green : 8; ++ unsigned long lcd_bg_blue : 8; ++ unsigned long : 8; ++ } lcd_background_color_t; ++ ++typedef union { ++ unsigned long val : 32; ++ lcd_background_color_t f; ++} lcd_background_color_u; ++ ++typedef struct _crtc_ps2_t { ++ unsigned long ps2_start : 10; ++ unsigned long : 6; ++ unsigned long ps2_end : 10; ++ unsigned long : 4; ++ unsigned long ps2_pol : 1; ++ unsigned long ps2_en : 1; ++ } crtc_ps2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps2_t f; ++} crtc_ps2_u; ++ ++typedef struct _crtc_ps2_vpos_t { ++ unsigned long ps2_vpos_start : 10; ++ unsigned long : 6; ++ unsigned long ps2_vpos_end : 10; ++ unsigned long : 6; ++ } crtc_ps2_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps2_vpos_t f; ++} crtc_ps2_vpos_u; ++ ++typedef struct _crtc_ps1_active_t { ++ unsigned long ps1_h_start : 10; ++ unsigned long : 6; ++ unsigned long ps1_h_end : 10; ++ unsigned long : 3; ++ unsigned long ps1_pol : 1; ++ unsigned long ps1_en : 1; ++ unsigned long ps1_use_nactive : 1; ++ } crtc_ps1_active_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps1_active_t f; ++} crtc_ps1_active_u; ++ ++typedef struct _crtc_ps1_nactive_t { ++ unsigned long ps1_h_start_na : 10; ++ unsigned long : 6; ++ unsigned long ps1_h_end_na : 10; ++ unsigned long : 5; ++ unsigned long ps1_en_na : 1; ++ } crtc_ps1_nactive_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_ps1_nactive_t f; ++} crtc_ps1_nactive_u; ++ ++typedef struct _crtc_gclk_ext_t { ++ unsigned long gclk_alter_start : 10; ++ unsigned long : 6; ++ unsigned long gclk_alter_width : 2; ++ unsigned long gclk_en_alter : 1; ++ unsigned long gclk_db_width : 2; ++ unsigned long : 11; ++ } crtc_gclk_ext_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_gclk_ext_t f; ++} crtc_gclk_ext_u; ++ ++typedef struct _crtc_alw_t { ++ unsigned long alw_hstart : 10; ++ unsigned long : 6; ++ unsigned long alw_hend : 10; ++ unsigned long : 4; ++ unsigned long alw_delay : 1; ++ unsigned long alw_en : 1; ++ } crtc_alw_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_alw_t f; ++} crtc_alw_u; ++ ++typedef struct _crtc_alw_vpos_t { ++ unsigned long alw_vstart : 10; ++ unsigned long : 6; ++ unsigned long alw_vend : 10; ++ unsigned long : 6; ++ } crtc_alw_vpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_alw_vpos_t f; ++} crtc_alw_vpos_u; ++ ++typedef struct _crtc_psk_t { ++ unsigned long psk_vstart : 10; ++ unsigned long : 6; ++ unsigned long psk_vend : 10; ++ unsigned long : 4; ++ unsigned long psk_pol : 1; ++ unsigned long psk_en : 1; ++ } crtc_psk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_psk_t f; ++} crtc_psk_u; ++ ++typedef struct _crtc_psk_hpos_t { ++ unsigned long psk_hstart : 10; ++ unsigned long : 6; ++ unsigned long psk_hend : 10; ++ unsigned long : 6; ++ } crtc_psk_hpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_psk_hpos_t f; ++} crtc_psk_hpos_u; ++ ++typedef struct _crtc_cv4_start_t { ++ unsigned long cv4_vstart : 10; ++ unsigned long : 20; ++ unsigned long cv4_pol : 1; ++ unsigned long cv4_en : 1; ++ } crtc_cv4_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_start_t f; ++} crtc_cv4_start_u; ++ ++typedef struct _crtc_cv4_end_t { ++ unsigned long cv4_vend1 : 10; ++ unsigned long : 6; ++ unsigned long cv4_vend2 : 10; ++ unsigned long : 6; ++ } crtc_cv4_end_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_end_t f; ++} crtc_cv4_end_u; ++ ++typedef struct _crtc_cv4_hpos_t { ++ unsigned long cv4_hstart : 10; ++ unsigned long : 6; ++ unsigned long cv4_hend : 10; ++ unsigned long : 6; ++ } crtc_cv4_hpos_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_cv4_hpos_t f; ++} crtc_cv4_hpos_u; ++ ++typedef struct _crtc_eck_t { ++ unsigned long eck_freq1 : 3; ++ unsigned long eck_en : 1; ++ unsigned long : 28; ++ } crtc_eck_t; ++ ++typedef union { ++ unsigned long val : 32; ++ crtc_eck_t f; ++} crtc_eck_u; ++ ++typedef struct _refresh_cntl_t { ++ unsigned long ref_frame : 3; ++ unsigned long nref_frame : 5; ++ unsigned long ref_cntl : 1; ++ unsigned long stop_sm_nref : 1; ++ unsigned long stop_req_nref : 1; ++ unsigned long : 21; ++ } refresh_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ refresh_cntl_t f; ++} refresh_cntl_u; ++ ++typedef struct _genlcd_cntl3_t { ++ unsigned long ps1_oe : 1; ++ unsigned long ps1_pd : 1; ++ unsigned long ps2_oe : 1; ++ unsigned long ps2_pd : 1; ++ unsigned long rev2_oe : 1; ++ unsigned long rev2_pd : 1; ++ unsigned long awl_oe : 1; ++ unsigned long awl_pd : 1; ++ unsigned long dinv_oe : 1; ++ unsigned long dinv_pd : 1; ++ unsigned long psk_out : 1; ++ unsigned long psd_out : 1; ++ unsigned long eck_out : 1; ++ unsigned long cv4_out : 1; ++ unsigned long ps1_out : 1; ++ unsigned long ps2_out : 1; ++ unsigned long rev_out : 1; ++ unsigned long rev2_out : 1; ++ unsigned long : 14; ++ } genlcd_cntl3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ genlcd_cntl3_t f; ++} genlcd_cntl3_u; ++ ++typedef struct _gpio_data2_t { ++ unsigned long gio2_out : 16; ++ unsigned long gio2_in : 16; ++ } gpio_data2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_data2_t f; ++} gpio_data2_u; ++ ++typedef struct _gpio_cntl3_t { ++ unsigned long gio2_pd : 16; ++ unsigned long gio2_schmen : 16; ++ } gpio_cntl3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl3_t f; ++} gpio_cntl3_u; ++ ++typedef struct _gpio_cntl4_t { ++ unsigned long gio2_oe : 16; ++ unsigned long : 16; ++ } gpio_cntl4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gpio_cntl4_t f; ++} gpio_cntl4_u; ++ ++typedef struct _chip_strap_t { ++ unsigned long config_strap : 8; ++ unsigned long pkg_strap : 1; ++ unsigned long : 23; ++ } chip_strap_t; ++ ++typedef union { ++ unsigned long val : 32; ++ chip_strap_t f; ++} chip_strap_u; ++ ++typedef struct _disp_debug2_t { ++ unsigned long disp_debug2 : 32; ++ } disp_debug2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ disp_debug2_t f; ++} disp_debug2_u; ++ ++typedef struct _debug_bus_cntl_t { ++ unsigned long debug_testmux : 4; ++ unsigned long debug_testsel : 4; ++ unsigned long debug_gioa_sel : 2; ++ unsigned long debug_giob_sel : 2; ++ unsigned long debug_clk_sel : 1; ++ unsigned long debug_clk_inv : 1; ++ unsigned long : 2; ++ unsigned long debug_bus : 16; ++ } debug_bus_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug_bus_cntl_t f; ++} debug_bus_cntl_u; ++ ++typedef struct _gamma_value1_t { ++ unsigned long gamma1 : 8; ++ unsigned long gamma2 : 8; ++ unsigned long gamma3 : 8; ++ unsigned long gamma4 : 8; ++ } gamma_value1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_value1_t f; ++} gamma_value1_u; ++ ++typedef struct _gamma_value2_t { ++ unsigned long gamma5 : 8; ++ unsigned long gamma6 : 8; ++ unsigned long gamma7 : 8; ++ unsigned long gamma8 : 8; ++ } gamma_value2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_value2_t f; ++} gamma_value2_u; ++ ++typedef struct _gamma_slope_t { ++ unsigned long slope1 : 3; ++ unsigned long slope2 : 3; ++ unsigned long slope3 : 3; ++ unsigned long slope4 : 3; ++ unsigned long slope5 : 3; ++ unsigned long slope6 : 3; ++ unsigned long slope7 : 3; ++ unsigned long slope8 : 3; ++ unsigned long : 8; ++ } gamma_slope_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gamma_slope_t f; ++} gamma_slope_u; ++ ++typedef struct _gen_status_t { ++ unsigned long status : 16; ++ unsigned long : 16; ++ } gen_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ gen_status_t f; ++} gen_status_u; ++ ++typedef struct _hw_int_t { ++ unsigned long hwint1_pos : 5; ++ unsigned long hwint2_pos : 5; ++ unsigned long hwint1_pol : 1; ++ unsigned long hwint2_pol : 1; ++ unsigned long hwint1_en_db : 1; ++ unsigned long hwint2_en_db : 1; ++ unsigned long : 18; ++ } hw_int_t; ++ ++typedef union { ++ unsigned long val : 32; ++ hw_int_t f; ++} hw_int_u; ++ ++typedef struct _dst_offset_t { ++ unsigned long dst_offset : 24; ++ unsigned long : 8; ++ } dst_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_offset_t f; ++} dst_offset_u; ++ ++typedef struct _dst_pitch_t { ++ unsigned long dst_pitch : 14; ++ unsigned long mc_dst_pitch_mul : 2; ++ unsigned long : 16; ++ } dst_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_pitch_t f; ++} dst_pitch_u; ++ ++typedef struct _dst_pitch_offset_t { ++ unsigned long dst_offset : 20; ++ unsigned long dst_pitch : 10; ++ unsigned long mc_dst_pitch_mul : 2; ++ } dst_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_pitch_offset_t f; ++} dst_pitch_offset_u; ++ ++typedef struct _dst_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 18; ++ } dst_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_x_t f; ++} dst_x_u; ++ ++typedef struct _dst_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 18; ++ } dst_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_y_t f; ++} dst_y_u; ++ ++typedef struct _dst_x_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ } dst_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_x_y_t f; ++} dst_x_y_u; ++ ++typedef struct _dst_y_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ } dst_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_y_x_t f; ++} dst_y_x_u; ++ ++typedef struct _dst_width_t { ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 18; ++ } dst_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_t f; ++} dst_width_u; ++ ++typedef struct _dst_height_t { ++ unsigned long dst_height : 14; ++ unsigned long : 18; ++ } dst_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_t f; ++} dst_height_u; ++ ++typedef struct _dst_width_height_t { ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_height_t f; ++} dst_width_height_u; ++ ++typedef struct _dst_height_width_t { ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ } dst_height_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_width_t f; ++} dst_height_width_u; ++ ++typedef struct _dst_height_width_8_t { ++ unsigned long : 16; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_height : 8; ++ } dst_height_width_8_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_width_8_t f; ++} dst_height_width_8_u; ++ ++typedef struct _dst_height_y_t { ++ unsigned long dst_y : 14; ++ unsigned long : 2; ++ unsigned long dst_height : 14; ++ unsigned long : 2; ++ } dst_height_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_height_y_t f; ++} dst_height_y_u; ++ ++typedef struct _dst_width_x_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_x_t f; ++} dst_width_x_u; ++ ++typedef struct _dst_width_x_incy_t { ++ unsigned long dst_x : 14; ++ unsigned long : 2; ++ unsigned long dst_width_b0 : 8; ++ unsigned long dst_width_b1 : 6; ++ unsigned long : 2; ++ } dst_width_x_incy_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_width_x_incy_t f; ++} dst_width_x_incy_u; ++ ++typedef struct _dst_line_start_t { ++ unsigned long dst_start_x : 14; ++ unsigned long : 2; ++ unsigned long dst_start_y : 14; ++ unsigned long : 2; ++ } dst_line_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_line_start_t f; ++} dst_line_start_u; ++ ++typedef struct _dst_line_end_t { ++ unsigned long dst_end_x : 14; ++ unsigned long : 2; ++ unsigned long dst_end_y_b0 : 8; ++ unsigned long dst_end_y_b1 : 6; ++ unsigned long : 2; ++ } dst_line_end_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dst_line_end_t f; ++} dst_line_end_u; ++ ++typedef struct _brush_offset_t { ++ unsigned long brush_offset : 24; ++ unsigned long : 8; ++ } brush_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brush_offset_t f; ++} brush_offset_u; ++ ++typedef struct _brush_y_x_t { ++ unsigned long brush_x : 5; ++ unsigned long : 3; ++ unsigned long brush_y : 3; ++ unsigned long : 21; ++ } brush_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ brush_y_x_t f; ++} brush_y_x_u; ++ ++typedef struct _dp_brush_frgd_clr_t { ++ unsigned long dp_brush_frgd_clr : 32; ++ } dp_brush_frgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_brush_frgd_clr_t f; ++} dp_brush_frgd_clr_u; ++ ++typedef struct _dp_brush_bkgd_clr_t { ++ unsigned long dp_brush_bkgd_clr : 32; ++ } dp_brush_bkgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_brush_bkgd_clr_t f; ++} dp_brush_bkgd_clr_u; ++ ++typedef struct _src2_offset_t { ++ unsigned long src2_offset : 24; ++ unsigned long : 8; ++ } src2_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_offset_t f; ++} src2_offset_u; ++ ++typedef struct _src2_pitch_t { ++ unsigned long src2_pitch : 14; ++ unsigned long src2_pitch_mul : 2; ++ unsigned long : 16; ++ } src2_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_pitch_t f; ++} src2_pitch_u; ++ ++typedef struct _src2_pitch_offset_t { ++ unsigned long src2_offset : 20; ++ unsigned long : 2; ++ unsigned long src2_pitch : 8; ++ unsigned long src2_pitch_mul : 2; ++ } src2_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_pitch_offset_t f; ++} src2_pitch_offset_u; ++ ++typedef struct _src2_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 18; ++ } src2_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_x_t f; ++} src2_x_u; ++ ++typedef struct _src2_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 18; ++ } src2_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_y_t f; ++} src2_y_u; ++ ++typedef struct _src2_x_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ } src2_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_x_y_t f; ++} src2_x_y_u; ++ ++typedef struct _src2_width_t { ++ unsigned long src2_width : 14; ++ unsigned long : 18; ++ } src2_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_width_t f; ++} src2_width_u; ++ ++typedef struct _src2_height_t { ++ unsigned long src2_height : 14; ++ unsigned long : 18; ++ } src2_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_height_t f; ++} src2_height_u; ++ ++typedef struct _src2_inc_t { ++ unsigned long src2_xinc : 6; ++ unsigned long : 2; ++ unsigned long src2_yinc : 6; ++ unsigned long : 18; ++ } src2_inc_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src2_inc_t f; ++} src2_inc_u; ++ ++typedef struct _src_offset_t { ++ unsigned long src_offset : 24; ++ unsigned long : 8; ++ } src_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_offset_t f; ++} src_offset_u; ++ ++typedef struct _src_pitch_t { ++ unsigned long src_pitch : 14; ++ unsigned long src_pitch_mul : 2; ++ unsigned long : 16; ++ } src_pitch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_pitch_t f; ++} src_pitch_u; ++ ++typedef struct _src_pitch_offset_t { ++ unsigned long src_offset : 20; ++ unsigned long src_pitch : 10; ++ unsigned long src_pitch_mul : 2; ++ } src_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_pitch_offset_t f; ++} src_pitch_offset_u; ++ ++typedef struct _src_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 18; ++ } src_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_x_t f; ++} src_x_u; ++ ++typedef struct _src_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 18; ++ } src_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_y_t f; ++} src_y_u; ++ ++typedef struct _src_x_y_t { ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ } src_x_y_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_x_y_t f; ++} src_x_y_u; ++ ++typedef struct _src_y_x_t { ++ unsigned long src_x : 14; ++ unsigned long : 2; ++ unsigned long src_y : 14; ++ unsigned long : 2; ++ } src_y_x_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_y_x_t f; ++} src_y_x_u; ++ ++typedef struct _src_width_t { ++ unsigned long src_width : 14; ++ unsigned long : 18; ++ } src_width_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_width_t f; ++} src_width_u; ++ ++typedef struct _src_height_t { ++ unsigned long src_height : 14; ++ unsigned long : 18; ++ } src_height_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_height_t f; ++} src_height_u; ++ ++typedef struct _src_inc_t { ++ unsigned long src_xinc : 6; ++ unsigned long : 2; ++ unsigned long src_yinc : 6; ++ unsigned long : 18; ++ } src_inc_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_inc_t f; ++} src_inc_u; ++ ++typedef struct _host_data0_t { ++ unsigned long host_data : 32; ++ } host_data0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data0_t f; ++} host_data0_u; ++ ++typedef struct _host_data1_t { ++ unsigned long host_data : 32; ++ } host_data1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data1_t f; ++} host_data1_u; ++ ++typedef struct _host_data2_t { ++ unsigned long host_data : 32; ++ } host_data2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data2_t f; ++} host_data2_u; ++ ++typedef struct _host_data3_t { ++ unsigned long host_data : 32; ++ } host_data3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data3_t f; ++} host_data3_u; ++ ++typedef struct _host_data4_t { ++ unsigned long host_data : 32; ++ } host_data4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data4_t f; ++} host_data4_u; ++ ++typedef struct _host_data5_t { ++ unsigned long host_data : 32; ++ } host_data5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data5_t f; ++} host_data5_u; ++ ++typedef struct _host_data6_t { ++ unsigned long host_data : 32; ++ } host_data6_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data6_t f; ++} host_data6_u; ++ ++typedef struct _host_data7_t { ++ unsigned long host_data : 32; ++ } host_data7_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data7_t f; ++} host_data7_u; ++ ++typedef struct _host_data_last_t { ++ unsigned long host_data_last : 32; ++ } host_data_last_t; ++ ++typedef union { ++ unsigned long val : 32; ++ host_data_last_t f; ++} host_data_last_u; ++ ++typedef struct _dp_src_frgd_clr_t { ++ unsigned long dp_src_frgd_clr : 32; ++ } dp_src_frgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_src_frgd_clr_t f; ++} dp_src_frgd_clr_u; ++ ++typedef struct _dp_src_bkgd_clr_t { ++ unsigned long dp_src_bkgd_clr : 32; ++ } dp_src_bkgd_clr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_src_bkgd_clr_t f; ++} dp_src_bkgd_clr_u; ++ ++typedef struct _sc_left_t { ++ unsigned long sc_left : 14; ++ unsigned long : 18; ++ } sc_left_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_left_t f; ++} sc_left_u; ++ ++typedef struct _sc_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 18; ++ } sc_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_right_t f; ++} sc_right_u; ++ ++typedef struct _sc_top_t { ++ unsigned long sc_top : 14; ++ unsigned long : 18; ++ } sc_top_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_top_t f; ++} sc_top_u; ++ ++typedef struct _sc_bottom_t { ++ unsigned long sc_bottom : 14; ++ unsigned long : 18; ++ } sc_bottom_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_bottom_t f; ++} sc_bottom_u; ++ ++typedef struct _src_sc_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 18; ++ } src_sc_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_right_t f; ++} src_sc_right_u; ++ ++typedef struct _src_sc_bottom_t { ++ unsigned long sc_bottom : 14; ++ unsigned long : 18; ++ } src_sc_bottom_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_bottom_t f; ++} src_sc_bottom_u; ++ ++typedef struct _dp_cntl_t { ++ unsigned long dst_x_dir : 1; ++ unsigned long dst_y_dir : 1; ++ unsigned long src_x_dir : 1; ++ unsigned long src_y_dir : 1; ++ unsigned long dst_major_x : 1; ++ unsigned long src_major_x : 1; ++ unsigned long : 26; ++ } dp_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_cntl_t f; ++} dp_cntl_u; ++ ++typedef struct _dp_cntl_dst_dir_t { ++ unsigned long : 15; ++ unsigned long dst_y_dir : 1; ++ unsigned long : 15; ++ unsigned long dst_x_dir : 1; ++ } dp_cntl_dst_dir_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_cntl_dst_dir_t f; ++} dp_cntl_dst_dir_u; ++ ++typedef struct _dp_datatype_t { ++ unsigned long dp_dst_datatype : 4; ++ unsigned long : 4; ++ unsigned long dp_brush_datatype : 4; ++ unsigned long dp_src2_type : 1; ++ unsigned long dp_src2_datatype : 3; ++ unsigned long dp_src_datatype : 3; ++ unsigned long : 11; ++ unsigned long dp_byte_pix_order : 1; ++ unsigned long : 1; ++ } dp_datatype_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_datatype_t f; ++} dp_datatype_u; ++ ++typedef struct _dp_mix_t { ++ unsigned long : 8; ++ unsigned long dp_src_source : 3; ++ unsigned long dp_src2_source : 3; ++ unsigned long : 2; ++ unsigned long dp_rop3 : 8; ++ unsigned long dp_op : 1; ++ unsigned long : 7; ++ } dp_mix_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_mix_t f; ++} dp_mix_u; ++ ++typedef struct _dp_write_msk_t { ++ unsigned long dp_write_msk : 32; ++ } dp_write_msk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_write_msk_t f; ++} dp_write_msk_u; ++ ++typedef struct _clr_cmp_clr_src_t { ++ unsigned long clr_cmp_clr_src : 32; ++ } clr_cmp_clr_src_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_clr_src_t f; ++} clr_cmp_clr_src_u; ++ ++typedef struct _clr_cmp_clr_dst_t { ++ unsigned long clr_cmp_clr_dst : 32; ++ } clr_cmp_clr_dst_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_clr_dst_t f; ++} clr_cmp_clr_dst_u; ++ ++typedef struct _clr_cmp_cntl_t { ++ unsigned long clr_cmp_fcn_src : 3; ++ unsigned long : 5; ++ unsigned long clr_cmp_fcn_dst : 3; ++ unsigned long : 13; ++ unsigned long clr_cmp_src : 2; ++ unsigned long : 6; ++ } clr_cmp_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_cntl_t f; ++} clr_cmp_cntl_u; ++ ++typedef struct _clr_cmp_msk_t { ++ unsigned long clr_cmp_msk : 32; ++ } clr_cmp_msk_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clr_cmp_msk_t f; ++} clr_cmp_msk_u; ++ ++typedef struct _default_pitch_offset_t { ++ unsigned long default_offset : 20; ++ unsigned long default_pitch : 10; ++ unsigned long : 2; ++ } default_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default_pitch_offset_t f; ++} default_pitch_offset_u; ++ ++typedef struct _default_sc_bottom_right_t { ++ unsigned long default_sc_right : 14; ++ unsigned long : 2; ++ unsigned long default_sc_bottom : 14; ++ unsigned long : 2; ++ } default_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default_sc_bottom_right_t f; ++} default_sc_bottom_right_u; ++ ++typedef struct _default2_sc_bottom_right_t { ++ unsigned long default_sc_right : 14; ++ unsigned long : 2; ++ unsigned long default_sc_bottom : 14; ++ unsigned long : 2; ++ } default2_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ default2_sc_bottom_right_t f; ++} default2_sc_bottom_right_u; ++ ++typedef struct _ref1_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref1_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref1_pitch_offset_t f; ++} ref1_pitch_offset_u; ++ ++typedef struct _ref2_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref2_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref2_pitch_offset_t f; ++} ref2_pitch_offset_u; ++ ++typedef struct _ref3_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref3_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref3_pitch_offset_t f; ++} ref3_pitch_offset_u; ++ ++typedef struct _ref4_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref4_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref4_pitch_offset_t f; ++} ref4_pitch_offset_u; ++ ++typedef struct _ref5_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref5_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref5_pitch_offset_t f; ++} ref5_pitch_offset_u; ++ ++typedef struct _ref6_pitch_offset_t { ++ unsigned long offset : 20; ++ unsigned long : 2; ++ unsigned long pitch : 8; ++ unsigned long : 2; ++ } ref6_pitch_offset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ ref6_pitch_offset_t f; ++} ref6_pitch_offset_u; ++ ++typedef struct _dp_gui_master_cntl_t { ++ unsigned long gmc_src_pitch_offset_cntl : 1; ++ unsigned long gmc_dst_pitch_offset_cntl : 1; ++ unsigned long gmc_src_clipping : 1; ++ unsigned long gmc_dst_clipping : 1; ++ unsigned long gmc_brush_datatype : 4; ++ unsigned long gmc_dst_datatype : 4; ++ unsigned long gmc_src_datatype : 3; ++ unsigned long gmc_byte_pix_order : 1; ++ unsigned long gmc_default_sel : 1; ++ unsigned long gmc_rop3 : 8; ++ unsigned long gmc_dp_src_source : 3; ++ unsigned long gmc_clr_cmp_fcn_dis : 1; ++ unsigned long : 1; ++ unsigned long gmc_wr_msk_dis : 1; ++ unsigned long gmc_dp_op : 1; ++ } dp_gui_master_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ dp_gui_master_cntl_t f; ++} dp_gui_master_cntl_u; ++ ++typedef struct _sc_top_left_t { ++ unsigned long sc_left : 14; ++ unsigned long : 2; ++ unsigned long sc_top : 14; ++ unsigned long : 2; ++ } sc_top_left_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_top_left_t f; ++} sc_top_left_u; ++ ++typedef struct _sc_bottom_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 2; ++ unsigned long sc_bottom : 14; ++ unsigned long : 2; ++ } sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sc_bottom_right_t f; ++} sc_bottom_right_u; ++ ++typedef struct _src_sc_top_left_t { ++ unsigned short sc_left; ++ unsigned short sc_top; ++} src_sc_top_left_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_top_left_t f; ++} src_sc_top_left_u; ++ ++typedef struct _src_sc_bottom_right_t { ++ unsigned long sc_right : 14; ++ unsigned long : 2; ++ unsigned long sc_bottom : 14; ++ unsigned long : 2; ++ } src_sc_bottom_right_t; ++ ++typedef union { ++ unsigned long val : 32; ++ src_sc_bottom_right_t f; ++} src_sc_bottom_right_u; ++ ++typedef struct _global_alpha_t { ++ unsigned long alpha_r : 8; ++ unsigned long alpha_g : 8; ++ unsigned long alpha_b : 8; ++ unsigned long alpha_a : 8; ++} global_alpha_t; ++ ++typedef union { ++ unsigned long val : 32; ++ global_alpha_t f; ++} global_alpha_u; ++ ++typedef struct _filter_coef_t { ++ unsigned long c_4 : 4; ++ unsigned long c_3 : 4; ++ unsigned long c_2 : 4; ++ unsigned long c_1 : 4; ++ unsigned long c1 : 4; ++ unsigned long c2 : 4; ++ unsigned long c3 : 4; ++ unsigned long c4 : 4; ++} filter_coef_t; ++ ++typedef union { ++ unsigned long val : 32; ++ filter_coef_t f; ++} filter_coef_u; ++ ++typedef struct _mvc_cntl_start_t { ++ unsigned long mc_cntl_src_1_index : 4; ++ unsigned long mc_cntl_dst_offset : 20; ++ unsigned long mc_dst_pitch_mul : 2; ++ unsigned long mc_cntl_src_2_index : 3; ++ unsigned long mc_cntl_width_height_sel : 3; ++} mvc_cntl_start_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mvc_cntl_start_t f; ++} mvc_cntl_start_u; ++ ++typedef struct _e2_arithmetic_cntl_t { ++ unsigned long opcode : 5; ++ unsigned long shiftright : 4; ++ unsigned long clamp : 1; ++ unsigned long rounding : 2; ++ unsigned long filter_n : 3; ++ unsigned long : 1; ++ unsigned long srcblend_inv : 1; ++ unsigned long srcblend : 4; ++ unsigned long : 3; ++ unsigned long dstblend_inv : 1; ++ unsigned long dstblend : 4; ++ unsigned long dst_signed : 1; ++ unsigned long autoinc : 1; ++ unsigned long : 1; ++} e2_arithmetic_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ e2_arithmetic_cntl_t f; ++} e2_arithmetic_cntl_u; ++ ++typedef struct _debug0_t { ++ unsigned long debug0_r : 8; ++ unsigned long : 8; ++ unsigned long debug0_rw : 8; ++ unsigned long : 8; ++} debug0_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug0_t f; ++} debug0_u; ++ ++typedef struct _debug1_t { ++ unsigned long debug1_r : 8; ++ unsigned long : 8; ++ unsigned long debug1_rw : 8; ++ unsigned long : 8; ++} debug1_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug1_t f; ++} debug1_u; ++ ++typedef struct _debug2_t { ++ unsigned long debug2_r : 8; ++ unsigned long : 8; ++ unsigned long debug2_rw : 8; ++ unsigned long : 8; ++} debug2_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug2_t f; ++} debug2_u; ++ ++typedef struct _debug3_t { ++ unsigned long : 32; ++} debug3_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug3_t f; ++} debug3_u; ++ ++typedef struct _debug4_t { ++ unsigned long : 32; ++} debug4_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug4_t f; ++} debug4_u; ++ ++typedef struct _debug5_t { ++ unsigned long : 32; ++} debug5_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug5_t f; ++} debug5_u; ++ ++typedef struct _debug6_t { ++ unsigned long : 32; ++} debug6_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug6_t f; ++} debug6_u; ++ ++typedef struct _debug7_t { ++ unsigned long : 32; ++} debug7_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug7_t f; ++} debug7_u; ++ ++typedef struct _debug8_t { ++ unsigned long : 32; ++} debug8_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug8_t f; ++} debug8_u; ++ ++typedef struct _debug9_t { ++ unsigned long : 32; ++} debug9_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug9_t f; ++} debug9_u; ++ ++typedef struct _debug10_t { ++ unsigned long : 32; ++ } debug10_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug10_t f; ++} debug10_u; ++ ++typedef struct _debug11_t { ++ unsigned long : 32; ++ } debug11_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug11_t f; ++} debug11_u; ++ ++typedef struct _debug12_t { ++ unsigned long : 32; ++ } debug12_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug12_t f; ++} debug12_u; ++ ++typedef struct _debug13_t { ++ unsigned long : 32; ++ } debug13_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug13_t f; ++} debug13_u; ++ ++typedef struct _debug14_t { ++ unsigned long : 32; ++ } debug14_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug14_t f; ++} debug14_u; ++ ++typedef struct _debug15_t { ++ unsigned long : 32; ++ } debug15_t; ++ ++typedef union { ++ unsigned long val : 32; ++ debug15_t f; ++} debug15_u; ++ ++typedef struct _eng_cntl_t { ++ unsigned long erc_reg_rd_ws : 1; ++ unsigned long erc_reg_wr_ws : 1; ++ unsigned long erc_idle_reg_wr : 1; ++ unsigned long dis_engine_triggers : 1; ++ unsigned long dis_rop_src_uses_dst_w_h : 1; ++ unsigned long dis_src_uses_dst_dirmaj : 1; ++ unsigned long : 6; ++ unsigned long force_3dclk_when_2dclk : 1; ++ unsigned long : 19; ++ } eng_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ eng_cntl_t f; ++} eng_cntl_u; ++ ++typedef struct _eng_perf_cnt_t { ++ unsigned long perf_cnt : 20; ++ unsigned long perf_sel : 4; ++ unsigned long perf_en : 1; ++ unsigned long : 3; ++ unsigned long perf_clr : 1; ++ unsigned long : 3; ++ } eng_perf_cnt_t; ++ ++typedef union { ++ unsigned long val : 32; ++ eng_perf_cnt_t f; ++} eng_perf_cnt_u; ++ ++typedef struct _idct_runs_t { ++ unsigned long idct_runs_3 : 8; ++ unsigned long idct_runs_2 : 8; ++ unsigned long idct_runs_1 : 8; ++ unsigned long idct_runs_0 : 8; ++ } idct_runs_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_runs_t f; ++} idct_runs_u; ++ ++typedef struct _idct_levels_t { ++ unsigned long idct_level_hi : 16; ++ unsigned long idct_level_lo : 16; ++ } idct_levels_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_levels_t f; ++} idct_levels_u; ++ ++typedef struct _idct_control_t { ++ unsigned long idct_ctl_luma_rd_format : 2; ++ unsigned long idct_ctl_chroma_rd_format : 2; ++ unsigned long idct_ctl_scan_pattern : 1; ++ unsigned long idct_ctl_intra : 1; ++ unsigned long idct_ctl_flush : 1; ++ unsigned long idct_ctl_passthru : 1; ++ unsigned long idct_ctl_sw_reset : 1; ++ unsigned long idct_ctl_constreq : 1; ++ unsigned long idct_ctl_scramble : 1; ++ unsigned long idct_ctl_alt_scan : 1; ++ unsigned long : 20; ++ } idct_control_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_control_t f; ++} idct_control_u; ++ ++typedef struct _idct_auth_control_t { ++ unsigned long control_bits : 32; ++ } idct_auth_control_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_auth_control_t f; ++} idct_auth_control_u; ++ ++typedef struct _idct_auth_t { ++ unsigned long auth : 32; ++ } idct_auth_t; ++ ++typedef union { ++ unsigned long val : 32; ++ idct_auth_t f; ++} idct_auth_u; ++ ++typedef struct _mem_cntl_t { ++ unsigned long : 1; ++ unsigned long en_mem_ch1 : 1; ++ unsigned long en_mem_ch2 : 1; ++ unsigned long int_mem_mapping : 1; ++ unsigned long : 28; ++ } mem_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_cntl_t f; ++} mem_cntl_u; ++ ++typedef struct _mem_arb_t { ++ unsigned long disp_time_slot : 4; ++ unsigned long disp_timer : 4; ++ unsigned long arb_option : 1; ++ unsigned long : 23; ++ } mem_arb_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_arb_t f; ++} mem_arb_u; ++ ++typedef struct _mc_fb_location_t { ++ unsigned long mc_fb_start : 16; ++ unsigned long mc_fb_top : 16; ++ } mc_fb_location_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_fb_location_t f; ++} mc_fb_location_u; ++ ++typedef struct _mem_ext_cntl_t { ++ unsigned long mem_ext_enable : 1; ++ unsigned long mem_ap_enable : 1; ++ unsigned long mem_addr_mapping : 2; ++ unsigned long mem_wdoe_cntl : 2; ++ unsigned long mem_wdoe_extend : 1; ++ unsigned long : 1; ++ unsigned long mem_page_timer : 8; ++ unsigned long mem_dynamic_cke : 1; ++ unsigned long mem_sdram_tri_en : 1; ++ unsigned long mem_self_refresh_en : 1; ++ unsigned long mem_power_down : 1; ++ unsigned long mem_hw_power_down_en : 1; ++ unsigned long mem_power_down_stat : 1; ++ unsigned long : 3; ++ unsigned long mem_pd_mck : 1; ++ unsigned long mem_pd_ma : 1; ++ unsigned long mem_pd_mdq : 1; ++ unsigned long mem_tristate_mck : 1; ++ unsigned long mem_tristate_ma : 1; ++ unsigned long mem_tristate_mcke : 1; ++ unsigned long mem_invert_mck : 1; ++ } mem_ext_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_ext_cntl_t f; ++} mem_ext_cntl_u; ++ ++typedef struct _mc_ext_mem_location_t { ++ unsigned long mc_ext_mem_start : 16; ++ unsigned long mc_ext_mem_top : 16; ++ } mc_ext_mem_location_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_ext_mem_location_t f; ++} mc_ext_mem_location_u; ++ ++typedef struct _mem_ext_timing_cntl_t { ++ unsigned long mem_trp : 2; ++ unsigned long mem_trcd : 2; ++ unsigned long mem_tras : 3; ++ unsigned long : 1; ++ unsigned long mem_trrd : 2; ++ unsigned long mem_tr2w : 2; ++ unsigned long mem_twr : 2; ++ unsigned long : 4; ++ unsigned long mem_twr_mode : 1; ++ unsigned long : 1; ++ unsigned long mem_refresh_dis : 1; ++ unsigned long : 3; ++ unsigned long mem_refresh_rate : 8; ++ } mem_ext_timing_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_ext_timing_cntl_t f; ++} mem_ext_timing_cntl_u; ++ ++typedef struct _mem_sdram_mode_reg_t { ++ unsigned long mem_mode_reg : 14; ++ unsigned long : 2; ++ unsigned long mem_read_latency : 2; ++ unsigned long mem_schmen_latency : 2; ++ unsigned long mem_cas_latency : 2; ++ unsigned long mem_schmen_extend : 1; ++ unsigned long : 8; ++ unsigned long mem_sdram_reset : 1; ++ } mem_sdram_mode_reg_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_sdram_mode_reg_t f; ++} mem_sdram_mode_reg_u; ++ ++typedef struct _mem_io_cntl_t { ++ unsigned long mem_sn_mck : 4; ++ unsigned long mem_sn_ma : 4; ++ unsigned long mem_sn_mdq : 4; ++ unsigned long mem_srn_mck : 1; ++ unsigned long mem_srn_ma : 1; ++ unsigned long mem_srn_mdq : 1; ++ unsigned long : 1; ++ unsigned long mem_sp_mck : 4; ++ unsigned long mem_sp_ma : 4; ++ unsigned long mem_sp_mdq : 4; ++ unsigned long mem_srp_mck : 1; ++ unsigned long mem_srp_ma : 1; ++ unsigned long mem_srp_mdq : 1; ++ unsigned long : 1; ++ } mem_io_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mem_io_cntl_t f; ++} mem_io_cntl_u; ++ ++typedef struct _mc_debug_t { ++ unsigned long mc_debug : 32; ++ } mc_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_debug_t f; ++} mc_debug_u; ++ ++typedef struct _mc_bist_ctrl_t { ++ unsigned long mc_bist_ctrl : 32; ++ } mc_bist_ctrl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_bist_ctrl_t f; ++} mc_bist_ctrl_u; ++ ++typedef struct _mc_bist_collar_read_t { ++ unsigned long mc_bist_collar_read : 32; ++ } mc_bist_collar_read_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_bist_collar_read_t f; ++} mc_bist_collar_read_u; ++ ++typedef struct _tc_mismatch_t { ++ unsigned long tc_mismatch : 24; ++ unsigned long : 8; ++ } tc_mismatch_t; ++ ++typedef union { ++ unsigned long val : 32; ++ tc_mismatch_t f; ++} tc_mismatch_u; ++ ++typedef struct _mc_perf_mon_cntl_t { ++ unsigned long clr_perf : 1; ++ unsigned long en_perf : 1; ++ unsigned long : 2; ++ unsigned long perf_op_a : 2; ++ unsigned long perf_op_b : 2; ++ unsigned long : 8; ++ unsigned long monitor_period : 8; ++ unsigned long perf_count_a_overflow : 1; ++ unsigned long perf_count_b_overflow : 1; ++ unsigned long : 6; ++ } mc_perf_mon_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_perf_mon_cntl_t f; ++} mc_perf_mon_cntl_u; ++ ++typedef struct _mc_perf_counters_t { ++ unsigned long mc_perf_counter_a : 16; ++ unsigned long mc_perf_counter_b : 16; ++ } mc_perf_counters_t; ++ ++typedef union { ++ unsigned long val : 32; ++ mc_perf_counters_t f; ++} mc_perf_counters_u; ++ ++typedef struct _wait_until_t { ++ unsigned long wait_crtc_pflip : 1; ++ unsigned long wait_re_crtc_vline : 1; ++ unsigned long wait_fe_crtc_vline : 1; ++ unsigned long wait_crtc_vline : 1; ++ unsigned long wait_dma_viph0_idle : 1; ++ unsigned long wait_dma_viph1_idle : 1; ++ unsigned long wait_dma_viph2_idle : 1; ++ unsigned long wait_dma_viph3_idle : 1; ++ unsigned long wait_dma_vid_idle : 1; ++ unsigned long wait_dma_gui_idle : 1; ++ unsigned long wait_cmdfifo : 1; ++ unsigned long wait_ov0_flip : 1; ++ unsigned long wait_ov0_slicedone : 1; ++ unsigned long : 1; ++ unsigned long wait_2d_idle : 1; ++ unsigned long wait_3d_idle : 1; ++ unsigned long wait_2d_idleclean : 1; ++ unsigned long wait_3d_idleclean : 1; ++ unsigned long wait_host_idleclean : 1; ++ unsigned long wait_extern_sig : 1; ++ unsigned long cmdfifo_entries : 7; ++ unsigned long : 3; ++ unsigned long wait_both_crtc_pflip : 1; ++ unsigned long eng_display_select : 1; ++ } wait_until_t; ++ ++typedef union { ++ unsigned long val : 32; ++ wait_until_t f; ++} wait_until_u; ++ ++typedef struct _isync_cntl_t { ++ unsigned long isync_any2d_idle3d : 1; ++ unsigned long isync_any3d_idle2d : 1; ++ unsigned long isync_trig2d_idle3d : 1; ++ unsigned long isync_trig3d_idle2d : 1; ++ unsigned long isync_wait_idlegui : 1; ++ unsigned long isync_cpscratch_idlegui : 1; ++ unsigned long : 26; ++ } isync_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ isync_cntl_t f; ++} isync_cntl_u; ++ ++typedef struct _rbbm_guicntl_t { ++ unsigned long host_data_swap : 2; ++ unsigned long : 30; ++ } rbbm_guicntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_guicntl_t f; ++} rbbm_guicntl_u; ++ ++typedef struct _rbbm_status_t { ++ unsigned long cmdfifo_avail : 7; ++ unsigned long : 1; ++ unsigned long hirq_on_rbb : 1; ++ unsigned long cprq_on_rbb : 1; ++ unsigned long cfrq_on_rbb : 1; ++ unsigned long hirq_in_rtbuf : 1; ++ unsigned long cprq_in_rtbuf : 1; ++ unsigned long cfrq_in_rtbuf : 1; ++ unsigned long cf_pipe_busy : 1; ++ unsigned long eng_ev_busy : 1; ++ unsigned long cp_cmdstrm_busy : 1; ++ unsigned long e2_busy : 1; ++ unsigned long rb2d_busy : 1; ++ unsigned long rb3d_busy : 1; ++ unsigned long se_busy : 1; ++ unsigned long re_busy : 1; ++ unsigned long tam_busy : 1; ++ unsigned long tdm_busy : 1; ++ unsigned long pb_busy : 1; ++ unsigned long : 6; ++ unsigned long gui_active : 1; ++ } rbbm_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_status_t f; ++} rbbm_status_u; ++ ++typedef struct _rbbm_cntl_t { ++ unsigned long rb_settle : 4; ++ unsigned long abortclks_hi : 3; ++ unsigned long : 1; ++ unsigned long abortclks_cp : 3; ++ unsigned long : 1; ++ unsigned long abortclks_cfifo : 3; ++ unsigned long : 2; ++ unsigned long cpq_data_swap : 1; ++ unsigned long : 3; ++ unsigned long no_abort_idct : 1; ++ unsigned long no_abort_bios : 1; ++ unsigned long no_abort_fb : 1; ++ unsigned long no_abort_cp : 1; ++ unsigned long no_abort_hi : 1; ++ unsigned long no_abort_hdp : 1; ++ unsigned long no_abort_mc : 1; ++ unsigned long no_abort_aic : 1; ++ unsigned long no_abort_vip : 1; ++ unsigned long no_abort_disp : 1; ++ unsigned long no_abort_cg : 1; ++ } rbbm_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cntl_t f; ++} rbbm_cntl_u; ++ ++typedef struct _rbbm_soft_reset_t { ++ unsigned long soft_reset_cp : 1; ++ unsigned long soft_reset_hi : 1; ++ unsigned long reserved3 : 3; ++ unsigned long soft_reset_e2 : 1; ++ unsigned long reserved2 : 2; ++ unsigned long soft_reset_mc : 1; ++ unsigned long reserved1 : 2; ++ unsigned long soft_reset_disp : 1; ++ unsigned long soft_reset_cg : 1; ++ unsigned long : 19; ++ } rbbm_soft_reset_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_soft_reset_t f; ++} rbbm_soft_reset_u; ++ ++typedef struct _nqwait_until_t { ++ unsigned long wait_gui_idle : 1; ++ unsigned long : 31; ++ } nqwait_until_t; ++ ++typedef union { ++ unsigned long val : 32; ++ nqwait_until_t f; ++} nqwait_until_u; ++ ++typedef struct _rbbm_debug_t { ++ unsigned long rbbm_debug : 32; ++ } rbbm_debug_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_debug_t f; ++} rbbm_debug_u; ++ ++typedef struct _rbbm_cmdfifo_addr_t { ++ unsigned long cmdfifo_addr : 6; ++ unsigned long : 26; ++ } rbbm_cmdfifo_addr_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_addr_t f; ++} rbbm_cmdfifo_addr_u; ++ ++typedef struct _rbbm_cmdfifo_datal_t { ++ unsigned long cmdfifo_datal : 32; ++ } rbbm_cmdfifo_datal_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_datal_t f; ++} rbbm_cmdfifo_datal_u; ++ ++typedef struct _rbbm_cmdfifo_datah_t { ++ unsigned long cmdfifo_datah : 12; ++ unsigned long : 20; ++ } rbbm_cmdfifo_datah_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_datah_t f; ++} rbbm_cmdfifo_datah_u; ++ ++typedef struct _rbbm_cmdfifo_stat_t { ++ unsigned long cmdfifo_rptr : 6; ++ unsigned long : 2; ++ unsigned long cmdfifo_wptr : 6; ++ unsigned long : 18; ++ } rbbm_cmdfifo_stat_t; ++ ++typedef union { ++ unsigned long val : 32; ++ rbbm_cmdfifo_stat_t f; ++} rbbm_cmdfifo_stat_u; ++ ++typedef struct _clk_pin_cntl_t { ++ unsigned long osc_en : 1; ++ unsigned long osc_gain : 5; ++ unsigned long dont_use_xtalin : 1; ++ unsigned long xtalin_pm_en : 1; ++ unsigned long xtalin_dbl_en : 1; ++ unsigned long : 7; ++ unsigned long cg_debug : 16; ++ } clk_pin_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clk_pin_cntl_t f; ++} clk_pin_cntl_u; ++ ++typedef struct _pll_ref_fb_div_t { ++ unsigned long pll_ref_div : 4; ++ unsigned long : 4; ++ unsigned long pll_fb_div_int : 6; ++ unsigned long : 2; ++ unsigned long pll_fb_div_frac : 3; ++ unsigned long : 1; ++ unsigned long pll_reset_time : 4; ++ unsigned long pll_lock_time : 8; ++ } pll_ref_fb_div_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pll_ref_fb_div_t f; ++} pll_ref_fb_div_u; ++ ++typedef struct _pll_cntl_t { ++ unsigned long pll_pwdn : 1; ++ unsigned long pll_reset : 1; ++ unsigned long pll_pm_en : 1; ++ unsigned long pll_mode : 1; ++ unsigned long pll_refclk_sel : 1; ++ unsigned long pll_fbclk_sel : 1; ++ unsigned long pll_tcpoff : 1; ++ unsigned long pll_pcp : 3; ++ unsigned long pll_pvg : 3; ++ unsigned long pll_vcofr : 1; ++ unsigned long pll_ioffset : 2; ++ unsigned long pll_pecc_mode : 2; ++ unsigned long pll_pecc_scon : 2; ++ unsigned long pll_dactal : 4; ++ unsigned long pll_cp_clip : 2; ++ unsigned long pll_conf : 3; ++ unsigned long pll_mbctrl : 2; ++ unsigned long pll_ring_off : 1; ++ } pll_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pll_cntl_t f; ++} pll_cntl_u; ++ ++typedef struct _sclk_cntl_t { ++ unsigned long sclk_src_sel : 2; ++ unsigned long : 2; ++ unsigned long sclk_post_div_fast : 4; ++ unsigned long sclk_clkon_hys : 3; ++ unsigned long sclk_post_div_slow : 4; ++ unsigned long disp_cg_ok2switch_en : 1; ++ unsigned long sclk_force_reg : 1; ++ unsigned long sclk_force_disp : 1; ++ unsigned long sclk_force_mc : 1; ++ unsigned long sclk_force_extmc : 1; ++ unsigned long sclk_force_cp : 1; ++ unsigned long sclk_force_e2 : 1; ++ unsigned long sclk_force_e3 : 1; ++ unsigned long sclk_force_idct : 1; ++ unsigned long sclk_force_bist : 1; ++ unsigned long busy_extend_cp : 1; ++ unsigned long busy_extend_e2 : 1; ++ unsigned long busy_extend_e3 : 1; ++ unsigned long busy_extend_idct : 1; ++ unsigned long : 3; ++ } sclk_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ sclk_cntl_t f; ++} sclk_cntl_u; ++ ++typedef struct _pclk_cntl_t { ++ unsigned long pclk_src_sel : 2; ++ unsigned long : 2; ++ unsigned long pclk_post_div : 4; ++ unsigned long : 8; ++ unsigned long pclk_force_disp : 1; ++ unsigned long : 15; ++ } pclk_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pclk_cntl_t f; ++} pclk_cntl_u; ++ ++typedef struct _clk_test_cntl_t { ++ unsigned long testclk_sel : 4; ++ unsigned long : 3; ++ unsigned long start_check_freq : 1; ++ unsigned long tstcount_rst : 1; ++ unsigned long : 15; ++ unsigned long test_count : 8; ++ } clk_test_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ clk_test_cntl_t f; ++} clk_test_cntl_u; ++ ++typedef struct _pwrmgt_cntl_t { ++ unsigned long pwm_enable : 1; ++ unsigned long : 1; ++ unsigned long pwm_mode_req : 2; ++ unsigned long pwm_wakeup_cond : 2; ++ unsigned long pwm_fast_noml_hw_en : 1; ++ unsigned long pwm_noml_fast_hw_en : 1; ++ unsigned long pwm_fast_noml_cond : 4; ++ unsigned long pwm_noml_fast_cond : 4; ++ unsigned long pwm_idle_timer : 8; ++ unsigned long pwm_busy_timer : 8; ++ } pwrmgt_cntl_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pwrmgt_cntl_t f; ++} pwrmgt_cntl_u; ++ ++typedef struct _pwrmgt_status_t { ++ unsigned long pwm_mode : 2; ++ unsigned long : 30; ++ } pwrmgt_status_t; ++ ++typedef union { ++ unsigned long val : 32; ++ pwrmgt_status_t f; ++} pwrmgt_status_u; ++ ++ ++#endif //_W100_REGS_H_ +Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/Makefile.am +=================================================================== +--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/Makefile.am 2006-09-02 11:47:21.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/hw/kdrive/Makefile.am 2006-09-02 11:47:21.000000000 +0200 +@@ -7,6 +7,10 @@ + FBDEV_SUBDIRS = fbdev epson + endif + ++if KDRIVEW100 ++W100_SUBDIRS = w100 ++endif ++ + if XSDLSERVER + XSDL_SUBDIRS = sdl + endif +@@ -20,6 +24,7 @@ + linux \ + $(XSDL_SUBDIRS) \ + $(FBDEV_SUBDIRS) \ ++ $(W100_SUBDIRS) \ + $(VESA_SUBDIRS) \ + $(XEPHYR_SUBDIRS) \ + fake +Index: xorg-server-X11R7.1-1.1.0/configure.ac +=================================================================== +--- xorg-server-X11R7.1-1.1.0.orig/configure.ac 2006-09-02 11:47:21.000000000 +0200 ++++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-09-02 11:51:56.000000000 +0200 +@@ -434,6 +434,7 @@ + AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) + AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) + AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) ++AC_ARG_ENABLE(w100, AS_HELP_STRING([--enable-w100], [Build the kdrive Xw100 server (default: no)]), [KDRIVEW100=$enableval], [KDRIVEW100=no]) + dnl xprint + AC_ARG_ENABLE(freetype, AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no]) + AC_ARG_WITH(freetype-config, AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto) +@@ -1497,6 +1498,10 @@ + AC_SUBST([XSDL_LIBS]) + AC_SUBST([XSDL_INCS]) + ++AM_CONDITIONAL(KDRIVEW100, [test "x$KDRIVEW100" = xyes]) ++if test "x$KDRIVEW100" = xyes; then ++ AC_DEFINE(KDRIVEW100, 1, [Build Xw100 server]) ++fi + + dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers) + AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) +@@ -1739,6 +1744,7 @@ + hw/kdrive/epson/Makefile + hw/kdrive/fake/Makefile + hw/kdrive/fbdev/Makefile ++hw/kdrive/w100/Makefile + hw/kdrive/i810/Makefile + hw/kdrive/linux/Makefile + hw/kdrive/mach64/Makefile diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 78b4054232..7ba53b7a73 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -1,18 +1,19 @@ LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" -PR = "r2" +PR = "r3" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, w100 version" FILES_${PN} += "${libdir}/xserver/SecurityPolicy" @@ -21,12 +22,14 @@ FILES_xserver-kdrive-fake = "${bindir}/Xfake" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" RDEPENDS_xserver-kdrive-fbdev = "${PN}" RDEPENDS_xserver-kdrive-fake = "${PN}" RDEPENDS_xserver-kdrive-xephyr = "${PN}" RDEPENDS_xserver-kdrive-epson = "${PN}" RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.tar.bz2 \ file://kmode.patch;patch=1 \ @@ -39,6 +42,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ file://disable-xf86-dga-xorgcfg.patch;patch=1 \ + file://w100.patch;patch=1 \ file://enable-tslib.patch;patch=1 \ file://xcalibrate.patch;patch=1" @@ -56,7 +60,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx \ + --disable-dmx --enable-w100 \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index bffcc4cdee..5fb8d10822 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,21 +1,22 @@ PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" -PR = "r4" +PR = "r5" LICENSE = "MIT" DEPENDS = "tslib virtual/libsdl libxkbfile xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto libxcalibrate recordproto videoproto scrnsaverproto" PROVIDES = "virtual/xserver" RPROVIDES = "virtual/xserver" -PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale" +PACKAGES =+ "xserver-kdrive-fbdev xserver-kdrive-sdl xserver-kdrive-fake xserver-kdrive-xephyr xserver-kdrive-epson xserver-kdrive-w100 ${PN}-doc ${PN}-dev ${PN}-locale" SECTION = "x11/base" DESCRIPTION = "X server from freedesktop.org" DESCRIPTION_xserver-kdrive-fbdev = "X server from freedesktop.org, supporting generic framebuffer devices" DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" -DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, w100 version" FILES_${PN} += "${libdir}/xserver/SecurityPolicy" @@ -24,12 +25,14 @@ FILES_xserver-kdrive-fake = "${bindir}/Xfake" FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr" FILES_xserver-kdrive-epson = "${bindir}/Xepson" FILES_xserver-kdrive-sdl = "${bindir}/Xsdl" +FILES_xserver-kdrive-w100 = "${bindir}/Xw100" RDEPENDS_xserver-kdrive-fbdev = "${PN}" RDEPENDS_xserver-kdrive-fake = "${PN}" RDEPENDS_xserver-kdrive-xephyr = "${PN}" RDEPENDS_xserver-kdrive-epson = "${PN}" RDEPENDS_xserver-kdrive-sdl = "${PN}" +RDEPENDS_xserver-kdrive-w100 = "${PN}" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://kmode.patch;patch=1 \ @@ -42,6 +45,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://optional-xkb.patch;patch=1 \ file://enable-epson.patch;patch=1 \ file://disable-xf86-dga-xorgcfg-git.patch;patch=1 \ + file://w100.patch;patch=1 \ " SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -58,7 +62,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx \ + --disable-dmx --enable-w100 \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 1889b0da866ccdf181791654958f8f0b593f0eb0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Sep 2006 11:03:51 +0000 Subject: imlib: add 1.9.15 --- packages/imlib/.mtn2git_empty | 0 packages/imlib/files/.mtn2git_empty | 0 packages/imlib/files/configure.patch | 31 +++++++++++++++++++++++++++++++ packages/imlib/imlib_1.9.15.bb | 20 ++++++++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 packages/imlib/.mtn2git_empty create mode 100644 packages/imlib/files/.mtn2git_empty create mode 100644 packages/imlib/files/configure.patch create mode 100644 packages/imlib/imlib_1.9.15.bb (limited to 'packages') diff --git a/packages/imlib/.mtn2git_empty b/packages/imlib/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/imlib/files/.mtn2git_empty b/packages/imlib/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/imlib/files/configure.patch b/packages/imlib/files/configure.patch new file mode 100644 index 0000000000..90879c15ee --- /dev/null +++ b/packages/imlib/files/configure.patch @@ -0,0 +1,31 @@ +--- /tmp/configure.in 2006-09-02 12:44:16.000000000 +0200 ++++ imlib-1.9.15/configure.in 2006-09-02 12:44:22.975780000 +0200 +@@ -43,19 +43,6 @@ + oCFLAGS="$CFLAGS" + LIBS="$LIBS `glib-config --libs gmodule`" + CFLAGS="$CFLAGS `glib-config --cflags gmodule`" +- AC_TRY_RUN([ +-#include +-#include +-main () +-{ +- if (g_module_supported ()) +- exit (0); +- else +- exit (1); +-} +-], dynworks=true) +- LIBS="$oLIBS" +- CFLAGS="$oCFLAGS" + fi + + dnl Now we check to see if our libtool supports shared lib deps +@@ -141,7 +128,7 @@ + fi + AC_SUBST(GX_LIBS) + +-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include" ++CPPFLAGS="$CPPFLAGS" + + SUPPORT_LIBS="" + diff --git a/packages/imlib/imlib_1.9.15.bb b/packages/imlib/imlib_1.9.15.bb new file mode 100644 index 0000000000..da96736958 --- /dev/null +++ b/packages/imlib/imlib_1.9.15.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Image loading library" +LICENSE = "GPLv2" +DEPENDS = "gtk+-1.2 jpeg tiff libpng libungif" + +inherit gnome binconfig + +SRC_URI += "file://configure.patch;patch=1" + +EXTRA_OECONF = " --enable-modules \ + --disable-gtktest \ + ac_cv_dynworks=true \ + " + +do_stage() { + install -m 644 Imlib/*.h ${STAGING_INCDIR} + install -m 644 gdk_imlib/*.h ${STAGING_INCDIR} + oe_libinstall -a -so -C Imlib libImlib ${STAGING_LIBDIR} + oe_libinstall -a -so -C gdk_imlib libgdk_imlib ${STAGING_LIBDIR} +} + -- cgit v1.2.3 From 887642656edc1a144139e805ea22376000ad016e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Sep 2006 11:24:19 +0000 Subject: qiv: add 1.9 --- packages/qiv/.mtn2git_empty | 0 packages/qiv/files/.mtn2git_empty | 0 packages/qiv/files/makefile.patch | 22 ++++++++++++++++++++++ packages/qiv/qiv_1.9.bb | 16 ++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 packages/qiv/.mtn2git_empty create mode 100644 packages/qiv/files/.mtn2git_empty create mode 100644 packages/qiv/files/makefile.patch create mode 100644 packages/qiv/qiv_1.9.bb (limited to 'packages') diff --git a/packages/qiv/.mtn2git_empty b/packages/qiv/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qiv/files/.mtn2git_empty b/packages/qiv/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qiv/files/makefile.patch b/packages/qiv/files/makefile.patch new file mode 100644 index 0000000000..42707be9b9 --- /dev/null +++ b/packages/qiv/files/makefile.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile 2006-09-02 13:04:25.000000000 +0200 ++++ qiv-1.9/Makefile 2006-09-02 13:05:05.255780000 +0200 +@@ -4,7 +4,7 @@ + ###################################################################### + + # Directory where qiv will be installed under. +-PREFIX = /usr/local ++PREFIX = /usr/ + + # Font to use for statusbar in fullscreen mode + STATUSBAR_FONT = "fixed" +@@ -53,10 +53,6 @@ + # Do not edit below here! + ###################################################################### + +-CC = gcc +-CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \ +- -fcaller-saves -ffast-math -fno-strength-reduce \ +- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN + + INCLUDES = `imlib-config --cflags-gdk` + LIBS = `imlib-config --libs-gdk` diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb new file mode 100644 index 0000000000..f6e96adddb --- /dev/null +++ b/packages/qiv/qiv_1.9.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Qiv is a very small and pretty fast gdk/Imlib image viewer." +LICENSE = "GPLv2" + +DEPENDS = "gtk+-1.2 imlib" + +SRC_URI = "http://www.klografx.net/qiv/download/qiv-1.9-src.tgz \ + file://makefile.patch;patch=1 \ + " +inherit pkgconfig binconfig + +CFLAGS += " -lSM -lICE -lXdmcp" + +do_install() { + install -s -m 0755 qiv ${D}${bindir}/qiv + install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 +} -- cgit v1.2.3 From 661fd8d6ae89b7a4f963f57ccd2d9a404653c467 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Sep 2006 11:25:01 +0000 Subject: xserver-kdrive: git build fix, better w100 description --- packages/xorg-xserver/xserver-kdrive/w100.patch | 73 +++++++++++----------- .../xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 2 +- packages/xorg-xserver/xserver-kdrive_git.bb | 2 +- 3 files changed, 40 insertions(+), 37 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive/w100.patch b/packages/xorg-xserver/xserver-kdrive/w100.patch index 2ff1639b9a..9a20fa1f1e 100644 --- a/packages/xorg-xserver/xserver-kdrive/w100.patch +++ b/packages/xorg-xserver/xserver-kdrive/w100.patch @@ -1,7 +1,7 @@ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.c +Index: git/hw/kdrive/w100/ati.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,434 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -437,10 +437,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.c + ATIGetColors, /* getColors */ + ATIPutColors, /* putColors */ +}; -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_cursor.c +Index: git/hw/kdrive/w100/ati_cursor.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_cursor.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_cursor.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,93 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -535,10 +535,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_cursor.c +ATICursorFini(ScreenPtr pScreen) +{ +} -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.c +Index: git/hw/kdrive/w100/ati_dma.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_dma.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,333 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -873,10 +873,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.c + atis->ring_write &= atis->ring_mask; + MMIO_OUT32(mmio, mmCP_RB_WPTR, atis->ring_write); +} -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.h +Index: git/hw/kdrive/w100/ati_dma.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.h 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_dma.h 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,176 @@ +/* + * Copyright © 2004 Eric Anholt @@ -1054,10 +1054,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_dma.h +inline void +ATIWaitAvailMMIO(ATIScreenInfo *atis, int n); +#endif /* _ATI_DMA_H_ */ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.c +Index: git/hw/kdrive/w100/ati_draw.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_draw.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,477 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -1536,10 +1536,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.c +{ + kaaDrawFini(pScreen); +} -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.h +Index: git/hw/kdrive/w100/ati_draw.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.h 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_draw.h 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,107 @@ +/* + * Copyright © 2004 Eric Anholt @@ -1648,10 +1648,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_draw.h +#endif /* USE_DMA */ + +#endif /* _ATI_DRAW_H_ */ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.h +Index: git/hw/kdrive/w100/ati.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.h 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati.h 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,256 @@ +/* + * $Id: ati.h,v 1.18 2005-06-10 02:14:44 anholt Exp $ @@ -1909,10 +1909,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati.h +extern KdCardFuncs ATIFuncs; + +#endif /* _ATI_H_ */ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_microcode.c +Index: git/hw/kdrive/w100/ati_microcode.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_microcode.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_microcode.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,412 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -2326,10 +2326,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_microcode.c + , + {0x00000000, 0x00000000} +}; -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_stub.c +Index: git/hw/kdrive/w100/ati_stub.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_stub.c 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/ati_stub.c 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,103 @@ +/* + * Copyright © 2006 Alberto Mardegan @@ -2434,11 +2434,11 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/ati_stub.c + + return ret; +} -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/Makefile.am +Index: git/hw/kdrive/w100/Makefile.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/Makefile.am 2006-09-02 11:47:21.000000000 +0200 -@@ -0,0 +1,53 @@ ++++ git/hw/kdrive/w100/Makefile.am 2006-09-02 12:42:38.000000000 +0200 +@@ -0,0 +1,56 @@ +if KDRIVEFBDEV +FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev +FBDEV_LIBS = $(top_builddir)/hw/kdrive/fbdev/libfbdev.a @@ -2491,11 +2491,14 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/Makefile.am + $(TSLIB_FLAG) + + -+Xw100_DEPENDENCIES = $(W100_LIBS) @KDRIVE_LIBS@ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_const.h ++Xw100_DEPENDENCIES = \ ++ libw100.a \ ++ $(FBDEV_LIBS) \ ++ $(VESA_LIBS) +Index: git/hw/kdrive/w100/w100_const.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_const.h 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/w100_const.h 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,25 @@ +#define CSQ_CNTL_MODE_FREERUN 0x8 + @@ -2522,10 +2525,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_const.h +#define W100_CCE_PACKET3_PAINT_MULTI 0xc0001a00 +#define W100_CCE_PACKET3_BITBLT_MULTI 0xc0001b00 + -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_regs.h +Index: git/hw/kdrive/w100/w100_regs.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_regs.h 2006-09-02 11:47:21.000000000 +0200 ++++ git/hw/kdrive/w100/w100_regs.h 2006-09-02 12:12:14.000000000 +0200 @@ -0,0 +1,3802 @@ +#ifndef _W100_REGS_H_ +#define _W100_REGS_H_ @@ -6329,10 +6332,10 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/w100/w100_regs.h + + +#endif //_W100_REGS_H_ -Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/Makefile.am +Index: git/hw/kdrive/Makefile.am =================================================================== ---- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/Makefile.am 2006-09-02 11:47:21.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/Makefile.am 2006-09-02 11:47:21.000000000 +0200 +--- git.orig/hw/kdrive/Makefile.am 2006-09-02 12:12:13.000000000 +0200 ++++ git/hw/kdrive/Makefile.am 2006-09-02 12:12:14.000000000 +0200 @@ -7,6 +7,10 @@ FBDEV_SUBDIRS = fbdev epson endif @@ -6352,11 +6355,11 @@ Index: xorg-server-X11R7.1-1.1.0/hw/kdrive/Makefile.am $(VESA_SUBDIRS) \ $(XEPHYR_SUBDIRS) \ fake -Index: xorg-server-X11R7.1-1.1.0/configure.ac +Index: git/configure.ac =================================================================== ---- xorg-server-X11R7.1-1.1.0.orig/configure.ac 2006-09-02 11:47:21.000000000 +0200 -+++ xorg-server-X11R7.1-1.1.0/configure.ac 2006-09-02 11:51:56.000000000 +0200 -@@ -434,6 +434,7 @@ +--- git.orig/configure.ac 2006-09-02 12:12:14.000000000 +0200 ++++ git/configure.ac 2006-09-02 12:12:14.000000000 +0200 +@@ -442,6 +442,7 @@ AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) AC_ARG_ENABLE(xsdl, AS_HELP_STRING([--enable-xsdl], [Build the kdrive Xsdl server (default: auto)]), [XSDL=$enableval], [XSDL=auto]) @@ -6364,7 +6367,7 @@ Index: xorg-server-X11R7.1-1.1.0/configure.ac dnl xprint AC_ARG_ENABLE(freetype, AS_HELP_STRING([ --enable-freetype], [Build Xprint FreeType backend (default: yes)]), [XP_USE_FREETYPE=$enableval],[XP_USE_FREETYPE=no]) AC_ARG_WITH(freetype-config, AS_HELP_STRING([ --with-freetype-config=PROG], [Use FreeType configuration program PROG (default: auto)]), freetype_config=$withval, freetype_config=auto) -@@ -1497,6 +1498,10 @@ +@@ -1519,6 +1520,10 @@ AC_SUBST([XSDL_LIBS]) AC_SUBST([XSDL_INCS]) @@ -6375,7 +6378,7 @@ Index: xorg-server-X11R7.1-1.1.0/configure.ac dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers) AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) -@@ -1739,6 +1744,7 @@ +@@ -1753,6 +1758,7 @@ hw/kdrive/epson/Makefile hw/kdrive/fake/Makefile hw/kdrive/fbdev/Makefile diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index 7ba53b7a73..47225ff5b0 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -13,7 +13,7 @@ DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, w100 version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" FILES_${PN} += "${libdir}/xserver/SecurityPolicy" diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 5fb8d10822..96364c09d8 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -16,7 +16,7 @@ DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Epson S1D13806 devices" DESCRIPTION_xserver-kdrive-sdl = "X server from freedesktop.org, SDL version" -DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, w100 version" +DESCRIPTION_xserver-kdrive-w100 = "X server from freedesktop.org, supporting the ATI imageon w100 chipset" FILES_${PN} += "${libdir}/xserver/SecurityPolicy" -- cgit v1.2.3 From 703f0544e914ff348fe794b7df21fe9ce512d796 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Sep 2006 11:30:26 +0000 Subject: wxbase cvs: fix SRC_URI --- packages/wxbase/wxbase_2.7+cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb index a813788eee..05aeb6c08e 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxbase/wxbase_2.7+cvs.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" DEPENDS = "jpeg libpng zlib" -SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/wx-cvs-Gtk.tar.bz2" +SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2" #SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2" S = "${WORKDIR}/wxGTK" -- cgit v1.2.3 From 8f2755bcfe2318ab67491d2611c500ecc3609a6b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Sep 2006 11:55:53 +0000 Subject: openntpd: don't pickup unwanted ssl libs, closes #1378 --- packages/openntpd/openntpd_3.7p1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index 43c419ae24..6649361fd4 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik " DEPENDS = "timezones" -PR="r11" +PR="r12" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -23,7 +23,10 @@ inherit autotools update-rc.d EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ --sysconfdir=/etc --with-privsep-path=/${localstatedir}/shared/empty \ - --with-privsep-user=ntpd" + --with-privsep-user=ntpd \ + --with-builtin-arc4random \ + --without-ssl-dir \ + " do_install_prepend() { install -d ${D}${sysconfdir}/init.d -- cgit v1.2.3 From 115fb071f3b122307a4599902f6ab195b69ac6d2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Sep 2006 12:01:47 +0000 Subject: nfs-utils: fix #1378 and fix RDEPENDS on a kernel-module * NEVER (R)DEPEND on a kernel-module, since those can be built-in, use RRECOMMENDS instead --- packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch | 18 ++++++++++++++++++ packages/nfs-utils/nfs-utils_1.0.6.bb | 8 +++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch (limited to 'packages') diff --git a/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch b/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch new file mode 100644 index 0000000000..ebd3276be2 --- /dev/null +++ b/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch @@ -0,0 +1,18 @@ +--- ./support/nfs/svc_socket.c.orig 2004-12-12 06:43:52.000000000 +0000 ++++ ./support/nfs/svc_socket.c 2004-12-12 06:50:04.000000000 +0000 +@@ -66,6 +66,7 @@ + __bzero ((char *) &addr, sizeof (addr)); + addr.sin_family = AF_INET; + ++#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ + ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata, + &rpcp); + if (ret == 0 && rpcp != NULL) +@@ -99,6 +100,7 @@ + } + } + else ++#endif + { + if (bindresvport (sock, &addr)) + { diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index 4f5e64b352..076ef4cff1 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -3,12 +3,13 @@ PRIORITY = "optional" SECTION = "console/network" MAINTAINER = "dyoung " LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ file://rpcgen-lossage.patch;patch=1 \ file://stat-include.patch;patch=1 \ + file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" @@ -16,9 +17,10 @@ S = ${WORKDIR}/nfs-utils-${PV}/ PARALLEL_MAKE = "" -# Only kernel-module-nfsd is required here - the nfsd module will +# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. -RDEPENDS = "portmap kernel-module-nfsd" +RDEPENDS = "portmap" +RRECOMMENDS = "kernel-module-nfsd" INITSCRIPT_NAME = "nfsserver" # The server has no dependencies at the user run levels, so just put -- cgit v1.2.3 From 774c7e10391a462b905f9d0f776878d373d4fd1b Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Sep 2006 12:06:31 +0000 Subject: xserver-common: move recipes back into their own dir, xserver-common is not part of xorg --- packages/xorg-xserver/xserver-common_1.10.bb | 19 ------------------- packages/xorg-xserver/xserver-common_1.3.bb | 12 ------------ packages/xorg-xserver/xserver-common_1.8.bb | 18 ------------------ packages/xorg-xserver/xserver-common_1.9.bb | 19 ------------------- packages/xserver-common/.mtn2git_empty | 0 packages/xserver-common/xserver-common_1.10.bb | 19 +++++++++++++++++++ packages/xserver-common/xserver-common_1.3.bb | 12 ++++++++++++ packages/xserver-common/xserver-common_1.8.bb | 18 ++++++++++++++++++ packages/xserver-common/xserver-common_1.9.bb | 19 +++++++++++++++++++ 9 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-common_1.10.bb delete mode 100644 packages/xorg-xserver/xserver-common_1.3.bb delete mode 100644 packages/xorg-xserver/xserver-common_1.8.bb delete mode 100644 packages/xorg-xserver/xserver-common_1.9.bb create mode 100644 packages/xserver-common/.mtn2git_empty create mode 100644 packages/xserver-common/xserver-common_1.10.bb create mode 100644 packages/xserver-common/xserver-common_1.3.bb create mode 100644 packages/xserver-common/xserver-common_1.8.bb create mode 100644 packages/xserver-common/xserver-common_1.9.bb (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-common_1.10.bb b/packages/xorg-xserver/xserver-common_1.10.bb deleted file mode 100644 index de81537f99..0000000000 --- a/packages/xorg-xserver/xserver-common_1.10.bb +++ /dev/null @@ -1,19 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xorg-xserver/xserver-common_1.3.bb b/packages/xorg-xserver/xserver-common_1.3.bb deleted file mode 100644 index ea3fab6654..0000000000 --- a/packages/xorg-xserver/xserver-common_1.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - diff --git a/packages/xorg-xserver/xserver-common_1.8.bb b/packages/xorg-xserver/xserver-common_1.8.bb deleted file mode 100644 index b7b3f554f3..0000000000 --- a/packages/xorg-xserver/xserver-common_1.8.bb +++ /dev/null @@ -1,18 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r2" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xorg-xserver/xserver-common_1.9.bb b/packages/xorg-xserver/xserver-common_1.9.bb deleted file mode 100644 index de81537f99..0000000000 --- a/packages/xorg-xserver/xserver-common_1.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -MAINTAINER = "Florian Boor " -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/.mtn2git_empty b/packages/xserver-common/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb new file mode 100644 index 0000000000..de81537f99 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.10.bb @@ -0,0 +1,19 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1 \ + file://poodle-xmodmap-2.6.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb new file mode 100644 index 0000000000..ea3fab6654 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.3.bb @@ -0,0 +1,12 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb new file mode 100644 index 0000000000..b7b3f554f3 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.8.bb @@ -0,0 +1,18 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r2" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb new file mode 100644 index 0000000000..de81537f99 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.9.bb @@ -0,0 +1,19 @@ +MAINTAINER = "Florian Boor " +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" +PR = "r1" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh \ + file://calibrate_zaurusd.patch;patch=1 \ + file://poodle-xmodmap-2.6.patch;patch=1" + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} -- cgit v1.2.3 From f317b85a70280478bdd281cacafcaf2cda1fc81f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Sep 2006 12:12:11 +0000 Subject: xserver-common: move patches back into their own dir, xserver-common is not part of xorg --- packages/xorg-xserver/files/.mtn2git_empty | 0 .../xorg-xserver/files/calibrate_zaurusd.patch | 12 --- .../xorg-xserver/files/poodle-xmodmap-2.6.patch | 42 ---------- packages/xorg-xserver/files/setDPI.sh | 92 ---------------------- packages/xserver-common/files/.mtn2git_empty | 0 .../xserver-common/files/calibrate_zaurusd.patch | 12 +++ .../xserver-common/files/poodle-xmodmap-2.6.patch | 42 ++++++++++ packages/xserver-common/files/setDPI.sh | 92 ++++++++++++++++++++++ 8 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 packages/xorg-xserver/files/.mtn2git_empty delete mode 100644 packages/xorg-xserver/files/calibrate_zaurusd.patch delete mode 100644 packages/xorg-xserver/files/poodle-xmodmap-2.6.patch delete mode 100644 packages/xorg-xserver/files/setDPI.sh create mode 100644 packages/xserver-common/files/.mtn2git_empty create mode 100644 packages/xserver-common/files/calibrate_zaurusd.patch create mode 100644 packages/xserver-common/files/poodle-xmodmap-2.6.patch create mode 100644 packages/xserver-common/files/setDPI.sh (limited to 'packages') diff --git a/packages/xorg-xserver/files/.mtn2git_empty b/packages/xorg-xserver/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xorg-xserver/files/calibrate_zaurusd.patch b/packages/xorg-xserver/files/calibrate_zaurusd.patch deleted file mode 100644 index 6a7e3b02b7..0000000000 --- a/packages/xorg-xserver/files/calibrate_zaurusd.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200 -+++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200 -@@ -2,4 +2,9 @@ - - if [ ! -f /etc/pointercal ]; then - /usr/bin/run-calibrate.sh -+ -+ if [ -x /etc/init.d/zaurusd ]; then -+ /etc/init.d/zaurusd stop -+ /etc/init.d/zaurusd start -+ fi - fi diff --git a/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch b/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch deleted file mode 100644 index 73cf3f6ffb..0000000000 --- a/packages/xorg-xserver/files/poodle-xmodmap-2.6.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap ---- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200 -+++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200 -@@ -9,6 +9,9 @@ - "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") - xmodmap - < /etc/X11/slcXXXX.xmodmap - ;; -+ "SHARP Poodle") -+ xmodmap - < /etc/X11/poodle.xmodmap -+ ;; - "Sharp-Collie") - xmodmap - < /etc/X11/collie.xmodmap - ;; -diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap ---- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100 -+++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200 -@@ -0,0 +1,25 @@ -+keycode 37 = Control_L -+keycode 64 = Alt_L -+ -+ -+keycode 50 = Shift_L -+keycode 62 = Shift_R -+keycode 75 = Mode_switch -+ -+ -+ -+clear control -+clear shift -+clear lock -+clear mod4 -+clear mod1 -+ -+add control = Control_L -+add shift = Shift_L Shift_R -+add lock = Caps_Lock -+ -+! This is AltGr -+add mod4 = Mode_switch -+ -+add mod1 = Alt_L -+ diff --git a/packages/xorg-xserver/files/setDPI.sh b/packages/xorg-xserver/files/setDPI.sh deleted file mode 100644 index 04a2edd6c6..0000000000 --- a/packages/xorg-xserver/files/setDPI.sh +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: setDPI.sh -# Date: 09-Apr-06 - -# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size -# setting of 7 can be used on all machines. - - -XDEFAULTS="/etc/X11/Xdefaults" - - - -set_dpi() { - - CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" - - if test "$CURRENT_SETTING" != "$1" - then - echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" - - if grep -q "Xft.dpi" "$XDEFAULTS" - then - cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" - mv "${XDEFAULTS}_" "${XDEFAULTS}" - else - echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" - fi - else - echo "Your $SCREEN_DPI DPI screen is already configured." - fi -} - -set_rxvt_font() { - - CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" - - if test "$1" -gt 100 - then - - # Configure the rxvt font-size for your screen here: - test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 - - if test -z "$RXVT_FONT_SIZE" - then - echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" - echo "Defaulting to size 9" - RXVT_FONT_SIZE=9 - fi - - if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" - then - echo "Using a rxvt font-size of $RXVT_FONT_SIZE" - cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ - mv ${XDEFAULTS}_ ${XDEFAULTS} - else - echo "The rxvt font-size is already configured" - fi - fi -} - -if test -z "$DISPLAY" -then - echo "DISPLAY is not set, aborting..." - exit 0 -fi - -SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" - -if test -z "$SCREEN_DPI" -then - echo "WARNING: Couldn't read your screens DPI, defaulting to 100" - SCREEN_DPI=100 -fi - -# Configure your screen here: -test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 -test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 - - -if test -z "$SET_SCREEN_DPI" -then - echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" - echo "Using 100 DPI" - SET_SCREEN_DPI=100 -fi - -set_dpi "$SET_SCREEN_DPI" -set_rxvt_font "$SCREEN_DPI" diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xserver-common/files/calibrate_zaurusd.patch b/packages/xserver-common/files/calibrate_zaurusd.patch new file mode 100644 index 0000000000..6a7e3b02b7 --- /dev/null +++ b/packages/xserver-common/files/calibrate_zaurusd.patch @@ -0,0 +1,12 @@ +--- xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate.orig 2006-04-09 15:12:16.167950472 +0200 ++++ xserver-common-1.8/X11/Xinit.d/30xTs_Calibrate 2006-04-09 15:14:51.511334688 +0200 +@@ -2,4 +2,9 @@ + + if [ ! -f /etc/pointercal ]; then + /usr/bin/run-calibrate.sh ++ ++ if [ -x /etc/init.d/zaurusd ]; then ++ /etc/init.d/zaurusd stop ++ /etc/init.d/zaurusd start ++ fi + fi diff --git a/packages/xserver-common/files/poodle-xmodmap-2.6.patch b/packages/xserver-common/files/poodle-xmodmap-2.6.patch new file mode 100644 index 0000000000..73cf3f6ffb --- /dev/null +++ b/packages/xserver-common/files/poodle-xmodmap-2.6.patch @@ -0,0 +1,42 @@ +diff -Nur xserver-common-1.8.orig/X11/Xinit.d/12keymap xserver-common-1.8/X11/Xinit.d/12keymap +--- xserver-common-1.8.orig/X11/Xinit.d/12keymap 2006-05-17 12:02:52.645201000 +0200 ++++ xserver-common-1.8/X11/Xinit.d/12keymap 2006-05-17 12:03:49.401573648 +0200 +@@ -9,6 +9,9 @@ + "SHARP Akita" | "SHARP Borzoi" | "SHARP Spitz") + xmodmap - < /etc/X11/slcXXXX.xmodmap + ;; ++ "SHARP Poodle") ++ xmodmap - < /etc/X11/poodle.xmodmap ++ ;; + "Sharp-Collie") + xmodmap - < /etc/X11/collie.xmodmap + ;; +diff -Nur xserver-common-1.8.orig/X11/poodle.xmodmap xserver-common-1.8/X11/poodle.xmodmap +--- xserver-common-1.8.orig/X11/poodle.xmodmap 1970-01-01 01:00:00.000000000 +0100 ++++ xserver-common-1.8/X11/poodle.xmodmap 2006-05-18 13:42:45.711264920 +0200 +@@ -0,0 +1,25 @@ ++keycode 37 = Control_L ++keycode 64 = Alt_L ++ ++ ++keycode 50 = Shift_L ++keycode 62 = Shift_R ++keycode 75 = Mode_switch ++ ++ ++ ++clear control ++clear shift ++clear lock ++clear mod4 ++clear mod1 ++ ++add control = Control_L ++add shift = Shift_L Shift_R ++add lock = Caps_Lock ++ ++! This is AltGr ++add mod4 = Mode_switch ++ ++add mod1 = Alt_L ++ diff --git a/packages/xserver-common/files/setDPI.sh b/packages/xserver-common/files/setDPI.sh new file mode 100644 index 0000000000..04a2edd6c6 --- /dev/null +++ b/packages/xserver-common/files/setDPI.sh @@ -0,0 +1,92 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: setDPI.sh +# Date: 09-Apr-06 + +# This script configures Xft.dpi dependent on your screens DPI. This insures that the same font-size +# setting of 7 can be used on all machines. + + +XDEFAULTS="/etc/X11/Xdefaults" + + + +set_dpi() { + + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Xft.dpi\:/s/.*\:\(.*\)/\1/p" | sed -n "s/\ //p"`" + + if test "$CURRENT_SETTING" != "$1" + then + echo "Using Xft.dpi of $SET_SCREEN_DPI for your $SCREEN_DPI DPI screen" + + if grep -q "Xft.dpi" "$XDEFAULTS" + then + cat "${XDEFAULTS}" | sed "s/^Xft.dpi\:.*/Xft.dpi\: $SET_SCREEN_DPI/" > "${XDEFAULTS}_" + mv "${XDEFAULTS}_" "${XDEFAULTS}" + else + echo -e "Xft.dpi: $SET_SCREEN_DPI\n" >> "$XDEFAULTS" + fi + else + echo "Your $SCREEN_DPI DPI screen is already configured." + fi +} + +set_rxvt_font() { + + CURRENT_SETTING="`cat ${XDEFAULTS} | sed -n "/Rxvt\*font/s/\(.*\pixelsize=\)\(.*\)/\2/p"`" + + if test "$1" -gt 100 + then + + # Configure the rxvt font-size for your screen here: + test "$1" -gt 180 -a "$1" -lt "221" && RXVT_FONT_SIZE=16 + + if test -z "$RXVT_FONT_SIZE" + then + echo "WARNING: No rxvt font-size configured for a $SCREEN_DPI DPI screen!" + echo "Defaulting to size 9" + RXVT_FONT_SIZE=9 + fi + + if test "$CURRENT_SETTING" != "$RXVT_FONT_SIZE" + then + echo "Using a rxvt font-size of $RXVT_FONT_SIZE" + cat ${XDEFAULTS} | sed "/Rxvt\*font/s/\(.*\pixelsize\)\(=*.*\)/\1=$RXVT_FONT_SIZE/" > ${XDEFAULTS}_ + mv ${XDEFAULTS}_ ${XDEFAULTS} + else + echo "The rxvt font-size is already configured" + fi + fi +} + +if test -z "$DISPLAY" +then + echo "DISPLAY is not set, aborting..." + exit 0 +fi + +SCREEN_DPI="`/usr/bin/xdpyinfo | grep "dots per inch" | awk '{print $2}'| sed -n "s/\(.*\)x\(.*\)/\2/p"`" + +if test -z "$SCREEN_DPI" +then + echo "WARNING: Couldn't read your screens DPI, defaulting to 100" + SCREEN_DPI=100 +fi + +# Configure your screen here: +test "$SCREEN_DPI" -gt 180 -a "$SCREEN_DPI" -lt "221" && SET_SCREEN_DPI=160 +test "$SCREEN_DPI" -gt 90 -a "$SCREEN_DPI" -lt "121" && SET_SCREEN_DPI=100 + + +if test -z "$SET_SCREEN_DPI" +then + echo "WARNING: No default configuration found for your $SCREEN_DPI DPI screen!" + echo "Using 100 DPI" + SET_SCREEN_DPI=100 +fi + +set_dpi "$SET_SCREEN_DPI" +set_rxvt_font "$SCREEN_DPI" -- cgit v1.2.3 From cd40986a93e3d0c01a4c506ef2540878741ae0ca Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 2 Sep 2006 12:14:36 +0000 Subject: xserver-common: use Xw100 if available --- packages/xserver-common/files/w100.patch | 12 ++++++++++++ packages/xserver-common/xserver-common_1.10.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/xserver-common/files/w100.patch (limited to 'packages') diff --git a/packages/xserver-common/files/w100.patch b/packages/xserver-common/files/w100.patch new file mode 100644 index 0000000000..ca908850e2 --- /dev/null +++ b/packages/xserver-common/files/w100.patch @@ -0,0 +1,12 @@ +--- xserver-common-1.10/X11/Xserver.orig 2006-09-02 13:54:30.000000000 +0200 ++++ xserver-common-1.10/X11/Xserver 2006-09-02 14:00:22.000000000 +0200 +@@ -14,6 +14,9 @@ + if [ -f /usr/bin/Xomap ]; then + XSERVER=Xomap + fi ++if [ -f /usr/bin/Xw100 ]; then ++ XSERVER=Xw100 ++fi + + . /etc/profile + diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb index de81537f99..64c223f109 100644 --- a/packages/xserver-common/xserver-common_1.10.bb +++ b/packages/xserver-common/xserver-common_1.10.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" @@ -12,6 +12,7 @@ inherit gpe SRC_URI_append = " file://setDPI.sh \ file://calibrate_zaurusd.patch;patch=1 \ + file://w100.patch;patch=1 \ file://poodle-xmodmap-2.6.patch;patch=1" do_install_append() { -- cgit v1.2.3 From d3e9d5b3b92c0f04dc1c73ea94758ed974e3d8b9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 14:09:04 +0000 Subject: zd1211: Remove deprecated versions, update to rev83 --- packages/zd1211/zd1211-r59/.mtn2git_empty | 0 packages/zd1211/zd1211-r59/makefile-unslung.patch | 48 ---------------------- packages/zd1211/zd1211-r59/makefile.patch | 47 --------------------- packages/zd1211/zd1211-r67/.mtn2git_empty | 0 packages/zd1211/zd1211-r67/makefile-unslung.patch | 48 ---------------------- packages/zd1211/zd1211-r67/makefile.patch | 47 --------------------- packages/zd1211/zd1211-r74/.mtn2git_empty | 0 packages/zd1211/zd1211-r74/makefile-unslung.patch | 48 ---------------------- packages/zd1211/zd1211-r74/makefile.patch | 47 --------------------- .../zd1211/zd1211-r74/unslung-iwpriv-hack.patch | 19 --------- .../zd1211/zd1211-r74/unslung-writel-logging.patch | 14 ------- packages/zd1211/zd1211-r74/zd1211-endian-fix.patch | 11 ----- packages/zd1211/zd1211-r83/.mtn2git_empty | 0 packages/zd1211/zd1211-r83/makefile-unslung.patch | 48 ++++++++++++++++++++++ packages/zd1211/zd1211-r83/makefile.patch | 47 +++++++++++++++++++++ .../zd1211/zd1211-r83/unslung-iwpriv-hack.patch | 19 +++++++++ .../zd1211/zd1211-r83/unslung-writel-logging.patch | 14 +++++++ packages/zd1211/zd1211_r83.bb | 36 ++++++++++++++++ 18 files changed, 164 insertions(+), 329 deletions(-) delete mode 100644 packages/zd1211/zd1211-r59/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-r59/makefile-unslung.patch delete mode 100644 packages/zd1211/zd1211-r59/makefile.patch delete mode 100644 packages/zd1211/zd1211-r67/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-r67/makefile-unslung.patch delete mode 100644 packages/zd1211/zd1211-r67/makefile.patch delete mode 100644 packages/zd1211/zd1211-r74/.mtn2git_empty delete mode 100644 packages/zd1211/zd1211-r74/makefile-unslung.patch delete mode 100644 packages/zd1211/zd1211-r74/makefile.patch delete mode 100644 packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch delete mode 100644 packages/zd1211/zd1211-r74/unslung-writel-logging.patch delete mode 100644 packages/zd1211/zd1211-r74/zd1211-endian-fix.patch create mode 100644 packages/zd1211/zd1211-r83/.mtn2git_empty create mode 100644 packages/zd1211/zd1211-r83/makefile-unslung.patch create mode 100644 packages/zd1211/zd1211-r83/makefile.patch create mode 100644 packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch create mode 100644 packages/zd1211/zd1211-r83/unslung-writel-logging.patch create mode 100644 packages/zd1211/zd1211_r83.bb (limited to 'packages') diff --git a/packages/zd1211/zd1211-r59/.mtn2git_empty b/packages/zd1211/zd1211-r59/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-r59/makefile-unslung.patch b/packages/zd1211/zd1211-r59/makefile-unslung.patch deleted file mode 100644 index 3ad1e24424..0000000000 --- a/packages/zd1211/zd1211-r59/makefile-unslung.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this --KERN_26=y -+#KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r59/makefile.patch b/packages/zd1211/zd1211-r59/makefile.patch deleted file mode 100644 index 5c575faece..0000000000 --- a/packages/zd1211/zd1211-r59/makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this - KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r67/.mtn2git_empty b/packages/zd1211/zd1211-r67/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-r67/makefile-unslung.patch b/packages/zd1211/zd1211-r67/makefile-unslung.patch deleted file mode 100644 index 3ad1e24424..0000000000 --- a/packages/zd1211/zd1211-r67/makefile-unslung.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this --KERN_26=y -+#KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r67/makefile.patch b/packages/zd1211/zd1211-r67/makefile.patch deleted file mode 100644 index 5c575faece..0000000000 --- a/packages/zd1211/zd1211-r67/makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this - KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r74/.mtn2git_empty b/packages/zd1211/zd1211-r74/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/zd1211/zd1211-r74/makefile-unslung.patch b/packages/zd1211/zd1211-r74/makefile-unslung.patch deleted file mode 100644 index 3ad1e24424..0000000000 --- a/packages/zd1211/zd1211-r74/makefile-unslung.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this --KERN_26=y -+#KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r74/makefile.patch b/packages/zd1211/zd1211-r74/makefile.patch deleted file mode 100644 index 5c575faece..0000000000 --- a/packages/zd1211/zd1211-r74/makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this - KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/packages/zd1211/zd1211-r74/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/packages/zd1211/zd1211-r74/unslung-writel-logging.patch b/packages/zd1211/zd1211-r74/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/packages/zd1211/zd1211-r74/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/packages/zd1211/zd1211-r74/zd1211-endian-fix.patch b/packages/zd1211/zd1211-r74/zd1211-endian-fix.patch deleted file mode 100644 index c694174fee..0000000000 --- a/packages/zd1211/zd1211-r74/zd1211-endian-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zd1211-driver-r67/src/zd1211.c~ 2006-02-16 15:33:51.000000000 -0600 -+++ zd1211-driver-r67/src/zd1211.c 2006-04-30 22:47:13.000000000 -0500 -@@ -2228,7 +2228,7 @@ - - if (CurFrmLen & 0x03) - tmpLen += 4; -- rfd->ActualCount += macp->rxOffset; -+ rfd->ActualCount = cpu_to_le32(CurFrmLen + macp->rxOffset); - } - } else { - // last_pkt_len = 509, 510, 511 diff --git a/packages/zd1211/zd1211-r83/.mtn2git_empty b/packages/zd1211/zd1211-r83/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/zd1211-r83/makefile-unslung.patch b/packages/zd1211/zd1211-r83/makefile-unslung.patch new file mode 100644 index 0000000000..4edcbb7a9d --- /dev/null +++ b/packages/zd1211/zd1211-r83/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r83/makefile.patch b/packages/zd1211/zd1211-r83/makefile.patch new file mode 100644 index 0000000000..adc2bd416d --- /dev/null +++ b/packages/zd1211/zd1211-r83/makefile.patch @@ -0,0 +1,47 @@ +--- zd1211-driver-r83/Makefile.orig 2006-09-02 16:00:00.000000000 +0200 ++++ zd1211-driver-r83/Makefile 2006-09-02 16:01:57.000000000 +0200 +@@ -4,10 +4,10 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++#CC=gcc ++#CPP=g++ ++#LD=ld ++#rM=rm -f -r + + VERSION := $(shell uname -r) + MODPATH := /lib/modules/$(VERSION) +@@ -15,14 +15,14 @@ + # if the kernel is 2.6.x, turn on this + KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + + SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++DEFINES ?= -D__KERNEL__ -DMODULE=1 + + + +@@ -228,9 +228,9 @@ + depmod -a $(VERSION) + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch new file mode 100644 index 0000000000..64f3806140 --- /dev/null +++ b/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch @@ -0,0 +1,19 @@ +--- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 ++++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 +@@ -349,8 +349,14 @@ + { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, + { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, + { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, +- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, +- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// HACK HACK HACK - The following two lines are commented out in order to make ++// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions ++// can only handle up to 16 iwpriv entries in this structure. Yes, the correct ++// fix is to patch the Wireless Extensions in the Unslung kernel. This hack ++// should be removed when that's actually done. ~mwester 27APR2006 ++// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, ++// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// End of HACK + { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, + { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, + }; diff --git a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch b/packages/zd1211/zd1211-r83/unslung-writel-logging.patch new file mode 100644 index 0000000000..00d54d7d68 --- /dev/null +++ b/packages/zd1211/zd1211-r83/unslung-writel-logging.patch @@ -0,0 +1,14 @@ +--- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 ++++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 +@@ -652,7 +652,10 @@ + count++; + + if (count > 5) { +- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); ++// You are going to see this often enough on Unslung that we might as well put it in ++// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 ++// ++ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); + break; + } + } diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb new file mode 100644 index 0000000000..398d516372 --- /dev/null +++ b/packages/zd1211/zd1211_r83.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik " +LICENSE = "GPL" +PR = "r1" +RDEPENDS = "wireless-tools" + +SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile.patch;patch=1 \ + " + +SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile-unslung.patch;patch=1 \ + file://unslung-iwpriv-hack.patch;patch=1 \ + file://unslung-writel-logging.patch;patch=1 \ + " + +S = "${WORKDIR}/zd1211-driver-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ + 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'KERNEL_VERSION=${KERNEL_VERSION}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net + install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net +} -- cgit v1.2.3 From 358f48301ec25e4f35daf798eb41cfd767f2cab8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 17:55:23 +0000 Subject: samba: upstream upgrade to 3.0.23c. Add MAINTAINER and LICENCE fields --- packages/samba/samba-3.0.23c/.mtn2git_empty | 0 packages/samba/samba-3.0.23c/Managing-Samba.txt | 40 +++++ packages/samba/samba-3.0.23c/cifs.patch | 10 ++ packages/samba/samba-3.0.23c/config-lfs.patch | 47 ++++++ packages/samba/samba-3.0.23c/configure.patch | 170 +++++++++++++++++++++ packages/samba/samba-3.0.23c/init | 58 +++++++ packages/samba/samba-3.0.23c/init-essential | 68 +++++++++ packages/samba/samba-3.0.23c/quota.patch | 11 ++ .../samba-3.0.23c/smb-essential-inactive.conf | 34 +++++ packages/samba/samba-3.0.23c/smb-essential.conf | 82 ++++++++++ packages/samba/samba_3.0.23c.bb | 55 +++++++ 11 files changed, 575 insertions(+) create mode 100644 packages/samba/samba-3.0.23c/.mtn2git_empty create mode 100644 packages/samba/samba-3.0.23c/Managing-Samba.txt create mode 100644 packages/samba/samba-3.0.23c/cifs.patch create mode 100644 packages/samba/samba-3.0.23c/config-lfs.patch create mode 100644 packages/samba/samba-3.0.23c/configure.patch create mode 100644 packages/samba/samba-3.0.23c/init create mode 100644 packages/samba/samba-3.0.23c/init-essential create mode 100644 packages/samba/samba-3.0.23c/quota.patch create mode 100644 packages/samba/samba-3.0.23c/smb-essential-inactive.conf create mode 100644 packages/samba/samba-3.0.23c/smb-essential.conf create mode 100644 packages/samba/samba_3.0.23c.bb (limited to 'packages') diff --git a/packages/samba/samba-3.0.23c/.mtn2git_empty b/packages/samba/samba-3.0.23c/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/samba/samba-3.0.23c/Managing-Samba.txt b/packages/samba/samba-3.0.23c/Managing-Samba.txt new file mode 100644 index 0000000000..01f7592824 --- /dev/null +++ b/packages/samba/samba-3.0.23c/Managing-Samba.txt @@ -0,0 +1,40 @@ +This device is running a bare-bone Samba server which allows easy +transfer of files and directories between any networked desktop PC and +your networked PDA. + +Since it is generally a bad idea to allow everyone read and write access +to your PDA, you will have to configure at least one user to get access to +any shared folder. + +How to create a Samba user with password: + +- If you haven't already created a non-root user, do so now: + root@poodle:/usr/bin# adduser testuser + Changing password for testuser + Enter the new password (minimum of 5, maximum of 8 characters) + Please use a combination of upper and lower case letters and numbers. + Enter new password: + Bad password: too short. + + Warning: weak password (continuing). + Re-enter new password: + Password changed. + root@poodle:/usr/bin# + +- Note that the password you entered will _not_ be your samba password. + Samba uses its own password database. + +- Add a Samba password for your user: + root@poodle:/usr/bin# smbpasswd -a testuser + New SMB password: + Retype new SMB password: + Added user testuser. + root@poodle:/usr/bin# + +- After you have added your new samba user, you'll have to restart the samba + server by running "/etc/init.d/samba restart" or by rebooting the device + +- Use the newly created username / password combination to access your network + shares. Please note the the Samba username must also exist as a unix username! + + diff --git a/packages/samba/samba-3.0.23c/cifs.patch b/packages/samba/samba-3.0.23c/cifs.patch new file mode 100644 index 0000000000..ee6dab567f --- /dev/null +++ b/packages/samba/samba-3.0.23c/cifs.patch @@ -0,0 +1,10 @@ +--- source/client/mount.cifs.c.old 2004-11-28 02:33:52.000000000 +1030 ++++ source/client/mount.cifs.c 2004-11-28 02:33:59.000000000 +1030 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #define MOUNT_CIFS_VERSION_MAJOR "1" + #define MOUNT_CIFS_VERSION_MINOR "2" diff --git a/packages/samba/samba-3.0.23c/config-lfs.patch b/packages/samba/samba-3.0.23c/config-lfs.patch new file mode 100644 index 0000000000..b37ed690ce --- /dev/null +++ b/packages/samba/samba-3.0.23c/config-lfs.patch @@ -0,0 +1,47 @@ +Cache the check for Linux LFS support, so it can be prepopulated from +the site cache for configure variables for cross-compiling. Without this, +samba gets the idea that it can use dirent64 and friends without defining +the flags it needs to get it, such as _GNU_SOURCE and _LARGEFILE64_SOURCE. + +Symptoms of getting the configuration wrong on cross-compile inculde +warnings such as + + smbd/trans2.c: In function `get_lanman2_dir_entry': + smbd/trans2.c:1065: warning: right shift count >= width of type + +and errors like + + smbd/vfs.c:630: error: dereferencing pointer to incomplete type + +(when trying to dereference dirent64.) + +--- source/configure.in.orig 2005-05-29 14:46:18.000000000 -0700 ++++ source/configure.in 2005-05-29 14:51:57.000000000 -0700 +@@ -588,7 +588,7 @@ + # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support. + # + *linux*) +- AC_MSG_CHECKING([for LFS support]) ++ AC_CACHE_CHECK([for LFS support], samba_cv_LINUX_LFS_SUPPORT,[ + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" + AC_TRY_RUN([ +@@ -627,15 +627,14 @@ + exit(1); + #endif + } +-], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) +- CPPFLAGS="$old_CPPFLAGS" +- if test x$LINUX_LFS_SUPPORT = xyes ; then ++], [samba_cv_LINUX_LFS_SUPPORT=yes], [samba_cv_LINUX_LFS_SUPPORT=no], [samba_cv_LINUX_LFS_SUPPORT=cross]) ++ CPPFLAGS="$old_CPPFLAGS"]) ++ if test x"$samba_cv_LINUX_LFS_SUPPORT" = x"yes" ; then + CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" + AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support]) + AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits]) + AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions]) + fi +- AC_MSG_RESULT([$LINUX_LFS_SUPPORT]) + ;; + + # diff --git a/packages/samba/samba-3.0.23c/configure.patch b/packages/samba/samba-3.0.23c/configure.patch new file mode 100644 index 0000000000..0366efb314 --- /dev/null +++ b/packages/samba/samba-3.0.23c/configure.patch @@ -0,0 +1,170 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- source/configure.in~configure 2003-12-14 22:36:25.000000000 -0500 ++++ source/configure.in 2004-01-26 14:33:15.000000000 -0500 +@@ -959,7 +959,7 @@ + #endif + exit(0); + } +-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no]) ++], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no], [linux_getgrouplist_ok=cross]) + if test x"$linux_getgrouplist_ok" = x"yes"; then + AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist]) + fi +--- source/aclocal.m4~configure 2004-01-26 14:33:15.000000000 -0500 ++++ source/aclocal.m4 2004-01-26 17:34:28.000000000 -0500 +@@ -2,7 +2,7 @@ + dnl if the cache file is inconsistent with the current host, + dnl target and build system types, execute CMD or print a default + dnl error message. +-AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [ ++AC_DEFUN([AC_VALIDATE_CACHE_SYSTEM_TYPE], [ + AC_REQUIRE([AC_CANONICAL_SYSTEM]) + AC_MSG_CHECKING([config.cache system type]) + if { test x"${ac_cv_host_system_type+set}" = x"set" && +@@ -24,7 +24,7 @@ + + + dnl test whether dirent has a d_off member +-AC_DEFUN(AC_DIRENT_D_OFF, ++AC_DEFUN([AC_DIRENT_D_OFF], + [AC_CACHE_CHECK([for d_off in dirent], ac_cv_dirent_d_off, + [AC_TRY_COMPILE([ + #include +@@ -38,7 +38,7 @@ + + dnl Mark specified module as shared + dnl SMB_MODULE(name,static_files,shared_files,subsystem,whatif-static,whatif-shared) +-AC_DEFUN(SMB_MODULE, ++AC_DEFUN([SMB_MODULE], + [ + AC_MSG_CHECKING([how to build $1]) + if test "$[MODULE_][$1]"; then +@@ -68,7 +68,7 @@ + fi + ]) + +-AC_DEFUN(SMB_SUBSYSTEM, ++AC_DEFUN([SMB_SUBSYSTEM], + [ + AC_SUBST($1_STATIC) + AC_SUBST($1_MODULES) +@@ -77,7 +77,7 @@ + ]) + + dnl AC_PROG_CC_FLAG(flag) +-AC_DEFUN(AC_PROG_CC_FLAG, ++AC_DEFUN([AC_PROG_CC_FLAG], + [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1, + [echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then +@@ -91,7 +91,7 @@ + dnl see if a declaration exists for a function or variable + dnl defines HAVE_function_DECL if it exists + dnl AC_HAVE_DECL(var, includes) +-AC_DEFUN(AC_HAVE_DECL, ++AC_DEFUN([AC_HAVE_DECL], + [ + AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[ + AC_TRY_COMPILE([$2],[int i = (int)$1], +@@ -223,7 +223,7 @@ + + dnl Define an AC_DEFINE with ifndef guard. + dnl AC_N_DEFINE(VARIABLE [, VALUE]) +-define(AC_N_DEFINE, ++define([AC_N_DEFINE], + [cat >> confdefs.h <<\EOF + [#ifndef] $1 + [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1) +@@ -233,14 +233,14 @@ + + dnl Add an #include + dnl AC_ADD_INCLUDE(VARIABLE) +-define(AC_ADD_INCLUDE, ++define([AC_ADD_INCLUDE], + [cat >> confdefs.h <<\EOF + [#include] $1 + EOF + ]) + + dnl Copied from libtool.m4 +-AC_DEFUN(AC_PROG_LD_GNU, ++AC_DEFUN([AC_PROG_LD_GNU], + [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, + [# I'd rather use --version here, but apparently some GNU ld's only accept -v. + if $LD -v 2>&1 &5; then +@@ -259,7 +259,7 @@ + dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for XML, and define XML_CFLAGS and XML_LIBS + dnl +-AC_DEFUN(AM_PATH_XML2,[ ++AC_DEFUN([AM_PATH_XML2],[ + AC_ARG_WITH(xml-prefix, + [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], + xml_config_prefix="$withval", xml_config_prefix="") +@@ -443,7 +443,7 @@ + dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS + dnl +-AC_DEFUN(AM_PATH_MYSQL, ++AC_DEFUN([AM_PATH_MYSQL], + [dnl + dnl Get the cflags and libraries from the mysql_config script + dnl +@@ -485,7 +485,7 @@ + ]) + + dnl Removes -I/usr/include/? from given variable +-AC_DEFUN(CFLAGS_REMOVE_USR_INCLUDE,[ ++AC_DEFUN([CFLAGS_REMOVE_USR_INCLUDE],[ + ac_new_flags="" + for i in [$]$1; do + case [$]i in +@@ -497,7 +497,7 @@ + ]) + + dnl Removes -L/usr/lib/? from given variable +-AC_DEFUN(LIB_REMOVE_USR_LIB,[ ++AC_DEFUN([LIB_REMOVE_USR_LIB],[ + ac_new_flags="" + for i in [$]$1; do + case [$]i in +@@ -510,7 +510,7 @@ + + dnl From Bruno Haible. + +-AC_DEFUN(jm_ICONV, ++AC_DEFUN([jm_ICONV], + [ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable libiconv installed). +@@ -607,7 +607,7 @@ + fi + ]) + +-AC_DEFUN(rjs_CHARSET,[ ++AC_DEFUN([rjs_CHARSET],[ + dnl Find out if we can convert from $1 to UCS2-LE + AC_MSG_CHECKING([can we convert from $1 to UCS2-LE?]) + AC_TRY_RUN([ +@@ -625,7 +625,7 @@ + + dnl CFLAGS_ADD_DIR(CFLAGS, $INCDIR) + dnl This function doesn't add -I/usr/include into CFLAGS +-AC_DEFUN(CFLAGS_ADD_DIR,[ ++AC_DEFUN([CFLAGS_ADD_DIR],[ + if test "$2" != "/usr/include" ; then + $1="$$1 -I$2" + fi +@@ -633,7 +633,7 @@ + + dnl LIB_ADD_DIR(LDFLAGS, $LIBDIR) + dnl This function doesn't add -L/usr/lib into LDFLAGS +-AC_DEFUN(LIB_ADD_DIR,[ ++AC_DEFUN([LIB_ADD_DIR],[ + if test "$2" != "/usr/lib" ; then + $1="$$1 -L$2" + fi diff --git a/packages/samba/samba-3.0.23c/init b/packages/samba/samba-3.0.23c/init new file mode 100644 index 0000000000..cb57b17de4 --- /dev/null +++ b/packages/samba/samba-3.0.23c/init @@ -0,0 +1,58 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/samba and type +# > update-rc.d samba defaults 60 +# + + +smbd=/usr/sbin/smbd +test -x "$smbd" || exit 0 +nmbd=/usr/sbin/nmbd +test -x "$nmbd" || exit 0 + + +case "$1" in + start) + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd + echo "." + ;; + stop) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $smbd + start-stop-daemon --stop --quiet --signal 1 --exec $nmbd + ;; + restart) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "" + echo -n "Waiting for samba processes to die off" + for i in 1 2 3 ; + do + sleep 1 + echo -n "." + done + echo "" + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd + echo "." + ;; + *) + echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 \ No newline at end of file diff --git a/packages/samba/samba-3.0.23c/init-essential b/packages/samba/samba-3.0.23c/init-essential new file mode 100644 index 0000000000..59184ce733 --- /dev/null +++ b/packages/samba/samba-3.0.23c/init-essential @@ -0,0 +1,68 @@ +#! /bin/sh +# +# This is an init script for openembedded +# Copy it to /etc/init.d/samba and type +# > update-rc.d samba defaults 60 +# + + +smbd=/usr/sbin/smbd +test -x "$smbd" || exit 0 +nmbd=/usr/sbin/nmbd +test -x "$nmbd" || exit 0 + + +if test -e /etc/samba/private/smbpasswd +then + if test -n "`cat /etc/samba/private/smbpasswd`" + then + CONFIG_FILE="/etc/samba/smb.conf" + fi +fi + +test -z "$CONFIG_FILE" && CONFIG_FILE="/etc/samba/smb-essential-inactive.conf" + +case "$1" in + start) + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE + echo "." + ;; + stop) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "." + ;; + reload|force-reload) + start-stop-daemon --stop --quiet --signal 1 --exec $smbd -- -s $CONFIG_FILE + start-stop-daemon --stop --quiet --signal 1 --exec $nmbd -- -s $CONFIG_FILE + ;; + restart) + echo -n "Stopping Samba: smbd" + start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid + echo -n " nmbd" + start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid + echo "" + echo -n "Waiting for samba processes to die off" + for i in 1 2 3 ; + do + sleep 1 + echo -n "." + done + echo "" + echo -n "Starting Samba: smbd" + start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE + echo -n " nmbd" + start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE + echo "." + ;; + *) + echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" + exit 1 +esac + +exit 0 diff --git a/packages/samba/samba-3.0.23c/quota.patch b/packages/samba/samba-3.0.23c/quota.patch new file mode 100644 index 0000000000..6f42ff868f --- /dev/null +++ b/packages/samba/samba-3.0.23c/quota.patch @@ -0,0 +1,11 @@ +--- lib/sysquotas_4A.c.old 2005-07-03 17:16:00.000000000 +0200 ++++ lib/sysquotas_4A.c 2005-07-03 17:10:09.000000000 +0200 +@@ -28,6 +28,8 @@ + /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */ + /* this is used by: HPUX,IRIX */ + ++ #define _LINUX_QUOTA_VERSION 1 ++ + #ifdef HAVE_SYS_TYPES_H + #include + #endif diff --git a/packages/samba/samba-3.0.23c/smb-essential-inactive.conf b/packages/samba/samba-3.0.23c/smb-essential-inactive.conf new file mode 100644 index 0000000000..d42d63cb9a --- /dev/null +++ b/packages/samba/samba-3.0.23c/smb-essential-inactive.conf @@ -0,0 +1,34 @@ + + +[global] + workgroup = MYWORKGROUP + server string = OpenZaurus Samba Server + + netbios name = %L-INACTIVE + + security = share + + load printers = no + + socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 + + dns proxy = yes + + +#============================ Share Definitions ============================== + +[Samba-Help] + comment = How to enable Samba + path = /usr/share/samba/help + writable = no + public = yes + printable = no + +[printers] + comment = All Printers + path = /usr/spool/samba + guest ok = no + writable = no + printable = yes + browseable = no + diff --git a/packages/samba/samba-3.0.23c/smb-essential.conf b/packages/samba/samba-3.0.23c/smb-essential.conf new file mode 100644 index 0000000000..24cb2a56cb --- /dev/null +++ b/packages/samba/samba-3.0.23c/smb-essential.conf @@ -0,0 +1,82 @@ + + +[global] + workgroup = MYWORKGROUP + server string = OpenZaurus Samba Server + + security = user + + load printers = no + +; guest account = pcguest + + log file = /var/log.%m + + max log size = 50 + + socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 + + dns proxy = yes + + +#============================ Share Definitions ============================== +[homes] + comment = Home Directory for %U + browseable = no + writable = yes + follow symlinks = yes + include = /etc/test.%U + +# This one is useful for people to share files +;[tmp] +; comment = Temporary file space +; path = /tmp +; read only = no +; public = yes + +[printers] + comment = All Printers + path = /usr/spool/samba + guest ok = no + writable = no + printable = yes + browseable = no + +[CompactFlash] + comment = Compact Flash Storage + path = /media/cf + writable = yes + printable = no + public = no + +[SD-MMC] + comment = SD & MMC Storage + path = /media/card + writable = yes + printable = no + public = no + +[RootFS] + comment = Zaurus Rootfs + path = / + writable = yes + printable = no + public = no + follow symlinks = yes + +[Home] + comment = "User Home Directories" + path = /home + writable = yes + printable = no + public = no + follow symlinks = yes + +[Samba-Help] + comment = How to configure Samba + path = /usr/share/samba/help + writable = no + public = yes + printable = no + + diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb new file mode 100644 index 0000000000..e129b241b3 --- /dev/null +++ b/packages/samba/samba_3.0.23c.bb @@ -0,0 +1,55 @@ +LICENCE="GPL-2" +MAINTAINER="Oyvind Repvik " +PR = "r0" + +SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://cifs.patch;patch=1 \ + file://config-lfs.patch;patch=1 \ + file://init \ + file://quota.patch;patch=1;pnum=0 \ + " +S = ${WORKDIR}/${P}/source + +include samba.inc +inherit update-rc.d + +INITSCRIPT_NAME = "samba" +# No dependencies, goes in at level 20 (NOTE: take care with the +# level, later levels put the shutdown later too - see the links +# in rc6.d, the shutdown must precede network shutdown). +INITSCRIPT_PARAMS = "defaults" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" + +# The file system settings --foodir=dirfoo and overridden unconditionally +# in the samba config by --with-foodir=dirfoo - even if the --with is not +# specified! Fix that here. Set the privatedir to /etc/samba/private. +EXTRA_OECONF += "\ + samba_cv_struct_timespec=yes \ + --with-configdir=${sysconfdir}/samba \ + --with-privatedir=${sysconfdir}/samba/private \ + --with-lockdir=${localstatedir}/lock \ + --with-piddir=${localstatedir}/run \ + --with-logfilebase=${localstatedir}/log \ + --with-libdir=${libdir} \ + --with-mandir=${mandir} \ + --with-swatdir=${datadir}/swat \ + " + +do_install_append() { + install -d "${D}${localstatedir}/log" + rm -f ${D}/sbin/mount.smbfs + ln -sf smbmount ${D}${sbindir}/mount.smbfs + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + install -d "${D}${sysconfdir}/samba" + install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf +} + +PACKAGES =+ "swat" + +FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" +FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat ${libdir}/auth/*.so" +# +# bug fix for samba.inc: +FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" -- cgit v1.2.3 From db39c0f2f3257233b415fa9443eae90a471e29af Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 17:57:34 +0000 Subject: samba: Remove duplicate files --- packages/samba/samba-3.0.23c/Managing-Samba.txt | 40 ----------- packages/samba/samba-3.0.23c/cifs.patch | 10 --- packages/samba/samba-3.0.23c/config-lfs.patch | 47 ------------- packages/samba/samba-3.0.23c/init | 58 --------------- packages/samba/samba-3.0.23c/init-essential | 68 ------------------ packages/samba/samba-3.0.23c/quota.patch | 11 --- .../samba-3.0.23c/smb-essential-inactive.conf | 34 --------- packages/samba/samba-3.0.23c/smb-essential.conf | 82 ---------------------- 8 files changed, 350 deletions(-) delete mode 100644 packages/samba/samba-3.0.23c/Managing-Samba.txt delete mode 100644 packages/samba/samba-3.0.23c/cifs.patch delete mode 100644 packages/samba/samba-3.0.23c/config-lfs.patch delete mode 100644 packages/samba/samba-3.0.23c/init delete mode 100644 packages/samba/samba-3.0.23c/init-essential delete mode 100644 packages/samba/samba-3.0.23c/quota.patch delete mode 100644 packages/samba/samba-3.0.23c/smb-essential-inactive.conf delete mode 100644 packages/samba/samba-3.0.23c/smb-essential.conf (limited to 'packages') diff --git a/packages/samba/samba-3.0.23c/Managing-Samba.txt b/packages/samba/samba-3.0.23c/Managing-Samba.txt deleted file mode 100644 index 01f7592824..0000000000 --- a/packages/samba/samba-3.0.23c/Managing-Samba.txt +++ /dev/null @@ -1,40 +0,0 @@ -This device is running a bare-bone Samba server which allows easy -transfer of files and directories between any networked desktop PC and -your networked PDA. - -Since it is generally a bad idea to allow everyone read and write access -to your PDA, you will have to configure at least one user to get access to -any shared folder. - -How to create a Samba user with password: - -- If you haven't already created a non-root user, do so now: - root@poodle:/usr/bin# adduser testuser - Changing password for testuser - Enter the new password (minimum of 5, maximum of 8 characters) - Please use a combination of upper and lower case letters and numbers. - Enter new password: - Bad password: too short. - - Warning: weak password (continuing). - Re-enter new password: - Password changed. - root@poodle:/usr/bin# - -- Note that the password you entered will _not_ be your samba password. - Samba uses its own password database. - -- Add a Samba password for your user: - root@poodle:/usr/bin# smbpasswd -a testuser - New SMB password: - Retype new SMB password: - Added user testuser. - root@poodle:/usr/bin# - -- After you have added your new samba user, you'll have to restart the samba - server by running "/etc/init.d/samba restart" or by rebooting the device - -- Use the newly created username / password combination to access your network - shares. Please note the the Samba username must also exist as a unix username! - - diff --git a/packages/samba/samba-3.0.23c/cifs.patch b/packages/samba/samba-3.0.23c/cifs.patch deleted file mode 100644 index ee6dab567f..0000000000 --- a/packages/samba/samba-3.0.23c/cifs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- source/client/mount.cifs.c.old 2004-11-28 02:33:52.000000000 +1030 -+++ source/client/mount.cifs.c 2004-11-28 02:33:59.000000000 +1030 -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #define MOUNT_CIFS_VERSION_MAJOR "1" - #define MOUNT_CIFS_VERSION_MINOR "2" diff --git a/packages/samba/samba-3.0.23c/config-lfs.patch b/packages/samba/samba-3.0.23c/config-lfs.patch deleted file mode 100644 index b37ed690ce..0000000000 --- a/packages/samba/samba-3.0.23c/config-lfs.patch +++ /dev/null @@ -1,47 +0,0 @@ -Cache the check for Linux LFS support, so it can be prepopulated from -the site cache for configure variables for cross-compiling. Without this, -samba gets the idea that it can use dirent64 and friends without defining -the flags it needs to get it, such as _GNU_SOURCE and _LARGEFILE64_SOURCE. - -Symptoms of getting the configuration wrong on cross-compile inculde -warnings such as - - smbd/trans2.c: In function `get_lanman2_dir_entry': - smbd/trans2.c:1065: warning: right shift count >= width of type - -and errors like - - smbd/vfs.c:630: error: dereferencing pointer to incomplete type - -(when trying to dereference dirent64.) - ---- source/configure.in.orig 2005-05-29 14:46:18.000000000 -0700 -+++ source/configure.in 2005-05-29 14:51:57.000000000 -0700 -@@ -588,7 +588,7 @@ - # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support. - # - *linux*) -- AC_MSG_CHECKING([for LFS support]) -+ AC_CACHE_CHECK([for LFS support], samba_cv_LINUX_LFS_SUPPORT,[ - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" - AC_TRY_RUN([ -@@ -627,15 +627,14 @@ - exit(1); - #endif - } --], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross]) -- CPPFLAGS="$old_CPPFLAGS" -- if test x$LINUX_LFS_SUPPORT = xyes ; then -+], [samba_cv_LINUX_LFS_SUPPORT=yes], [samba_cv_LINUX_LFS_SUPPORT=no], [samba_cv_LINUX_LFS_SUPPORT=cross]) -+ CPPFLAGS="$old_CPPFLAGS"]) -+ if test x"$samba_cv_LINUX_LFS_SUPPORT" = x"yes" ; then - CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS" - AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support]) - AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits]) - AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions]) - fi -- AC_MSG_RESULT([$LINUX_LFS_SUPPORT]) - ;; - - # diff --git a/packages/samba/samba-3.0.23c/init b/packages/samba/samba-3.0.23c/init deleted file mode 100644 index cb57b17de4..0000000000 --- a/packages/samba/samba-3.0.23c/init +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# This is an init script for openembedded -# Copy it to /etc/init.d/samba and type -# > update-rc.d samba defaults 60 -# - - -smbd=/usr/sbin/smbd -test -x "$smbd" || exit 0 -nmbd=/usr/sbin/nmbd -test -x "$nmbd" || exit 0 - - -case "$1" in - start) - echo -n "Starting Samba: smbd" - start-stop-daemon --start --quiet --exec $smbd - echo -n " nmbd" - start-stop-daemon --start --quiet --exec $nmbd - echo "." - ;; - stop) - echo -n "Stopping Samba: smbd" - start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid - echo -n " nmbd" - start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid - echo "." - ;; - reload|force-reload) - start-stop-daemon --stop --quiet --signal 1 --exec $smbd - start-stop-daemon --stop --quiet --signal 1 --exec $nmbd - ;; - restart) - echo -n "Stopping Samba: smbd" - start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid - echo -n " nmbd" - start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid - echo "" - echo -n "Waiting for samba processes to die off" - for i in 1 2 3 ; - do - sleep 1 - echo -n "." - done - echo "" - echo -n "Starting Samba: smbd" - start-stop-daemon --start --quiet --exec $smbd - echo -n " nmbd" - start-stop-daemon --start --quiet --exec $nmbd - echo "." - ;; - *) - echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" - exit 1 -esac - -exit 0 \ No newline at end of file diff --git a/packages/samba/samba-3.0.23c/init-essential b/packages/samba/samba-3.0.23c/init-essential deleted file mode 100644 index 59184ce733..0000000000 --- a/packages/samba/samba-3.0.23c/init-essential +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# -# This is an init script for openembedded -# Copy it to /etc/init.d/samba and type -# > update-rc.d samba defaults 60 -# - - -smbd=/usr/sbin/smbd -test -x "$smbd" || exit 0 -nmbd=/usr/sbin/nmbd -test -x "$nmbd" || exit 0 - - -if test -e /etc/samba/private/smbpasswd -then - if test -n "`cat /etc/samba/private/smbpasswd`" - then - CONFIG_FILE="/etc/samba/smb.conf" - fi -fi - -test -z "$CONFIG_FILE" && CONFIG_FILE="/etc/samba/smb-essential-inactive.conf" - -case "$1" in - start) - echo -n "Starting Samba: smbd" - start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE - echo -n " nmbd" - start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE - echo "." - ;; - stop) - echo -n "Stopping Samba: smbd" - start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid - echo -n " nmbd" - start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid - echo "." - ;; - reload|force-reload) - start-stop-daemon --stop --quiet --signal 1 --exec $smbd -- -s $CONFIG_FILE - start-stop-daemon --stop --quiet --signal 1 --exec $nmbd -- -s $CONFIG_FILE - ;; - restart) - echo -n "Stopping Samba: smbd" - start-stop-daemon --stop --quiet --pidfile /var/run/smbd.pid - echo -n " nmbd" - start-stop-daemon --stop --quiet --pidfile /var/run/nmbd.pid - echo "" - echo -n "Waiting for samba processes to die off" - for i in 1 2 3 ; - do - sleep 1 - echo -n "." - done - echo "" - echo -n "Starting Samba: smbd" - start-stop-daemon --start --quiet --exec $smbd -- -s $CONFIG_FILE - echo -n " nmbd" - start-stop-daemon --start --quiet --exec $nmbd -- -s $CONFIG_FILE - echo "." - ;; - *) - echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" - exit 1 -esac - -exit 0 diff --git a/packages/samba/samba-3.0.23c/quota.patch b/packages/samba/samba-3.0.23c/quota.patch deleted file mode 100644 index 6f42ff868f..0000000000 --- a/packages/samba/samba-3.0.23c/quota.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/sysquotas_4A.c.old 2005-07-03 17:16:00.000000000 +0200 -+++ lib/sysquotas_4A.c 2005-07-03 17:10:09.000000000 +0200 -@@ -28,6 +28,8 @@ - /* long quotactl(int cmd, char *special, qid_t id, caddr_t addr) */ - /* this is used by: HPUX,IRIX */ - -+ #define _LINUX_QUOTA_VERSION 1 -+ - #ifdef HAVE_SYS_TYPES_H - #include - #endif diff --git a/packages/samba/samba-3.0.23c/smb-essential-inactive.conf b/packages/samba/samba-3.0.23c/smb-essential-inactive.conf deleted file mode 100644 index d42d63cb9a..0000000000 --- a/packages/samba/samba-3.0.23c/smb-essential-inactive.conf +++ /dev/null @@ -1,34 +0,0 @@ - - -[global] - workgroup = MYWORKGROUP - server string = OpenZaurus Samba Server - - netbios name = %L-INACTIVE - - security = share - - load printers = no - - socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 - - dns proxy = yes - - -#============================ Share Definitions ============================== - -[Samba-Help] - comment = How to enable Samba - path = /usr/share/samba/help - writable = no - public = yes - printable = no - -[printers] - comment = All Printers - path = /usr/spool/samba - guest ok = no - writable = no - printable = yes - browseable = no - diff --git a/packages/samba/samba-3.0.23c/smb-essential.conf b/packages/samba/samba-3.0.23c/smb-essential.conf deleted file mode 100644 index 24cb2a56cb..0000000000 --- a/packages/samba/samba-3.0.23c/smb-essential.conf +++ /dev/null @@ -1,82 +0,0 @@ - - -[global] - workgroup = MYWORKGROUP - server string = OpenZaurus Samba Server - - security = user - - load printers = no - -; guest account = pcguest - - log file = /var/log.%m - - max log size = 50 - - socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 - - dns proxy = yes - - -#============================ Share Definitions ============================== -[homes] - comment = Home Directory for %U - browseable = no - writable = yes - follow symlinks = yes - include = /etc/test.%U - -# This one is useful for people to share files -;[tmp] -; comment = Temporary file space -; path = /tmp -; read only = no -; public = yes - -[printers] - comment = All Printers - path = /usr/spool/samba - guest ok = no - writable = no - printable = yes - browseable = no - -[CompactFlash] - comment = Compact Flash Storage - path = /media/cf - writable = yes - printable = no - public = no - -[SD-MMC] - comment = SD & MMC Storage - path = /media/card - writable = yes - printable = no - public = no - -[RootFS] - comment = Zaurus Rootfs - path = / - writable = yes - printable = no - public = no - follow symlinks = yes - -[Home] - comment = "User Home Directories" - path = /home - writable = yes - printable = no - public = no - follow symlinks = yes - -[Samba-Help] - comment = How to configure Samba - path = /usr/share/samba/help - writable = no - public = yes - printable = no - - -- cgit v1.2.3 From 5deb71f87262364ed86132f969fadd076e20fd5b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 18:17:22 +0000 Subject: zd1211: Clean up duplicate files --- packages/zd1211/files/.mtn2git_empty | 0 packages/zd1211/files/makefile-unslung.patch | 48 ++++++++++++++++++++++ packages/zd1211/files/unslung-iwpriv-hack.patch | 19 +++++++++ packages/zd1211/files/unslung-writel-logging.patch | 14 +++++++ packages/zd1211/zd1211-r83/makefile-unslung.patch | 48 ---------------------- .../zd1211/zd1211-r83/unslung-iwpriv-hack.patch | 19 --------- .../zd1211/zd1211-r83/unslung-writel-logging.patch | 14 ------- packages/zd1211/zd1211_r59.bb | 35 ---------------- packages/zd1211/zd1211_r67.bb | 35 ---------------- packages/zd1211/zd1211_r74.bb | 38 ----------------- 10 files changed, 81 insertions(+), 189 deletions(-) create mode 100644 packages/zd1211/files/.mtn2git_empty create mode 100644 packages/zd1211/files/makefile-unslung.patch create mode 100644 packages/zd1211/files/unslung-iwpriv-hack.patch create mode 100644 packages/zd1211/files/unslung-writel-logging.patch delete mode 100644 packages/zd1211/zd1211-r83/makefile-unslung.patch delete mode 100644 packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch delete mode 100644 packages/zd1211/zd1211-r83/unslung-writel-logging.patch delete mode 100644 packages/zd1211/zd1211_r59.bb delete mode 100644 packages/zd1211/zd1211_r67.bb delete mode 100644 packages/zd1211/zd1211_r74.bb (limited to 'packages') diff --git a/packages/zd1211/files/.mtn2git_empty b/packages/zd1211/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zd1211/files/makefile-unslung.patch b/packages/zd1211/files/makefile-unslung.patch new file mode 100644 index 0000000000..4edcbb7a9d --- /dev/null +++ b/packages/zd1211/files/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/files/unslung-iwpriv-hack.patch b/packages/zd1211/files/unslung-iwpriv-hack.patch new file mode 100644 index 0000000000..64f3806140 --- /dev/null +++ b/packages/zd1211/files/unslung-iwpriv-hack.patch @@ -0,0 +1,19 @@ +--- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 ++++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 +@@ -349,8 +349,14 @@ + { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, + { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, + { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, +- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, +- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// HACK HACK HACK - The following two lines are commented out in order to make ++// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions ++// can only handle up to 16 iwpriv entries in this structure. Yes, the correct ++// fix is to patch the Wireless Extensions in the Unslung kernel. This hack ++// should be removed when that's actually done. ~mwester 27APR2006 ++// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, ++// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, ++// End of HACK + { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, + { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, + }; diff --git a/packages/zd1211/files/unslung-writel-logging.patch b/packages/zd1211/files/unslung-writel-logging.patch new file mode 100644 index 0000000000..00d54d7d68 --- /dev/null +++ b/packages/zd1211/files/unslung-writel-logging.patch @@ -0,0 +1,14 @@ +--- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 ++++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 +@@ -652,7 +652,10 @@ + count++; + + if (count > 5) { +- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); ++// You are going to see this often enough on Unslung that we might as well put it in ++// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 ++// ++ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); + break; + } + } diff --git a/packages/zd1211/zd1211-r83/makefile-unslung.patch b/packages/zd1211/zd1211-r83/makefile-unslung.patch deleted file mode 100644 index 4edcbb7a9d..0000000000 --- a/packages/zd1211/zd1211-r83/makefile-unslung.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- zd1211-driver-r77/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 -+++ zd1211-driver-r77/Makefile 2006-02-25 17:11:27.000000000 +0100 -@@ -4,24 +4,23 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+CC ?= gcc -+CPP ?= g++ -+LD ?= ld - --MODPATH := /lib/modules/$(shell uname -r) -+MODPATH ?= /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this --KERN_26=y -+#KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+KERNEL_SOURCE ?= $(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b - ZD1211REV_B=0 - --SRC_DIR=src --DEFINES=-D__KERNEL__ -DMODULE=1 -+SRC_DIR=src -+DEFINES ?=-D__KERNEL__ -DMODULE=1 - - - -@@ -227,9 +226,9 @@ - depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch b/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch deleted file mode 100644 index 64f3806140..0000000000 --- a/packages/zd1211/zd1211-r83/unslung-iwpriv-hack.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- zd1211-driver-r74/src/zd1205.c~ 2006-04-16 09:42:15.000000000 -0500 -+++ zd1211-driver-r74/src/zd1205.c 2006-04-27 12:29:03.000000000 -0500 -@@ -349,8 +349,14 @@ - { SIOCIWFIRSTPRIV + 0xA, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "connect" }, - { SIOCIWFIRSTPRIV + 0xB, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_mac_mode" }, - { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, -- { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -- { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// HACK HACK HACK - The following two lines are commented out in order to make -+// iwpriv work on Unslung (2.4.22 kernel) - this kernel's Wireless Extensions -+// can only handle up to 16 iwpriv entries in this structure. Yes, the correct -+// fix is to patch the Wireless Extensions in the Unslung kernel. This hack -+// should be removed when that's actually done. ~mwester 27APR2006 -+// { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" /* has been removed */ }, -+// { SIOCIWFIRSTPRIV + 0xE, 0, 0, "load_conf" /* has been removed */ }, -+// End of HACK - { SIOCIWFIRSTPRIV + 0xF, 0, IW_PRIV_TYPE_CHAR | 14, "get_Region" }, - { SIOCIWFIRSTPRIV + 0x9,IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_Region" }, - }; diff --git a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch b/packages/zd1211/zd1211-r83/unslung-writel-logging.patch deleted file mode 100644 index 00d54d7d68..0000000000 --- a/packages/zd1211/zd1211-r83/unslung-writel-logging.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- zd1211-driver-r74/src/zd1211.c~ 2006-04-09 12:28:06.000000000 -0500 -+++ zd1211-driver-r74/src/zd1211.c 2006-04-27 12:38:55.000000000 -0500 -@@ -652,7 +652,10 @@ - count++; - - if (count > 5) { -- printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious"); -+// You are going to see this often enough on Unslung that we might as well put it in -+// the syslog and fix it so it has a nl on the end. Sigh. ~mwester, 27APR06 -+// -+ printk(KERN_ERR "1211_readl failed for 5 attempts...Very Serious\n"); - break; - } - } diff --git a/packages/zd1211/zd1211_r59.bb b/packages/zd1211/zd1211_r59.bb deleted file mode 100644 index 2ab0f2c5b2..0000000000 --- a/packages/zd1211/zd1211_r59.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r3" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1 \ - " - -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - " - -S = "${WORKDIR}/zd1211-driver-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ - 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNEL_VERSION=${KERNEL_VERSION}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} - diff --git a/packages/zd1211/zd1211_r67.bb b/packages/zd1211/zd1211_r67.bb deleted file mode 100644 index 2ab0f2c5b2..0000000000 --- a/packages/zd1211/zd1211_r67.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r3" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1 \ - " - -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - " - -S = "${WORKDIR}/zd1211-driver-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ - 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNEL_VERSION=${KERNEL_VERSION}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} - diff --git a/packages/zd1211/zd1211_r74.bb b/packages/zd1211/zd1211_r74.bb deleted file mode 100644 index bb23071835..0000000000 --- a/packages/zd1211/zd1211_r74.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik " -LICENSE = "GPL" -PR = "r2" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1 \ - file://zd1211-endian-fix.patch;patch=1 \ - " - -SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile-unslung.patch;patch=1 \ - file://zd1211-endian-fix.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1 \ - " - -S = "${WORKDIR}/zd1211-driver-${PV}" - -inherit module - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ - 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNEL_VERSION=${KERNEL_VERSION}' \ - 'CC=${KERNEL_CC}' \ - 'LD=${KERNEL_LD}' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/zd1211*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} -- cgit v1.2.3 From cb5dffee80ac91dea81e10d42727269a73d186b1 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 18:20:49 +0000 Subject: samba: Move MAINTAINER/LICENCE to .inc --- packages/samba/samba.inc | 1 + packages/samba/samba_3.0.23c.bb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index 1f38f131e2..b5995c1b2e 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -1,6 +1,7 @@ SECTION = "console/network" DEPENDS = readline LICENSE = "GPL" +MAINTAINER = "Oyvind Repvik " PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc" FILES_cifs = "${bindir}/mount.cifs" diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index e129b241b3..4425449345 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -1,5 +1,3 @@ -LICENCE="GPL-2" -MAINTAINER="Oyvind Repvik " PR = "r0" SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ -- cgit v1.2.3 From fb5cfbd9b510692852e9276d0ee99039338d66cf Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 18:37:49 +0000 Subject: initscripts-slugos: Fix S06alignment link removal --- packages/initscripts/initscripts-slugos_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index f64e11dfe4..4fb6926490 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -11,7 +11,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.10" +PR := "${PR}.11" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" @@ -64,7 +64,7 @@ do_install_append() { # udev will run at S04 if installed rm ${D}${sysconfdir}/rcS.d/S03sysfs rm ${D}${sysconfdir}/rcS.d/S38devpts.sh - rm ${D}${sysconfdir}/rcS.d/S06alignment + rm -f ${D}${sysconfdir}/rcS.d/S06alignment rm ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh rm ${D}${sysconfdir}/rc0.d/S25save-rtc.sh rm ${D}${sysconfdir}/rc6.d/S25save-rtc.sh -- cgit v1.2.3 From 99b80b8615c8e5662827252cf6cb7fc12144f8c2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 Sep 2006 18:44:19 +0000 Subject: qemu-native: Create qemu-native.bbclass so all versions have the gcc 3.x detection code --- packages/qemu/qemu-native.inc | 13 +++++++++++++ packages/qemu/qemu-native_0.7.0.bb | 3 +-- packages/qemu/qemu-native_0.8.0.bb | 3 +-- packages/qemu/qemu-native_0.8.1.bb | 2 +- packages/qemu/qemu-native_0.8.2.bb | 3 +-- packages/qemu/qemu-native_cvs.bb | 13 +------------ 6 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 packages/qemu/qemu-native.inc (limited to 'packages') diff --git a/packages/qemu/qemu-native.inc b/packages/qemu/qemu-native.inc new file mode 100644 index 0000000000..049aa675f8 --- /dev/null +++ b/packages/qemu/qemu-native.inc @@ -0,0 +1,13 @@ +FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" +prefix = "${STAGING_DIR}/${BUILD_SYS}" + +python __anonymous() { + from bb import which, data + + path = data.getVar('PATH', d) + if len(which(path, 'gcc-3.4')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d) + elif len(which(path, 'gcc-3.3')) != 0: + data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d) + +} diff --git a/packages/qemu/qemu-native_0.7.0.bb b/packages/qemu/qemu-native_0.7.0.bb index acb5543a90..bad8bd7bf4 100644 --- a/packages/qemu/qemu-native_0.7.0.bb +++ b/packages/qemu/qemu-native_0.7.0.bb @@ -1,5 +1,4 @@ require qemu_${PV}.bb inherit native S = "${WORKDIR}/qemu-${PV}" -prefix = "${STAGING_DIR}/${BUILD_SYS}" - +require qemu-native.inc diff --git a/packages/qemu/qemu-native_0.8.0.bb b/packages/qemu/qemu-native_0.8.0.bb index 2b143bdc0f..9613f7d614 100644 --- a/packages/qemu/qemu-native_0.8.0.bb +++ b/packages/qemu/qemu-native_0.8.0.bb @@ -1,6 +1,5 @@ require qemu_${PV}.bb inherit native -FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" +require qemu-native.inc S = "${WORKDIR}/qemu-${PV}" -prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_0.8.1.bb b/packages/qemu/qemu-native_0.8.1.bb index acb5543a90..9613f7d614 100644 --- a/packages/qemu/qemu-native_0.8.1.bb +++ b/packages/qemu/qemu-native_0.8.1.bb @@ -1,5 +1,5 @@ require qemu_${PV}.bb inherit native +require qemu-native.inc S = "${WORKDIR}/qemu-${PV}" -prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_0.8.2.bb b/packages/qemu/qemu-native_0.8.2.bb index e064723e4e..c0b1cd4ee3 100644 --- a/packages/qemu/qemu-native_0.8.2.bb +++ b/packages/qemu/qemu-native_0.8.2.bb @@ -1,7 +1,6 @@ require qemu_${PV}.bb EXTRA_OECONF = "" inherit native -FILESPATH =. "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qemu-${PV}:" +require qemu-native.inc S = "${WORKDIR}/qemu-${PV}" -prefix = "${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/qemu/qemu-native_cvs.bb b/packages/qemu/qemu-native_cvs.bb index 49d6c17b64..639f9a6a7c 100644 --- a/packages/qemu/qemu-native_cvs.bb +++ b/packages/qemu/qemu-native_cvs.bb @@ -1,14 +1,3 @@ require qemu_cvs.bb inherit native -prefix = "${STAGING_DIR}/${BUILD_SYS}" - -python __anonymous() { - from bb import which, data - - path = data.getVar('PATH', d) - if len(which(path, 'gcc-3.4')) != 0: - data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d) - elif len(which(path, 'gcc-3.3')) != 0: - data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d) - -} +require qemu-native.inc -- cgit v1.2.3 From 9a18fe9bb13d36dd189043cb9b4467596e78c5a2 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 20:41:04 +0000 Subject: lcdproc: Split off driver packages (large). Change MAINTAINER --- packages/lcdproc/lcdproc_0.5.0.bb | 65 +++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/lcdproc/lcdproc_0.5.0.bb b/packages/lcdproc/lcdproc_0.5.0.bb index 4d933fc064..c5ac8a2ddb 100644 --- a/packages/lcdproc/lcdproc_0.5.0.bb +++ b/packages/lcdproc/lcdproc_0.5.0.bb @@ -3,36 +3,89 @@ shipped with this package can be used to acquire various kinds of system stats." HOMEPAGE = "http://lcdproc.org" LICENSE = "GPL" PRIORITY = "optional" -MAINTAINER = "Rene Wagner " +MAINTAINER = "Oyvind Repvik " SECTION = "utils" +PR="r1" -DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'all').find('curses') != -1) and 'ncurses' or ''}" +DEPENDS = "libusb ncurses" RRECOMMENDS_lcdproc = "lcdd" SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/lcdproc-${PV}.tar.gz" inherit autotools update-rc.d -PACKAGES =+ "lcdd" +PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan" CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf" FILES_lcdd = "${CONFFILES_lcdd} \ ${sbindir}/LCDd \ - ${sysconfdir}/init.d/lcdd \ - ${libdir}/lcdproc/" + ${sysconfdir}/init.d/lcdd" + FILES_lcdproc = "${CONFFILES_lcdproc} \ ${bindir}/lcdproc \ ${sysconfdir}/init.d/lcdproc" +# Driver packages + +FILES_lcdd-driver-cfontz = "${libdir}/lcdproc/CFontz*.so" +FILES_lcdd-driver-bayrad = "${libdir}/lcdproc/bayrad.so" +FILES_lcdd-driver-hd44780nousb = "${libdir}/lcdproc/hd44780nousb.so" +FILES_lcdd-driver-hd44780 = "${libdir}/lcdproc/hd44780.so" +FILES_lcdd-driver-mtxorb = "${libdir}/lcdproc/MtxOrb.so" +FILES_lcdd-driver-serialvfd = "${libdir}/lcdproc/serialVFD.so" +FILES_lcdd-driver-curses = "${libdir}/lcdproc/curses.so" +FILES_lcdd-driver-text = "${libdir}/lcdproc/text.so" +FILES_lcdd-driver-sed = "${libdir}/lcdproc/sed*.so" +FILES_lcdd-driver-cwlnx = "${libdir}/lcdproc/CwLnx.so" +FILES_lcdd-driver-glk = "${libdir}/lcdproc/glk.so" +FILES_lcdd-driver-icp-a106 = "${libdir}/lcdproc/icp_a106.so" +FILES_lcdd-driver-imon = "${libdir}/lcdproc/imon.so" +FILES_lcdd-driver-joy = "${libdir}/lcdproc/joy.so" +FILES_lcdd-driver-lb216 = "${libdir}/lcdproc/lb216.so" +FILES_lcdd-driver-lcdm001 = "${libdir}/lcdproc/lcdm001.so" +FILES_lcdd-driver-lcterm = "${libdir}/lcdproc/lcterm.so" +FILES_lcdd-driver-ms6931 = "${libdir}/lcdproc/ms6931.so" +FILES_lcdd-driver-mtc-s16209x = "${libdir}/lcdproc/mtc_s16209x.so" +FILES_lcdd-driver-noritakevfd = "${libdir}/lcdproc/NoritakeVFD.so" +FILES_lcdd-driver-pyramid = "${libdir}/lcdproc/pyramid.so" +FILES_lcdd-driver-sli = "${libdir}/lcdproc/sli.so" +FILES_lcdd-driver-stv5730 = "${libdir}/lcdproc/stv5730.so" +FILES_lcdd-driver-t6963 = "${libdir}/lcdproc/t6963.so" +FILES_lcdd-driver-tyan = "${libdir}/lcdproc/tyan.so" + + +# Install-all-drivers-hack: + +DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \ + lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \ + lcdd-driver-curses lcdd-driver-text \ + lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \ + lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \ + lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \ + lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \ + lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan" + +# USB / no USB trickery + +CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" + INITSCRIPT_PACKAGES = "lcdd lcdproc" INITSCRIPT_NAME_lcdd = "lcdd" INITSCRIPT_NAME_lcdproc = "lcdproc" INITSCRIPT_PARAMS_lcdd = "defaults 70 21" INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" -EXTRA_OECONF = "${@'--enable-drivers=' + (bb.data.getVar('LCDPROC_DRIVERS',d) or 'all')}" +EXTRA_OECONF = "--enable-drivers=all" do_install () { # binaries -- cgit v1.2.3 From 64610d0e500cafc177e74555ea38ecdc3ede5a17 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sat, 2 Sep 2006 20:42:55 +0000 Subject: lcdproc: Add forgotten --enable-libusb --- packages/lcdproc/lcdproc_0.5.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/lcdproc/lcdproc_0.5.0.bb b/packages/lcdproc/lcdproc_0.5.0.bb index c5ac8a2ddb..8c7c53d17b 100644 --- a/packages/lcdproc/lcdproc_0.5.0.bb +++ b/packages/lcdproc/lcdproc_0.5.0.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" PRIORITY = "optional" MAINTAINER = "Oyvind Repvik " SECTION = "utils" -PR="r1" +PR="r2" DEPENDS = "libusb ncurses" RRECOMMENDS_lcdproc = "lcdd" @@ -85,7 +85,7 @@ INITSCRIPT_NAME_lcdproc = "lcdproc" INITSCRIPT_PARAMS_lcdd = "defaults 70 21" INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" -EXTRA_OECONF = "--enable-drivers=all" +EXTRA_OECONF = "--enable-drivers=all --enable-libusb" do_install () { # binaries -- cgit v1.2.3 From c489f4ed0a4776ecae5f852baf159ca0750d3f3d Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 3 Sep 2006 02:11:15 +0000 Subject: DSM-G600A support added (Artop IDE and Via velocity patches) --- packages/linux/ixp4xx-kernel_2.6.17.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel_2.6.17.bb b/packages/linux/ixp4xx-kernel_2.6.17.bb index b08129799a..c27f73330b 100644 --- a/packages/linux/ixp4xx-kernel_2.6.17.bb +++ b/packages/linux/ixp4xx-kernel_2.6.17.bb @@ -3,12 +3,12 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "3" +PR_CONFIG = "4" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r2.${PR_CONFIG}" +PR = "r3.${PR_CONFIG}" require ixp4xx-kernel.inc @@ -20,6 +20,7 @@ IXP4XX_PATCHES = "" SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/2.6.17" # IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/patch-2.6.17-ide1;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/01-nas100d-leds.patch;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/03-nslu2-leds.patch;patch=1" @@ -33,3 +34,5 @@ IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1" IXP4XX_PATCHES += "${SVN_SRC}/76-dsmg600-pwrbtn.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/77-velocity-module.patch;patch=1" +IXP4XX_PATCHES += "${SVN_SRC}/78-velocity-BE.patch;patch=1" -- cgit v1.2.3 From b834da52b954c6c48a5fdf6f46b22b7d54a4afdc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 3 Sep 2006 13:32:14 +0000 Subject: cairo 1.2.4: Drop broken patch pending a rethink --- packages/cairo/cairo_1.2.4.bb | 3 +-- packages/cairo/files/cairo-fixed.patch | 43 ---------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 packages/cairo/files/cairo-fixed.patch (limited to 'packages') diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb index 662f685fb9..9f8425c03f 100644 --- a/packages/cairo/cairo_1.2.4.bb +++ b/packages/cairo/cairo_1.2.4.bb @@ -6,8 +6,7 @@ DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" PR = "r1" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ - file://cairo-fixed.patch;patch=1" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/cairo/files/cairo-fixed.patch b/packages/cairo/files/cairo-fixed.patch deleted file mode 100644 index 8df54d9cb5..0000000000 --- a/packages/cairo/files/cairo-fixed.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c ---- cairo-1.2.4/src/cairo-fixed.c 2006-06-10 07:07:37.000000000 +0300 -+++ cairo-1.2.4-new/src/cairo-fixed.c 2006-08-25 13:06:26.000000000 +0300 -@@ -43,12 +43,6 @@ - } - - cairo_fixed_t --_cairo_fixed_from_double (double d) --{ -- return (cairo_fixed_t) floor (d * 65536 + 0.5); --} -- --cairo_fixed_t - _cairo_fixed_from_26_6 (uint32_t i) - { - return i << 10; -diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h ---- cairo-1.2.4/src/cairoint.h 2006-08-18 17:20:16.000000000 +0300 -+++ cairo-1.2.4-new/src/cairoint.h 2006-08-25 13:14:07.000000000 +0300 -@@ -1117,8 +1117,21 @@ - - #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1) - --cairo_private cairo_fixed_t --_cairo_fixed_from_double (double d); -+#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */ -+ -+#ifdef WORDS_BIGENDIAN -+#define iman 1 -+#else -+#define iman 0 -+#endif -+ -+static inline cairo_fixed_t -+_cairo_fixed_from_double (double d) -+{ -+ d = d + CAIRO_DOUBLE2FIX_MAGIC; -+ -+ return ((cairo_fixed_t *) &d)[iman]; -+} - - cairo_private cairo_fixed_t - _cairo_fixed_from_26_6 (uint32_t i); -- cgit v1.2.3 From 4a7d637ba7ff97733a37d50927475c75c86f6e43 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 3 Sep 2006 13:56:02 +0000 Subject: networkmanager: RDEPEND on iproute2 --- packages/networkmanager/networkmanager_0.6.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb index e9c02ba3dd..80a88d384e 100644 --- a/packages/networkmanager/networkmanager_0.6.4.bb +++ b/packages/networkmanager/networkmanager_0.6.4.bb @@ -5,9 +5,9 @@ HOMEPAGE = "http://www.gnome.org" MAINTAINER = "Milan Plzik " PRIORITY = "optional" DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" -RDEPENDS = "wpa-supplicant dhcdbd gnome-keyring hicolor-icon-theme" +RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r1" +PR = "r2" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ -- cgit v1.2.3 From d5920d9869e2c5d3ef23242537b09664b2144bfc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 3 Sep 2006 19:11:46 +0000 Subject: libsndfile: slightly improve packaging --- packages/libsndfile/libsndfile1_1.0.16.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libsndfile/libsndfile1_1.0.16.bb b/packages/libsndfile/libsndfile1_1.0.16.bb index e103b6636f..fb3ed30f38 100644 --- a/packages/libsndfile/libsndfile1_1.0.16.bb +++ b/packages/libsndfile/libsndfile1_1.0.16.bb @@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo" MAINTAINER = "Michael 'Mickey' Lauer " SECTION = "libs/multimedia" LICENSE = "LGPL" -PR = "r0" +PR = "r1" SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz" S = "${WORKDIR}/libsndfile-${PV}" @@ -17,5 +17,4 @@ do_stage() { } #FIXME package the rest -PACKAGES = "${PN}" FILES_${PN} = "${libdir}/libsndfile.so*" -- cgit v1.2.3 From 7bca1f212429a1ec73847091de287afdae90dbb6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 3 Sep 2006 19:13:45 +0000 Subject: libpcap: remove 0.7.2 and 0.8.3 --- packages/libpcap/libpcap-0.7.2/.mtn2git_empty | 0 packages/libpcap/libpcap-0.7.2/configure.patch | 43 -- packages/libpcap/libpcap-0.7.2/ldflags.patch | 27 -- .../libpcap/libpcap-0.7.2/libpcap-shared.patch | 526 --------------------- packages/libpcap/libpcap-0.8.3/.mtn2git_empty | 0 packages/libpcap/libpcap-0.8.3/shared.patch | 118 ----- packages/libpcap/libpcap_0.7.2.bb | 30 -- packages/libpcap/libpcap_0.8.3.bb | 30 -- 8 files changed, 774 deletions(-) delete mode 100644 packages/libpcap/libpcap-0.7.2/.mtn2git_empty delete mode 100644 packages/libpcap/libpcap-0.7.2/configure.patch delete mode 100644 packages/libpcap/libpcap-0.7.2/ldflags.patch delete mode 100644 packages/libpcap/libpcap-0.7.2/libpcap-shared.patch delete mode 100644 packages/libpcap/libpcap-0.8.3/.mtn2git_empty delete mode 100644 packages/libpcap/libpcap-0.8.3/shared.patch delete mode 100644 packages/libpcap/libpcap_0.7.2.bb delete mode 100644 packages/libpcap/libpcap_0.8.3.bb (limited to 'packages') diff --git a/packages/libpcap/libpcap-0.7.2/.mtn2git_empty b/packages/libpcap/libpcap-0.7.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libpcap/libpcap-0.7.2/configure.patch b/packages/libpcap/libpcap-0.7.2/configure.patch deleted file mode 100644 index d9275b561b..0000000000 --- a/packages/libpcap/libpcap-0.7.2/configure.patch +++ /dev/null @@ -1,43 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.7.2/./configure.in~configure -+++ libpcap-0.7.2/./configure.in -@@ -7,9 +7,10 @@ - dnl - - AC_REVISION($Revision: 1.94.2.1 $) --AC_INIT(pcap.c) -+AC_INIT -+AC_CONFIG_SRCDIR([pcap.c]) - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - - AC_LBL_C_INIT(V_CCOPT, V_INCLS) - AC_LBL_C_INLINE -@@ -210,11 +211,7 @@ - sinix*) - AC_MSG_CHECKING(if SINIX compiler defines sinix) - AC_CACHE_VAL(ac_cv_cc_sinix_defined, -- AC_TRY_COMPILE( -- [], -- [int i = sinix;], -- ac_cv_cc_sinix_defined=yes, -- ac_cv_cc_sinix_defined=no)) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int i = sinix;]])],[ac_cv_cc_sinix_defined=yes],[ac_cv_cc_sinix_defined=no])) - AC_MSG_RESULT($ac_cv_cc_sinix_defined) - if test $ac_cv_cc_sinix_defined = no ; then - AC_DEFINE(sinix,1,[on sinix]) -@@ -250,7 +247,8 @@ - - AC_CONFIG_HEADER(config.h) - --AC_OUTPUT(Makefile) -+AC_CONFIG_FILES([Makefile]) -+AC_OUTPUT - - if test -f .devel ; then - make depend diff --git a/packages/libpcap/libpcap-0.7.2/ldflags.patch b/packages/libpcap/libpcap-0.7.2/ldflags.patch deleted file mode 100644 index 8802a7e073..0000000000 --- a/packages/libpcap/libpcap-0.7.2/ldflags.patch +++ /dev/null @@ -1,27 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.7.2/Makefile.in~ldflags -+++ libpcap-0.7.2/Makefile.in -@@ -59,6 +59,10 @@ - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) - CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) - -+# Standard LDFLAGS -+LDFLAGS = @LDFLAGS@ -+LIBS = -lc -+ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -@@ -118,7 +122,7 @@ - $(SHAREDLIB): $(OBJ_PIC) - -@rm -f $@ - -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -- $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) $(LIBS) $(LDFLAGS) - ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) - ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) - diff --git a/packages/libpcap/libpcap-0.7.2/libpcap-shared.patch b/packages/libpcap/libpcap-0.7.2/libpcap-shared.patch deleted file mode 100644 index 18b0250c16..0000000000 --- a/packages/libpcap/libpcap-0.7.2/libpcap-shared.patch +++ /dev/null @@ -1,526 +0,0 @@ ---- libpcap-0.7.2.orig/nametoaddr.c -+++ libpcap-0.7.2/nametoaddr.c -@@ -310,7 +310,7 @@ - e = ep = (u_char *)malloc(6); - - while (*s) { -- if (*s == ':') -+ if (*s == ':' || *s == '.') - s += 1; - d = xdtoi(*s++); - if (isxdigit((unsigned char)*s)) { ---- libpcap-0.7.2.orig/debian/libpcap0.postinst -+++ libpcap-0.7.2/debian/libpcap0.postinst -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+if [ "$1" = "configure" ]; then -+ ldconfig -+fi -+ -+#DEBHELPER# ---- libpcap-0.7.2.orig/debian/copyright -+++ libpcap-0.7.2/debian/copyright -@@ -0,0 +1,37 @@ -+This package was debianized by Anand Kumria on -+Sun, 12 Nov 2000 03:19:44 +1100. -+ -+It was downloaded from http://www.tcpdump.org/ -+ -+Upstream Author(s): patches@tcpdump.org -+ -+Copyright: -+ -+The licence-style of this software is BSD. However this version (0.5) -+fails to include a file containing the licence. A similar version -+of the licence is available in /usr/share/common-licenses/BSD. -+Future versions of libpcap will contain the licence located at -+ -+which is what I describe below. -+ -+The differences are: -+ - Item 3, replace "University" with "Authors" -+ - The LEGALESE (uppercase portion) ends after -+ the words "A PARTICULAR PURPOSE" -+ - The copyright holders are listed below (the CREDITS -+ file is canonical, this is merely a convienent listing) -+ -+people who contributed to libpcap or tcpdump: -+ Bill Fenner -+ Assar Westerlund -+ Alexei -+ Jun-ichiro itojun Hagino -+ Guy Harris -+ Torsten Landschoff -+ Michael Richardson -+ -+The original LBL crew: -+ Steve McCanne -+ Craig Leres -+ Van Jacobson -+ ---- libpcap-0.7.2.orig/debian/libpcap0.postrm -+++ libpcap-0.7.2/debian/libpcap0.postrm -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+if [ "$1" = "remove" ]; then -+ ldconfig -+fi -+ -+#DEBHELPER# ---- libpcap-0.7.2.orig/debian/libpcap-dev.dirs -+++ libpcap-0.7.2/debian/libpcap-dev.dirs -@@ -0,0 +1,4 @@ -+usr/lib -+usr/include -+usr/include/net -+usr/share/man/man3 ---- libpcap-0.7.2.orig/debian/README.Debian -+++ libpcap-0.7.2/debian/README.Debian -@@ -0,0 +1,13 @@ -+libpcap for Debian -+------------------ -+ -+ If you receive messages telling you the packet type is not supported -+ or is deprecated check that CONFIG_PACKET is set to either `Y' or `M'. -+ -+ You should also check that /etc/modules.conf has the line -+ -+ alias net-pf-17 af_packet -+ -+ Feel free to report bugs. -+ -+ -- Anand Kumria , Tue, 28 Nov 2000 02:04:28 EST ---- libpcap-0.7.2.orig/debian/libpcap0.docs -+++ libpcap-0.7.2/debian/libpcap0.docs -@@ -0,0 +1,2 @@ -+README -+CREDITS ---- libpcap-0.7.2.orig/debian/libpcap0.7.postinst -+++ libpcap-0.7.2/debian/libpcap0.7.postinst -@@ -0,0 +1,8 @@ -+#! /bin/sh -+ -+if [ "$1" = "configure" ]; then -+ ldconfig -+fi -+ -+#DEBHELPER# -+ ---- libpcap-0.7.2.orig/debian/libpcap0.7.postrm -+++ libpcap-0.7.2/debian/libpcap0.7.postrm -@@ -0,0 +1,8 @@ -+#! /bin/sh -+ -+if [ "$1" = "remove" ]; then -+ ldconfig -+fi -+ -+#DEBHELPER# -+ ---- libpcap-0.7.2.orig/debian/changelog -+++ libpcap-0.7.2/debian/changelog -@@ -0,0 +1,135 @@ -+libpcap (0.7.2-1) unstable; urgency=low -+ -+ * New upstream release (closes: #145538). -+ * debian/rules: Build the library with _FILE_OFFSET_BITS set to 64 -+ to allow for files bigger than 2GB (closes: #129213). -+ * Rename the library package to libpcap0.7 and change the SONAME so that we -+ can account for interface changes (closes: #132359). -+ * Run ldconfig as appropriate (lintian). -+ * Remove watch.ex template and the silly symlink from libpcap-dev's -+ documentation to libpcap0 (lintian). -+ -+ -- Torsten Landschoff Sat, 3 Aug 2002 23:33:56 +0200 -+ -+libpcap (0.6.2-2) unstable; urgency=low -+ -+ * debian/control: Change section of libpcap0 from net to libs -+ (Debian installer message). -+ * aclocal.m4: Treat the ia64 as a cpu which can't handle unaligned -+ memory access (closes: #112152). Thanks for the report go to -+ John R. Daily. -+ -+ -- Torsten Landschoff Fri, 14 Sep 2001 10:15:52 +0200 -+ -+libpcap (0.6.2-1) unstable; urgency=medium -+ -+ * New upstream release. -+ * debian/control: Removed Build-Depends already satisfied by the -+ build-essential package. -+ * gencode.c (gen_scode): Add the missing default branch of the protocol -+ family switch (closes: 88688). -+ * debian/libpcap.post{rm,inst}: Run ldconfig (lintian). -+ * debian/copyright: Fix the "similiar" typo (lintian). -+ -+ -- Torsten Landschoff Tue, 6 Mar 2001 04:27:27 +0100 -+ -+libpcap (0.6.1-2) unstable; urgency=low -+ -+ * debian/rules: Changed the shlibs info so that only pcap 0.6 -+ is okay for packages linked against this version. -+ -+ -- Torsten Landschoff Thu, 18 Jan 2001 01:13:20 +0100 -+ -+libpcap (0.6.1-1) unstable; urgency=low -+ -+ * Taking back the package. Kudos to Anand for helping out. -+ * debian/rules: Pass --enable-ipv6 to configure (closes: #80223). -+ -+ -- Torsten Landschoff Tue, 16 Jan 2001 15:40:37 +0100 -+ -+libpcap (0.5.2-2) unstable; urgency=low -+ -+ * Update config.guess and config.sub (Closes #26031) -+ * Source builds would not always work. Fix that. -+ * Kernel interface problem is really a module not loaded problem. -+ Note this in README.Debian. (Closes #21356) -+ -+ -- Anand Kumria Tue, 28 Nov 2000 02:03:25 +1100 -+ -+libpcap (0.5.2-1) unstable; urgency=low -+ -+ * New upstream release -+ * New maintainer -+ * Migrate to Debhelper and insert Build-Depends -+ -+ -- Anand Kumria Sun, 12 Nov 2000 03:19:44 +1100 -+ -+libpcap (0.4a6-3) unstable; urgency=low -+ -+ * New maintainer. -+ * scanner.l: Allow a 12 digit hex number as ether address as well as -+ BB.BB.BB.BB.BB.BB (closes: #48735) -+ * nametoaddr.c (pcap_ether_aton): Adjust for change in scanner.l -+ -+ -- Torsten Landschoff Mon, 22 Nov 1999 02:39:45 +0100 -+ -+libpcap (0.4a6-2.1) unstable; urgency=low -+ -+ * Non maintainer upload. -+ config.{guess,sub} changed to recognize a Arm architecture. -+ -+ -- Turbo Fredriksson Thu, 20 Aug 1998 23:12:36 -0400 -+ -+libpcap (0.4a6-2) frozen unstable; urgency=low -+ -+ * renamed /usr/doc/libpcap to /usr/doc/libpcap0 (should fix several -+ lintian warnings) -+ * updated standards-version -+ * rebuild with latest debmake -+ -+ -- Peter Tobias Mon, 30 Mar 1998 00:46:44 +0200 -+ -+ -+libpcap (0.4a6-1) unstable; urgency=low -+ -+ * upgraded to latest upstream version, fixes: Bug#17164 -+ * added patch from Michael Alan Dorman -+ for building libpcap on alpha systems, fixes: Bug#15556 -+ * fixed aclocal.m4 script -+ -+ -- Peter Tobias Sat, 31 Jan 1998 23:19:42 +0100 -+ -+ -+libpcap (0.4a2-2) unstable; urgency=low -+ -+ * fixed detection of IFF_LOOPBACK for linux systems -+ * link shared library with -l -+ -+ -- Peter Tobias Wed, 19 Nov 1997 23:44:34 +0100 -+ -+ -+libpcap (0.4a2-1) unstable; urgency=low -+ -+ * new maintainer -+ * latest upstream release -+ * libc6 version -+ * compiled with _REENTRANT -+ -+ -- Peter Tobias Wed, 17 Sep 1997 20:40:01 +0200 -+ -+ -+libpcap (0.3.1a3-1) unstable; urgency=low -+ -+ * Latest upstream release. Fixes bug #6670. -+ -+ -- Karl Sackett Wed, 2 Apr 1997 10:19:28 -0600 -+ -+ -+libpcap (0.3-1) unstable; urgency=low -+ -+ * First Debian release. -+ * Makefile.in: supports libpcap.so target. -+ -+ -- Karl Sackett Wed, 8 Jan 1997 09:38:31 -0600 -+ -+ ---- libpcap-0.7.2.orig/debian/rules -+++ libpcap-0.7.2/debian/rules -@@ -0,0 +1,87 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=2 -+ -+# shared library versions, option 1 -+version=0.7.2 -+major=0.7 -+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -+#version=`ls src/.libs/lib*.so.* | \ -+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -+#major=`ls src/.libs/lib*.so.* | \ -+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ -+ CFLAGS=-D_FILE_OFFSET_BITS=64 ./configure --prefix=/usr --mandir=\$${prefix}/share/man \ -+ --enable-ipv6 --infodir=\$${prefix}/share/info -+ # Add here commands to compile the package. -+ $(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp -+ -+ # Add here commands to clean up after the build process. -+ -$(MAKE) distclean -+ -+ rm -f net/net -+ -+ dh_clean -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ $(MAKE) install prefix=`pwd`/debian/libpcap-dev/usr -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+ # -+ # build libpcap${major} package by moving files from libpcap-dev -+ # -+ dh_movefiles -plibpcap$(major) --sourcedir=debian/libpcap-dev \ -+ usr/lib/libpcap.so.$(major) \ -+ usr/lib/libpcap.so.$(version) -+ -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+ dh_installmanpages -plibpcap-dev -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs CHANGES -+ dh_link -plibpcap-dev -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_makeshlibs -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- libpcap-0.7.2.orig/debian/control -+++ libpcap-0.7.2/debian/control -@@ -0,0 +1,30 @@ -+Source: libpcap -+Section: devel -+Priority: optional -+Maintainer: Torsten Landschoff -+Build-Depends: debhelper, flex, bison -+Standards-Version: 3.0.1 -+ -+Package: libpcap-dev -+Section: devel -+Architecture: any -+Depends: libpcap0.7 (= ${Source-Version}), libc6-dev -+Description: Development library for libpcap. -+ Includes headers, static libraries, and documentation. -+ -+Package: libpcap0.7 -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: System interface for user-level packet capture. -+ libpcap (Packet CAPture) provides a portable framework for low-level -+ network monitoring. Applications include network statistics collection, -+ security monitoring, network debugging, etc. -+ . -+ Since almost every system vendor provides a different interface for -+ packet capture, and since there are several tools that require this -+ functionality, we've created this system-independent API to ease in -+ porting and to alleviate the need for several system-dependent packet -+ capture modules in each application. -+ . -+ Further information is available at ---- libpcap-0.7.2.orig/scanner.l -+++ libpcap-0.7.2/scanner.l -@@ -75,6 +75,7 @@ - N ([0-9]+|(0X|0x)[0-9A-Fa-f]+) - B ([0-9A-Fa-f][0-9A-Fa-f]?) - W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?) -+X [0-9A-Fa-f] - - %a 15000 - %o 17000 -@@ -261,7 +262,7 @@ - {N} { yylval.i = stoi((char *)yytext); return NUM; } - ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) { - yylval.s = sdup((char *)yytext); return HID; } --{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext); -+({B}:{B}:{B}:{B}:{B}:{B})|({B}\.{B}\.{B}\.{B}\.{B}\.{B}) { yylval.e = pcap_ether_aton((char *)yytext); - return EID; } - {V6} { - #ifdef INET6 -@@ -279,6 +280,8 @@ - #endif /*INET6*/ - } - {B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); } -+{X}{12} { yylval.e = pcap_ether_aton((char *)yytext); return EID;} -+ - icmptype { yylval.i = 0; return NUM; } - icmpcode { yylval.i = 1; return NUM; } - icmp-echoreply { yylval.i = 0; return NUM; } ---- libpcap-0.7.2.orig/Makefile.in -+++ libpcap-0.7.2/Makefile.in -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME -+MAJ=0.7 -+MIN=2 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -48,6 +57,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -67,7 +77,11 @@ - # problem if you don't own the file but can write to the directory. - .c.o: - @rm -f $@ -- $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c -+ -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap-@V_PCAP@.c - CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \ -@@ -80,6 +94,7 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(CSRC:.c=.o) $(GENSRC:.c=.o) # $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -91,15 +106,22 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ -@rm -f $@ -+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - scanner.c: $(srcdir)/scanner.l - @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -107,6 +129,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c -+ - tokdefs.h: grammar.c - grammar.c: $(srcdir)/grammar.y - @rm -f grammar.c tokdefs.h -@@ -118,9 +143,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammar_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ -+ - snprintf.o: $(srcdir)/../tcpdump/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/../tcpdump/missing/snprintf.c - -@@ -135,10 +167,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ -+ - install: - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/packages/libpcap/libpcap-0.8.3/.mtn2git_empty b/packages/libpcap/libpcap-0.8.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libpcap/libpcap-0.8.3/shared.patch b/packages/libpcap/libpcap-0.8.3/shared.patch deleted file mode 100644 index 4d654417c0..0000000000 --- a/packages/libpcap/libpcap-0.8.3/shared.patch +++ /dev/null @@ -1,118 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.8.1/Makefile.in~shared 2003-12-15 02:42:23.000000000 +0100 -+++ libpcap-0.8.1/Makefile.in 2004-01-02 14:46:18.000000000 +0100 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME, if not matching -+MAJ=0.8 -+MIN=3 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -49,6 +58,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -69,6 +79,9 @@ - .c.o: - @rm -f $@ - $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap-@V_PCAP@.c - FSRC = fad-@V_FINDALLDEVS@.c -@@ -83,6 +96,7 @@ - # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot - # hack the extra indirection - OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -94,15 +108,22 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) $(LIBS) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ -@rm -f $@ -+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - scanner.c: $(srcdir)/scanner.l - @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -110,6 +131,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c -+ - pcap.o: version.h - - tokdefs.h: grammar.c -@@ -123,9 +147,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammer_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ -+ - snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c - -@@ -151,10 +182,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ -+ - install: - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/packages/libpcap/libpcap_0.7.2.bb b/packages/libpcap/libpcap_0.7.2.bb deleted file mode 100644 index 1b430c7ece..0000000000 --- a/packages/libpcap/libpcap_0.7.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Network Packet Capture Library" -SECTION = "libs" -PRIORITY = "required" -MAINTAINER = "Greg Gilbert " -LICENSE = "BSD" -SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz;" -SRC_URI_append = " file://libpcap-shared.patch;patch=1" -SRC_URI_append = " file://configure.patch;patch=1" -SRC_URI_append = " file://ldflags.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-pcap=linux" -CPPFLAGS_prepend = "-I${S} " -CFLAGS_prepend = "-I${S} " -CXXFLAGS_prepend = "-I${S} " - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -do_stage () { - install -d ${STAGING_INCDIR}/net - install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h - install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h - install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h - oe_libinstall -a -so libpcap ${STAGING_LIBDIR} -} diff --git a/packages/libpcap/libpcap_0.8.3.bb b/packages/libpcap/libpcap_0.8.3.bb deleted file mode 100644 index bdf68e8d3f..0000000000 --- a/packages/libpcap/libpcap_0.8.3.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Network Packet Capture Library" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -SECTION = "libs" -PR = "r1" - -SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \ - file://shared.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-pcap=linux" -CPPFLAGS_prepend = "-I${S} " -CFLAGS_prepend = "-I${S} " -CXXFLAGS_prepend = "-I${S} " - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -do_stage () { - install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h - install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h - install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h - oe_libinstall -a -so libpcap ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/net - ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h -} -- cgit v1.2.3 From a00c3736cc87257bb0fc7feea1463322236c0d4f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 3 Sep 2006 19:38:18 +0000 Subject: tcpdump: remove 3.8.3; reinstatiate -O2 patch for 3.9.3; remove using local includes --- packages/tcpdump/tcpdump_3.8.3.bb | 17 ----------------- packages/tcpdump/tcpdump_3.9.3.bb | 10 +++++++--- 2 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 packages/tcpdump/tcpdump_3.8.3.bb (limited to 'packages') diff --git a/packages/tcpdump/tcpdump_3.8.3.bb b/packages/tcpdump/tcpdump_3.8.3.bb deleted file mode 100644 index f0274b4e86..0000000000 --- a/packages/tcpdump/tcpdump_3.8.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A sophisticated network protocol dumper" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -SECTION = "console/network" -PRIORITY = "optional" -DEPENDS = "libpcap-0.8.3" -PR = "r1" - -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://fix-paths.patch;patch=1" - -inherit autotools - -do_configure() { - gnu-configize - oe_runconf -} diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb index d3422539ce..2caaa3ab98 100644 --- a/packages/tcpdump/tcpdump_3.9.3.bb +++ b/packages/tcpdump/tcpdump_3.9.3.bb @@ -4,14 +4,18 @@ LICENSE = "BSD" SECTION = "console/network" PRIORITY = "optional" DEPENDS = "libpcap-0.9.3 openssl" -PR = "r0" +PR = "r1" -SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz" +SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch;patch=1" inherit autotools +EXTRA_OECONF = "--without-crypto" + do_configure() { gnu-configize oe_runconf + sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile + sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile } - -- cgit v1.2.3 From 9e256efb9fc1f6df7049927c359fea00ffaf5b51 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 4 Sep 2006 01:27:27 +0000 Subject: litestream: Add package. litestream is a shoutcast-compatible streamer, but tiny and a lot less dependencies --- packages/litestream/.mtn2git_empty | 0 packages/litestream/litestream_1.3RC3.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/litestream/.mtn2git_empty create mode 100644 packages/litestream/litestream_1.3RC3.bb (limited to 'packages') diff --git a/packages/litestream/.mtn2git_empty b/packages/litestream/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/litestream/litestream_1.3RC3.bb b/packages/litestream/litestream_1.3RC3.bb new file mode 100644 index 0000000000..6c83266764 --- /dev/null +++ b/packages/litestream/litestream_1.3RC3.bb @@ -0,0 +1,17 @@ +LICENSE = "GPL" +MAINTAINER = "Oyvind Repvik " +DESCRIPTION = "ShoutCast-compatible streamer" +PR = "r0" + +SRC_URI = "http://www.litestream.org/litestream/${PN}-${PV}.tar.gz" + +inherit autotools + +do_install () { + mkdir -p ${D}${bindir} + install -m 755 litestream ${D}${bindir} + install -m 755 literestream ${D}${bindir} + install -m 755 source ${D}${bindir} + install -m 755 client ${D}${bindir} + install -m 755 server ${D}${bindir} +} \ No newline at end of file -- cgit v1.2.3 From 8cfa5694cf3f491e71109e6684a26d740499880a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 4 Sep 2006 01:29:27 +0000 Subject: icecast: Move to nonworking --- packages/icecast/.mtn2git_empty | 0 packages/icecast/icecast_2.2.0.bb | 18 ------------------ packages/nonworking/icecast/.mtn2git_empty | 0 packages/nonworking/icecast/icecast_2.2.0.bb | 18 ++++++++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 packages/icecast/.mtn2git_empty delete mode 100644 packages/icecast/icecast_2.2.0.bb create mode 100644 packages/nonworking/icecast/.mtn2git_empty create mode 100644 packages/nonworking/icecast/icecast_2.2.0.bb (limited to 'packages') diff --git a/packages/icecast/.mtn2git_empty b/packages/icecast/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb deleted file mode 100644 index 7322af3087..0000000000 --- a/packages/icecast/icecast_2.2.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -PR = "r4" -MAINTAINER = "Oyvind Repvik Date: Mon, 4 Sep 2006 01:30:19 +0000 Subject: slugos-packages: Add litestream to feeds --- packages/meta/slugos-packages.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 241f999999..3b1ffb306c 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -99,6 +99,7 @@ SLUGOS_PACKAGES = "\ libvorbis \ libxml2 \ lirc \ + litestream \ lrzsz \ lsof \ lvm2 \ -- cgit v1.2.3 From df688a4ab663c85fc93171fc022529826828e644 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 4 Sep 2006 01:51:22 +0000 Subject: rocksndiamonds: New package, a game, Boulderdash/Emerald Mine/Supaplex/Sokoban clone. * Initial draft recipe version, but already works. * Too big even for VGA devices (window size is hardcoded in game). * Data storage formats are non-optimal (pcx/uncompressed level files). * Packaging crude, need to be split up. * Nice game. --- packages/rocksndiamonds/.mtn2git_empty | 0 packages/rocksndiamonds/files/.mtn2git_empty | 0 packages/rocksndiamonds/files/rocksndiamonds.png | Bin 0 -> 1114 bytes packages/rocksndiamonds/rocksndiamonds_3.2.0.bb | 28 +++++++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 packages/rocksndiamonds/.mtn2git_empty create mode 100644 packages/rocksndiamonds/files/.mtn2git_empty create mode 100644 packages/rocksndiamonds/files/rocksndiamonds.png create mode 100644 packages/rocksndiamonds/rocksndiamonds_3.2.0.bb (limited to 'packages') diff --git a/packages/rocksndiamonds/.mtn2git_empty b/packages/rocksndiamonds/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rocksndiamonds/files/.mtn2git_empty b/packages/rocksndiamonds/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rocksndiamonds/files/rocksndiamonds.png b/packages/rocksndiamonds/files/rocksndiamonds.png new file mode 100644 index 0000000000..a93d6d4e73 Binary files /dev/null and b/packages/rocksndiamonds/files/rocksndiamonds.png differ diff --git a/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb new file mode 100644 index 0000000000..ab5a5c8932 --- /dev/null +++ b/packages/rocksndiamonds/rocksndiamonds_3.2.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Rocks'n'Diamonds - Boulderdash/Emerald Mine/Supaplex/Sokoban clone." +SECTION = "games" +LICENSE = "GPL" +HOMEPAGE = "http://www.artsoft.org/rocksndiamonds/" +AUTHOR = "Holger Schemel " +MAINTAINER = "Paul Sokolovsky " + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-${PV}.tar.gz \ + file://rocksndiamonds.png" + +DEPENDS += "libsdl-net smpeg" + +APPIMAGE = "../rocksndiamonds.png" +EXTRA_OEMAKE = "CC='${CC}' RO_GAME_DIR='${datadir}/${PN}' RW_GAME_DIR='${datadir}/${PN}'" + +inherit sdl + +do_install() { + install -d ${D}${bindir} + install -m 755 ${PN} ${D}${bindir} + install -d ${D}${datadir}/${PN} + cp -r graphics levels music scores sounds ${D}${datadir}/${PN}/ +} + + +FILES_${PN} += "${bindir}/${PN} ${datadir}/${PN}" -- cgit v1.2.3 From 337c4e16e80b06c66b7b02d364d54acce543ad49 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 09:45:19 +0000 Subject: abiword-plugins_2.4.4.bb, abiword_2.4.4.bb : drop old versions --- packages/abiword/abiword-plugins_2.4.4.bb | 27 ------------------- packages/abiword/abiword_2.4.4.bb | 43 ------------------------------- 2 files changed, 70 deletions(-) delete mode 100644 packages/abiword/abiword-plugins_2.4.4.bb delete mode 100644 packages/abiword/abiword_2.4.4.bb (limited to 'packages') diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb deleted file mode 100644 index 3573e87089..0000000000 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi " -LICENSE="GPLv2" - -DEPENDS = "abiword libwpd librsvg goffice poppler" -PR="r2" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ - file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" -S = "${WORKDIR}/abiword-${PV}/abiword-plugins" - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--without-libwmf" - -PACKAGES_DYNAMIC = "abiword-plugin-*" - -python populate_packages_prepend () { - abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d) - - do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') -} - diff --git a/packages/abiword/abiword_2.4.4.bb b/packages/abiword/abiword_2.4.4.bb deleted file mode 100644 index 1df0303634..0000000000 --- a/packages/abiword/abiword_2.4.4.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi " -LICENSE="GPLv2" - -DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" -RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" -S = "${WORKDIR}/abiword-${PV}/abi" - -FILES_${PN} += " ${datadir}/icons/* \ -${datadir}/AbiSuite-2.4/AbiWord/glade \ -${datadir}/AbiSuite-2.4/AbiWord/scripts \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \ -#${datadir}/AbiSuite-2.4/templates/A4.awt \ -#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \ -${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \ -${datadir}/AbiSuite-2.4/templates/Business-Report.awt \ -${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \ -${datadir}/AbiSuite-2.4/templates/Resume.awt \ -${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \ -${datadir}/AbiSuite-2.4/templates/Memo.awt \ -${datadir}/AbiSuite-2.4/templates/Press-Release.awt " - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--disable-pspell --enable-enchant" - -do_install_append() { - install -d ${D}${datadir}/pixmaps/ - mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ -} - - -- cgit v1.2.3 From 470ea3658bea7dabd656a8644bc7aa841f12faf6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 09:51:04 +0000 Subject: abiword-embedded_2.4.5.bb, abiword_2.4.5.bb : add abiword-embedded package which adds a version of abiword more suited for small screen devices. main abiword stuff moved into a .inc file. --- packages/abiword/abiword-embedded_2.4.5.bb | 11 ++++++++ packages/abiword/abiword.inc | 43 ++++++++++++++++++++++++++++++ packages/abiword/abiword_2.4.5.bb | 43 ++---------------------------- 3 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 packages/abiword/abiword-embedded_2.4.5.bb create mode 100644 packages/abiword/abiword.inc (limited to 'packages') diff --git a/packages/abiword/abiword-embedded_2.4.5.bb b/packages/abiword/abiword-embedded_2.4.5.bb new file mode 100644 index 0000000000..59a3455ccd --- /dev/null +++ b/packages/abiword/abiword-embedded_2.4.5.bb @@ -0,0 +1,11 @@ +require abiword.inc + +EXTRA_OECONF += "--enable-embedded" + +RCONFLICTS = "abiword" + +do_compile_prepend() { + cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ + cp ${S}/src/wp/ap/unix/hildon/ap_EmbeddedFeatures.h ${S}/src/wp/ap/unix/ +} + diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc new file mode 100644 index 0000000000..1df0303634 --- /dev/null +++ b/packages/abiword/abiword.inc @@ -0,0 +1,43 @@ +DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +SECTION = "gnome/office" +HOMEPAGE="http://www.abiword.org"" +MAINTAINER="Koen Kooi " +LICENSE="GPLv2" + +DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" +RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" +PR="r1" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" +S = "${WORKDIR}/abiword-${PV}/abi" + +FILES_${PN} += " ${datadir}/icons/* \ +${datadir}/AbiSuite-2.4/AbiWord/glade \ +${datadir}/AbiSuite-2.4/AbiWord/scripts \ +${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \ +${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \ +#${datadir}/AbiSuite-2.4/templates/A4.awt \ +#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \ +${datadir}/AbiSuite-2.4/templates/normal.awt \ +${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \ +${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \ +${datadir}/AbiSuite-2.4/templates/Business-Report.awt \ +${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \ +${datadir}/AbiSuite-2.4/templates/Resume.awt \ +${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \ +${datadir}/AbiSuite-2.4/templates/Memo.awt \ +${datadir}/AbiSuite-2.4/templates/Press-Release.awt " + +inherit autotools + +PARALLEL_MAKE="" + +EXTRA_OECONF = "--disable-pspell --enable-enchant" + +do_install_append() { + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ +} + + diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb index 1df0303634..b97556b735 100644 --- a/packages/abiword/abiword_2.4.5.bb +++ b/packages/abiword/abiword_2.4.5.bb @@ -1,43 +1,4 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi " -LICENSE="GPLv2" - -DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" -RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ - glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" -PR="r1" - -SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" -S = "${WORKDIR}/abiword-${PV}/abi" - -FILES_${PN} += " ${datadir}/icons/* \ -${datadir}/AbiSuite-2.4/AbiWord/glade \ -${datadir}/AbiSuite-2.4/AbiWord/scripts \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \ -${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \ -#${datadir}/AbiSuite-2.4/templates/A4.awt \ -#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt \ -${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \ -${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \ -${datadir}/AbiSuite-2.4/templates/Business-Report.awt \ -${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \ -${datadir}/AbiSuite-2.4/templates/Resume.awt \ -${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \ -${datadir}/AbiSuite-2.4/templates/Memo.awt \ -${datadir}/AbiSuite-2.4/templates/Press-Release.awt " - -inherit autotools - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--disable-pspell --enable-enchant" - -do_install_append() { - install -d ${D}${datadir}/pixmaps/ - mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ -} +require abiword.inc +RCONFLICTS = "abiword-embedded" -- cgit v1.2.3 From 96a81259628f148f9c7543a8d84b44ee05df539b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 09:53:59 +0000 Subject: libbonobo_2.14.0.bb : new version --- packages/gnome/libbonobo_2.14.0.bb | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 packages/gnome/libbonobo_2.14.0.bb (limited to 'packages') diff --git a/packages/gnome/libbonobo_2.14.0.bb b/packages/gnome/libbonobo_2.14.0.bb new file mode 100644 index 0000000000..d3cdc3a1c8 --- /dev/null +++ b/packages/gnome/libbonobo_2.14.0.bb @@ -0,0 +1,60 @@ +LICENSE = "GPL" +PR = "r0" +SECTION = "x11/gnome/libs" +DESCRIPTION = "Bonobo CORBA interfaces library" + +inherit gnome + +SRC_URI += "file://configure-gthread.patch;patch=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "glib-2.0 orbit2 intltool-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" +FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \ + ${libdir}/bonobo-2.0/samples" + +PARALLEL_MAKE = "" + +do_configure_prepend() { + install -d m4 + install ${WORKDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ + bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ + bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ + bonobo-activation-server-info.h bonobo-activation-version.h" + +BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ + bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ + bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ + bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ + bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ + bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ + bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ + bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ + bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ + bonobo-app-client.h bonobo-application.h" + +do_compile() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" +} + +do_stage() { + install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation + for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done + install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo + for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done + install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ + install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ + oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} + oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} -- cgit v1.2.3 From 3db8d2e4c418d898668d3fe1c7323570e366b8e5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 09:56:36 +0000 Subject: libbonobo/configure-gthread.patch : forgot the patch --- packages/gnome/libbonobo/.mtn2git_empty | 0 packages/gnome/libbonobo/configure-gthread.patch | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 packages/gnome/libbonobo/.mtn2git_empty create mode 100644 packages/gnome/libbonobo/configure-gthread.patch (limited to 'packages') diff --git a/packages/gnome/libbonobo/.mtn2git_empty b/packages/gnome/libbonobo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/libbonobo/configure-gthread.patch b/packages/gnome/libbonobo/configure-gthread.patch new file mode 100644 index 0000000000..005fa6760a --- /dev/null +++ b/packages/gnome/libbonobo/configure-gthread.patch @@ -0,0 +1,11 @@ +--- libbonobo-2.14.0/configure.in.orig 2006-09-04 09:21:54.000000000 +0100 ++++ libbonobo-2.14.0/configure.in 2006-09-04 09:22:58.000000000 +0100 +@@ -166,7 +166,7 @@ + AC_MSG_RESULT(no) + AC_MSG_ERROR( + [No working gthread-2.0 support found, using --disable-threads IS DISCOURAGED]) +- ] ++ ],[AC_MSG_RESULT(yes)] + ) + CFLAGS=$libbonobo_save_CFLAGS + LIBS=$libbonobo_save_LIBS -- cgit v1.2.3 From dd6915b00393feb4830a4435f13b505f838bf7e9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 4 Sep 2006 10:06:27 +0000 Subject: abiword-embedded: RPROVIDE abiword --- packages/abiword/abiword-embedded_2.4.5.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/abiword/abiword-embedded_2.4.5.bb b/packages/abiword/abiword-embedded_2.4.5.bb index 59a3455ccd..9381bbd8a7 100644 --- a/packages/abiword/abiword-embedded_2.4.5.bb +++ b/packages/abiword/abiword-embedded_2.4.5.bb @@ -3,6 +3,7 @@ require abiword.inc EXTRA_OECONF += "--enable-embedded" RCONFLICTS = "abiword" +RPROVIDES += "abiword" do_compile_prepend() { cp ${S}/src/af/xap/unix/hildon/xap_EmbeddedFeatures.h ${S}/src/af/xap/unix/ -- cgit v1.2.3 From da241cb72a4d49335420bf122f4f8eb1ce82419f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 11:07:14 +0000 Subject: abiword-plugins_2.4.5.bb : remove DEPENDS on abiword as it doesnt require it to build. Add RDEPENDS on abiword as plugins require it to be useful. --- packages/abiword/abiword-plugins_2.4.5.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index 444b0a43c7..567cc3a414 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -4,12 +4,13 @@ HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi " LICENSE="GPLv2" -DEPENDS = "abiword libwpd librsvg goffice poppler" +DEPENDS = "libwpd librsvg goffice poppler" PR="r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" +RDEPENDS='abiword' inherit autotools -- cgit v1.2.3 From b15cd814c4d59a858beee25a329a6e29a0b3989b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 11:24:07 +0000 Subject: libbonoboui_2.14.0.bb : new version --- packages/gnome/libbonoboui_2.14.0.bb | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 packages/gnome/libbonoboui_2.14.0.bb (limited to 'packages') diff --git a/packages/gnome/libbonoboui_2.14.0.bb b/packages/gnome/libbonoboui_2.14.0.bb new file mode 100644 index 0000000000..049eb135ad --- /dev/null +++ b/packages/gnome/libbonoboui_2.14.0.bb @@ -0,0 +1,58 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" + +inherit gnome pkgconfig + +FILES_${PN} += "${libdir}/libglade/2.0/*.so" +FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \ + ${libdir}/bonobo-2.0/samples" +FILES_${PN}-dbg += "${libdir}/libglade/2.0/.debug/*.so" + +DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" + +EXTRA_OECONF = "--disable-gtk-doc" + +HEADERS = " \ +bonobo/bonobo-zoomable.h \ +bonobo/bonobo-ui-component.h \ +bonobo/bonobo-dock-layout.h \ +bonobo/bonobo-ui-type-builtins.h \ +bonobo/bonobo-canvas-component.h \ +bonobo/bonobo-widget.h \ +bonobo/bonobo-ui-engine.h \ +bonobo/bonobo-window.h \ +bonobo/bonobo-ui-toolbar.h \ +bonobo/bonobo-dock-band.h \ +bonobo/bonobo-ui-toolbar-item.h \ +bonobo/bonobo-control.h \ +bonobo/bonobo-dock-item.h \ +bonobo/bonobo-ui-config-widget.h \ +bonobo/bonobo-zoomable-frame.h \ +bonobo/bonobo-control-frame.h \ +bonobo/bonobo-dock.h \ +bonobo/bonobo-ui-main.h \ +bonobo/bonobo-canvas-item.h \ +bonobo/bonobo-ui-node.h \ +bonobo/bonobo-socket.h \ +bonobo/bonobo-selector.h \ +bonobo/bonobo-ui-sync.h \ +bonobo/bonobo-ui-util.h \ +bonobo/bonobo-plug.h \ +bonobo/bonobo-ui-toolbar-button-item.h \ +bonobo/bonobo-ui-toolbar-toggle-button-item.h \ +bonobo/bonobo-ui-container.h \ +bonobo/bonobo-file-selector-util.h \ +bonobo/bonobo-property-control.h \ +bonobo/bonobo-selector-widget.h \ +libbonoboui.h \ +bonobo.h \ +" + +do_stage() { + install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo + for i in ${HEADERS}; do + install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i + done + oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR} +} -- cgit v1.2.3 From 608ae24505e28e6212904851c39cc51de41bf037 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 11:32:03 +0000 Subject: libgnome_2.14.1.bb : new version --- packages/gnome/libgnome_2.14.1.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/gnome/libgnome_2.14.1.bb (limited to 'packages') diff --git a/packages/gnome/libgnome_2.14.1.bb b/packages/gnome/libgnome_2.14.1.bb new file mode 100644 index 0000000000..e5a681ab54 --- /dev/null +++ b/packages/gnome/libgnome_2.14.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gnome application programming libraries" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" + +inherit gnome + +DEPENDS = "gconf-native gnome-vfs libbonobo" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { +autotools_stage_all +} -- cgit v1.2.3 From dff14fe743df2fbdf4b934bd8721b4302c942e4d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 11:39:20 +0000 Subject: libgnomeui_2.15.2.bb : new version had to use unstable as this fixes a compile bug with gtk+ recent. --- packages/gnome/libgnomeui_2.15.2.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/gnome/libgnomeui_2.15.2.bb (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.15.2.bb b/packages/gnome/libgnomeui_2.15.2.bb new file mode 100644 index 0000000000..8f3e0a725c --- /dev/null +++ b/packages/gnome/libgnomeui_2.15.2.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" +DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" +DESCRIPTION = "GNOME User Interface Library" + +FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ + ${libdir}/libglade/*/lib*.so" + +inherit gnome + +SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h +} + +do_stage() { +autotools_stage_all +} -- cgit v1.2.3 From 9763a2f7bf9620ef6a3743fcc4caff4f1c19a916 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 4 Sep 2006 13:13:28 +0000 Subject: abiword.inc: fix DESCRIPTION --- packages/abiword/abiword.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index 1df0303634..657ed618c9 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -1,8 +1,8 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" +DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -MAINTAINER="Koen Kooi " -LICENSE="GPLv2" +HOMEPAGE = "http://www.abiword.org"" +MAINTAINER = "Koen Kooi " +LICENSE = "GPLv2" DEPENDS = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2" RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ -- cgit v1.2.3 From 11a24487c132a7d80c69d98b48945d0242912320 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 15:15:08 +0000 Subject: links-x11_2.1pre23.bb : new version Added a .desktop and icon. --- packages/links/files/links2.desktop | 14 ++++++++++++++ packages/links/links-x11_2.1pre22.bb | 25 ------------------------- packages/links/links-x11_2.1pre23.bb | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 25 deletions(-) create mode 100644 packages/links/files/links2.desktop delete mode 100644 packages/links/links-x11_2.1pre22.bb create mode 100644 packages/links/links-x11_2.1pre23.bb (limited to 'packages') diff --git a/packages/links/files/links2.desktop b/packages/links/files/links2.desktop new file mode 100644 index 0000000000..a05bce1b2b --- /dev/null +++ b/packages/links/files/links2.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Links +Comment=Links is a browser very similar to lynx +Comment[es]=El links es un browser para modo texto, similar a lynx +Comment[pl]=Links jest przeglÄ…darkÄ… podobnÄ… do lynksa +Comment[pt]=O links é um browser para modo texto, similar ao lynx +Comment[pt_BR]=O links é um browser para modo texto, similar ao lynx +Exec=links -g +Terminal=true +Icon=links2 +Type=Application +Categories=Application;ConsoleOnly;Network;WebBrowser; +# vi: encoding=utf-8 diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb deleted file mode 100644 index 9c9bb831aa..0000000000 --- a/packages/links/links-x11_2.1pre22.bb +++ /dev/null @@ -1,25 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/network" -DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" -DESCRIPTION = "Links is graphics and text mode WWW \ -browser, similar to Lynx." -RCONFLICTS = "links" - -MAINTAINER = "Graeme Gregory " - -SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ - file://ac-prog-cxx.patch;patch=1 \ - file://cookies-save-0.96.patch;patch=1 \ - file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1" - -PR = "r1" - -inherit autotools - -EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm --without-sdl" - -S = "${WORKDIR}/links-${PV}" diff --git a/packages/links/links-x11_2.1pre23.bb b/packages/links/links-x11_2.1pre23.bb new file mode 100644 index 0000000000..c68a94565b --- /dev/null +++ b/packages/links/links-x11_2.1pre23.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Links is graphics and text mode WWW \ +browser, similar to Lynx." +HOMEPAGE = "http://links.twibright.com/" +SECTION = "console/network" +MAINTAINER = "Graeme Gregory " +LICENSE = "GPL" +DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11" +RCONFLICTS = "links" +PR = "r0" +SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ + file://ac-prog-cxx.patch;patch=1 \ + file://cookies-save-0.96.patch;patch=1 \ + file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \ + file://links2.desktop \ + http://www.xora.org.uk/oe/links2.png" +S = "${WORKDIR}/links-${PV}" + +inherit autotools + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm --without-sdl" + +do_install_append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${WORKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/links2.png ${D}/${datadir}/pixmaps +} + -- cgit v1.2.3 From 40cd6d1cb5e34f32bb91be5b80bcdc48e1ee1480 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 4 Sep 2006 15:30:51 +0000 Subject: links_2.1pre23.bb : new version --- packages/links/links_2.1pre22.bb | 23 ----------------------- packages/links/links_2.1pre23.bb | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 packages/links/links_2.1pre22.bb create mode 100644 packages/links/links_2.1pre23.bb (limited to 'packages') diff --git a/packages/links/links_2.1pre22.bb b/packages/links/links_2.1pre22.bb deleted file mode 100644 index faed366594..0000000000 --- a/packages/links/links_2.1pre22.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "GPL" -SECTION = "console/network" -DEPENDS = "jpeg libpng gpm flex openssl zlib" -DESCRIPTION = "Links is graphics and text mode WWW \ -browser, similar to Lynx." -RCONFLICTS="links-x11" - -MAINTAINER = "Graeme Gregory " - -SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ - file://ac-prog-cxx.patch;patch=1 \ - file://cookies-save-0.96.patch;patch=1 \ - file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1" - -PR = "r1" - -inherit autotools - -EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x --without-sdl" diff --git a/packages/links/links_2.1pre23.bb b/packages/links/links_2.1pre23.bb new file mode 100644 index 0000000000..4838ce37c0 --- /dev/null +++ b/packages/links/links_2.1pre23.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Links is graphics and text mode WWW \ +browser, similar to Lynx." +HOMEPAGE = "http://links.twibright.com/" +SECTION = "console/network" +MAINTAINER = "Graeme Gregory " +LICENSE = "GPL" +DEPENDS = "jpeg libpng gpm flex openssl zlib" +RCONFLICTS="links-x11" +PR = "r0" +SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ + file://ac-prog-cxx.patch;patch=1 \ + file://cookies-save-0.96.patch;patch=1 \ + file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1" + +inherit autotools + +EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x --without-sdl" -- cgit v1.2.3 From f297767ec9755b4406368867eef6e9344d730d70 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 4 Sep 2006 19:00:35 +0000 Subject: povray: add 3.6.1 (from 2004), since the povray dudes haven;t released the source for 3.7.0beta yet * scrary license, $MAINTAINER gets compiled into the binary --- packages/povray/.mtn2git_empty | 0 packages/povray/files/.mtn2git_empty | 0 packages/povray/files/configure-cross-hack.patch | 94 ++++++++++++++++++++++++ packages/povray/povray_3.6.1.bb | 45 ++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 packages/povray/.mtn2git_empty create mode 100644 packages/povray/files/.mtn2git_empty create mode 100644 packages/povray/files/configure-cross-hack.patch create mode 100644 packages/povray/povray_3.6.1.bb (limited to 'packages') diff --git a/packages/povray/.mtn2git_empty b/packages/povray/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/povray/files/.mtn2git_empty b/packages/povray/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/povray/files/configure-cross-hack.patch b/packages/povray/files/configure-cross-hack.patch new file mode 100644 index 0000000000..550eac9323 --- /dev/null +++ b/packages/povray/files/configure-cross-hack.patch @@ -0,0 +1,94 @@ +--- /tmp/configure 2006-09-04 20:44:50.000000000 +0200 ++++ povray-3.6.1/configure 2006-09-04 20:44:58.085780000 +0200 +@@ -10287,7 +10287,7 @@ + # check library version, update LIBS + echo "$as_me:$LINENO: checking for libz version >= $required_libz_version" >&5 + echo $ECHO_N "checking for libz version >= $required_libz_version... $ECHO_C" >&6 +- if test "$cross_compiling" = yes; then ++ if test "$cross_compilingi" = yes; then + echo "$as_me:$LINENO: result: cross-compiling, forced" >&5 + echo "${ECHO_T}cross-compiling, forced" >&6 + +@@ -10338,7 +10338,7 @@ + ( exit $ac_status ) + + if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then +- pov_check_lib="unknown" ++ pov_check_lib="ok" + echo "$as_me:$LINENO: result: $pov_check_lib" >&5 + echo "${ECHO_T}$pov_check_lib" >&6 + else +@@ -10632,7 +10632,7 @@ + # check library version, update LIBS + echo "$as_me:$LINENO: checking for libpng version >= $required_libpng_version" >&5 + echo $ECHO_N "checking for libpng version >= $required_libpng_version... $ECHO_C" >&6 +- if test "$cross_compiling" = yes; then ++ if test "$cross_compilingi" = yes; then + echo "$as_me:$LINENO: result: cross-compiling, forced" >&5 + echo "${ECHO_T}cross-compiling, forced" >&6 + +@@ -10683,7 +10683,7 @@ + ( exit $ac_status ) + + if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then +- pov_check_lib="unknown" ++ pov_check_lib="ok" + echo "$as_me:$LINENO: result: $pov_check_lib" >&5 + echo "${ECHO_T}$pov_check_lib" >&6 + else +@@ -10989,7 +10989,7 @@ + # check library version, update LIBS + echo "$as_me:$LINENO: checking for libjpeg version >= $required_libjpeg_version" >&5 + echo $ECHO_N "checking for libjpeg version >= $required_libjpeg_version... $ECHO_C" >&6 +- if test "$cross_compiling" = yes; then ++ if test "$cross_compilings" = yes; then + echo "$as_me:$LINENO: result: cross-compiling, forced" >&5 + echo "${ECHO_T}cross-compiling, forced" >&6 + +@@ -11041,12 +11041,12 @@ + ( exit $ac_status ) + + if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then +- pov_check_libjpeg="unknown" ++ pov_check_libjpeg="ok" + echo "$as_me:$LINENO: result: $pov_check_libjpeg" >&5 + echo "${ECHO_T}$pov_check_libjpeg" >&6 + else + pov_check_libjpeg_version=`eval $ac_try 2>&1` +- pov_check_libjpeg="bad" ++ pov_check_libjpeg="ok" + echo "$as_me:$LINENO: result: $pov_check_libjpeg_version, $pov_check_libjpeg" >&5 + echo "${ECHO_T}$pov_check_libjpeg_version, $pov_check_libjpeg" >&6 + fi +@@ -11079,7 +11079,7 @@ + + subdirs="$subdirs libraries/jpeg" + +- if test "$ac_cv_search_jpeg_std_error"; then ++ if test "$ac_cv_search_jpeg_std_errort"; then + LIBS=`echo $LIBS | sed s,$ac_cv_search_jpeg_std_error,,g` + fi + INCJPEG="-I\$(top_srcdir)/libraries/jpeg" +@@ -11341,7 +11341,7 @@ + # check library version, update LIBS + echo "$as_me:$LINENO: checking for libtiff version >= $required_libtiff_version" >&5 + echo $ECHO_N "checking for libtiff version >= $required_libtiff_version... $ECHO_C" >&6 +- if test "$cross_compiling" = yes; then ++ if test "$cross_compilingi" = yes; then + echo "$as_me:$LINENO: result: cross-compiling, forced" >&5 + echo "${ECHO_T}cross-compiling, forced" >&6 + +@@ -11398,11 +11398,11 @@ + ( exit $ac_status ) + + if test "$ac_status" != "1" || ! test -s conftest$ac_exeext ; then +- pov_check_libtiff="unknown" ++ pov_check_libtiff="ok" + echo "$as_me:$LINENO: result: $pov_check_libtiff" >&5 + echo "${ECHO_T}$pov_check_libtiff" >&6 + else +- pov_check_libtiff_version=`eval $ac_try 2>&1` ++ pov_check_libtiff_version="3.6.1" + pov_check_libtiff="bad" + echo "$as_me:$LINENO: result: $pov_check_libtiff_version, $pov_check_libtiff" >&5 + echo "${ECHO_T}$pov_check_libtiff_version, $pov_check_libtiff" >&6 diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb new file mode 100644 index 0000000000..ee4876324e --- /dev/null +++ b/packages/povray/povray_3.6.1.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. " +HOMEPAGE = "http://www.povray.org" +SECTION = "foo/bar" +#Make this a weak assigment to allow branding of the povray binary +MAINTAINER ?= "Koen Kooi " +LICENSE = "povray" + +DEPENDS = "virtual/libx11 libz jpeg libpng tiff" +RDEPENDS = "" + +PR = "r0" + +#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/ftp/pub/povray/Official/Unix/${P}.tar.bz2 \ + file://configure-cross-hack.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-x COMPILED_BY=${MAINTAINER}" +PARALLEL_MAKE = "" + +#autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect +do_configure() { + oe_runconf +} + +PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes" + +PACKAGE_ARCH_${PN}-doc = "all" + +PACKAGE_ARCH_${PN}-scenes = "all" +FILES_${PN}-scenes = "${datadir}/povray-3.6/scenes" + +PACKAGE_ARCH_${PN}-ini = "all" +FILES_${PN}-ini = "${datadir}/povray-3.6/ini" + +PACKAGE_ARCH_${PN}-icons = "all" +FILES_${PN}-icons = "${datadir}/povray-3.6/icons" + +PACKAGE_ARCH_${PN}-scripts = "all" +FILES_${PN}-scripts = "${datadir}/povray-3.6/scripts" + +PACKAGE_ARCH_${PN}-includes = "all" +FILES_${PN}-includes = "${datadir}/povray-3.6/include" + -- cgit v1.2.3 From c93538264b82fde2e70c3d059e04128ade1e5092 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 4 Sep 2006 20:24:10 +0000 Subject: rox-filer: add 2.5 * compiles, packages, but not tested on device --- packages/rox/.mtn2git_empty | 0 packages/rox/files/.mtn2git_empty | 0 packages/rox/files/no-strip-objcopy.patch | 13 +++++++++++++ packages/rox/rox-filer_2.5.bb | 21 +++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 packages/rox/.mtn2git_empty create mode 100644 packages/rox/files/.mtn2git_empty create mode 100644 packages/rox/files/no-strip-objcopy.patch create mode 100644 packages/rox/rox-filer_2.5.bb (limited to 'packages') diff --git a/packages/rox/.mtn2git_empty b/packages/rox/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rox/files/.mtn2git_empty b/packages/rox/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/rox/files/no-strip-objcopy.patch b/packages/rox/files/no-strip-objcopy.patch new file mode 100644 index 0000000000..181dccc436 --- /dev/null +++ b/packages/rox/files/no-strip-objcopy.patch @@ -0,0 +1,13 @@ +--- /tmp/Makefile.in 2006-09-04 22:08:51.000000000 +0200 ++++ rox-filer-2.5/ROX-Filer/src/Makefile.in 2006-09-04 22:09:00.275780000 +0200 +@@ -51,10 +51,6 @@ + ${PROG}: ${OBJECTS} + ${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS} + mv "${PROG}" "${PLATFORM_DIR}" +- -(cd "${PLATFORM_DIR}" && \ +- objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \ +- strip ROX-Filer && \ +- objcopy --add-gnu-debuglink=ROX-Filer.dbg ROX-Filer) + + clean: + rm -f *.o Makefile.bak diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb new file mode 100644 index 0000000000..87552ddfc2 --- /dev/null +++ b/packages/rox/rox-filer_2.5.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "the file manager at the core of the ROX desktop" +HOMEPAGE = "http://rox.sf.net" +LICENSE = "GPL" +DEPENDS = "gtk+" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \ + file://no-strip-objcopy.patch;patch=1;pnum=3" + +inherit pkgconfig + +S = "${WORKDIR}/${P}/ROX-Filer/src/" + +do_compile() { + ../AppRun --compile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ../ROX-Filer ${D}${bindir} +} + -- cgit v1.2.3 From b52975a224a8824cdcff83d5c1e5b4120091d975 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 07:44:59 +0000 Subject: povray: remove bogus section --- packages/povray/povray_3.6.1.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index ee4876324e..58ff33cbc4 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -1,6 +1,5 @@ DESCRIPTION = "The Persistence of Vision Raytracer is a high-quality, totally free tool for creating stunning three-dimensional graphics. " HOMEPAGE = "http://www.povray.org" -SECTION = "foo/bar" #Make this a weak assigment to allow branding of the povray binary MAINTAINER ?= "Koen Kooi " LICENSE = "povray" -- cgit v1.2.3 From 76abf1c2b1388f76d700b9ab16f238346d5170bf Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 5 Sep 2006 08:10:02 +0000 Subject: rox-filer: package ALL needed infos. do_install() taken from Debian package which I maintained years ago --- packages/rox/rox-filer_2.5.bb | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb index 87552ddfc2..868720da12 100644 --- a/packages/rox/rox-filer_2.5.bb +++ b/packages/rox/rox-filer_2.5.bb @@ -2,6 +2,8 @@ DESCRIPTION = "the file manager at the core of the ROX desktop" HOMEPAGE = "http://rox.sf.net" LICENSE = "GPL" DEPENDS = "gtk+" +RDEPENDS = "shared-mime-info" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/rox/${P}.tar.bz2 \ file://no-strip-objcopy.patch;patch=1;pnum=3" @@ -17,5 +19,37 @@ do_compile() { do_install() { install -d ${D}${bindir} install -m 755 ../ROX-Filer ${D}${bindir} -} + install -d ${D}${datadir}/rox/Choices + install -d ${D}${datadir}/rox/images + install -d ${D}${datadir}/mime/packages + install -d ${D}${datadir}/doc/rox/html + install -d ${D}${mandir}/man1 + + gzip -c9 ${WORKDIR}/${P}/rox.1 >${D}${mandir}/man1/rox.1.gz + + cp -r ${WORKDIR}/${P}/Choices ${D}${datadir}/rox + rm -rf ${D}${datadir}rox/Choices/MIME-info/ + cp ${WORKDIR}/${P}/ROX-Filer/*.xml ${D}${datadir}/rox + + cp ${WORKDIR}/${P}/ROX-Filer/Help/{Changes,README*,TODO} ${D}${datadir}/doc/rox + cp ${WORKDIR}/${P}/ROX-Filer/Help/*html ${D}${datadir}/doc/rox/html + cp ${WORKDIR}/${P}/ROX-Filer/style.css ${D}${datadir}/doc/rox/html + cp -r ${WORKDIR}/${P}/ROX-Filer/images ${D}${datadir}/rox + cp -r ${WORKDIR}/${P}/ROX-Filer/ROX ${D}${datadir}/rox + +# cp ROX-Filer/ROX-Filer ${D}/usr/bin/rox + cp ${WORKDIR}/${P}/ROX-Filer/.DirIcon ${D}${datadir}/rox/.DirIcon + cp ${WORKDIR}/${P}/rox.xml ${D}${datadir}/mime/packages + + for $f in ${WORKDIR}/${P}/ROX-Filer/Messages/*.gmo; do + export ROXTMP=`basename $f .gmo` ; + if [ $ROXTMP == "sp" ]; then + export ROXTMP="es" ; + fi + install -d ${D}${datadir}/locale/$ROXTMP/LC_MESSAGES; + cp $f debian/rox-filer/usr/share/locale/$ROXTMP/LC_MESSAGES/rox.mo; + done + + +FILES_${PN} += "${datadir}/rox/ ${datadir}/mime/" -- cgit v1.2.3 From 966d545b994dc7a6831a181f273cdfb77b9a78f6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 08:11:19 +0000 Subject: libgnomeui 2.15.2: lower default pref since it need gtk 2.10, which also has a negative default-pref --- packages/gnome/libgnomeui_2.15.2.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.15.2.bb b/packages/gnome/libgnomeui_2.15.2.bb index 8f3e0a725c..a6700434c3 100644 --- a/packages/gnome/libgnomeui_2.15.2.bb +++ b/packages/gnome/libgnomeui_2.15.2.bb @@ -4,6 +4,8 @@ PR = "r0" DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" DESCRIPTION = "GNOME User Interface Library" +DEFAULT_PREFERENCE = "-1" + FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ ${libdir}/libglade/*/lib*.so" -- cgit v1.2.3 From 1ecb6418e1fbf8736bb5901b8a5f17052c241bd7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 5 Sep 2006 08:20:45 +0000 Subject: rox-filer: fixed do_install() typos --- packages/rox/rox-filer_2.5.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/rox/rox-filer_2.5.bb b/packages/rox/rox-filer_2.5.bb index 868720da12..1a510f2bcd 100644 --- a/packages/rox/rox-filer_2.5.bb +++ b/packages/rox/rox-filer_2.5.bb @@ -42,14 +42,14 @@ do_install() { cp ${WORKDIR}/${P}/ROX-Filer/.DirIcon ${D}${datadir}/rox/.DirIcon cp ${WORKDIR}/${P}/rox.xml ${D}${datadir}/mime/packages - for $f in ${WORKDIR}/${P}/ROX-Filer/Messages/*.gmo; do + for f in ${WORKDIR}/${P}/ROX-Filer/Messages/*.gmo; do export ROXTMP=`basename $f .gmo` ; if [ $ROXTMP == "sp" ]; then export ROXTMP="es" ; fi install -d ${D}${datadir}/locale/$ROXTMP/LC_MESSAGES; - cp $f debian/rox-filer/usr/share/locale/$ROXTMP/LC_MESSAGES/rox.mo; + cp $f ${D}${datadir}/locale/$ROXTMP/LC_MESSAGES/rox.mo; done - +} FILES_${PN} += "${datadir}/rox/ ${datadir}/mime/" -- cgit v1.2.3 From 56d150793b1615a72905657bbeaf49ed1b54d959 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 09:00:55 +0000 Subject: tesseract: add 1.0, tesseract is a OCR engine --- packages/tesseract/.mtn2git_empty | 0 packages/tesseract/tesseract_1.0.bb | 11 +++++++++++ 2 files changed, 11 insertions(+) create mode 100644 packages/tesseract/.mtn2git_empty create mode 100644 packages/tesseract/tesseract_1.0.bb (limited to 'packages') diff --git a/packages/tesseract/.mtn2git_empty b/packages/tesseract/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tesseract/tesseract_1.0.bb b/packages/tesseract/tesseract_1.0.bb new file mode 100644 index 0000000000..8543add52f --- /dev/null +++ b/packages/tesseract/tesseract_1.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A commercial quality OCR engine " +LICENSE = "APL + others" + +DEPENDS = "tiff" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}-ocr/${P}.tar.gz" + +inherit autotools pkgconfig + + + -- cgit v1.2.3 From ae4f8efa3e3985d529df6371a1152b454be36674 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 5 Sep 2006 14:00:38 +0000 Subject: add hnb, a nice text-mode outliner --- packages/hnb/.mtn2git_empty | 0 packages/hnb/hnb_1.9.17+1.9.18pre7.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/hnb/.mtn2git_empty create mode 100644 packages/hnb/hnb_1.9.17+1.9.18pre7.bb (limited to 'packages') diff --git a/packages/hnb/.mtn2git_empty b/packages/hnb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hnb/hnb_1.9.17+1.9.18pre7.bb b/packages/hnb/hnb_1.9.17+1.9.18pre7.bb new file mode 100644 index 0000000000..b907665bc8 --- /dev/null +++ b/packages/hnb/hnb_1.9.17+1.9.18pre7.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "hnb is a text-mode hierarchical outliner" +SECTION = "console/pim" +HOMEPAGE = "http://hnb.sf.net" +LICENSE = "GPL" +DEPENDS = "ncurses" +MAINTAINER = "Michael 'Mickey' Lauer " + +SRC_URI = "http://hnb.sourceforge.net/.files/hnb-1.9.18.pre7.tar.gz" +S = "${WORKDIR}/hnb-1.9.18.pre7" + +EXTRA_OEMAKE = '"LIBS=-L${STAGING_LIBDIR} -lncurses libcli/libcli.a"' + +do_install() { + install -d ${D}${bindir} + install -m 0755 src/hnb ${D}${bindir} + install -d ${D}${mandir}/man1 + install -m 0644 doc/hnb.1 ${D}${mandir}/man1/ +} + -- cgit v1.2.3 From dbae8df533dc665215286adb3d8dfd99085b5d84 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 5 Sep 2006 15:07:52 +0000 Subject: added alsa support to generic device table --- packages/initscripts/initscripts-1.0/device_table.txt | 18 ++++++++++++++++++ packages/initscripts/initscripts-1.0/devices | 1 + 2 files changed, 19 insertions(+) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/device_table.txt b/packages/initscripts/initscripts-1.0/device_table.txt index 35560b4025..a302c5aca3 100644 --- a/packages/initscripts/initscripts-1.0/device_table.txt +++ b/packages/initscripts/initscripts-1.0/device_table.txt @@ -160,6 +160,24 @@ /dev/smtpe2 c 640 0 0 35 130 - - - /dev/smtpe3 c 640 0 0 35 131 - - - /dev/sndstat c 660 0 29 14 6 - - - +/dev/snd/seq c 660 0 0 116 1 - - - +/dev/snd/timer c 660 0 0 116 33 - - - +/dev/snd/controlC0 c 660 0 0 116 0 - - - +/dev/snd/controlC1 c 660 0 0 116 32 - - - +/dev/snd/controlC2 c 660 0 0 116 64 - - - +/dev/snd/controlC3 c 660 0 0 116 96 - - - +/dev/snd/hwC0D0 c 660 0 0 116 4 - - - +/dev/snd/hwC0D1 c 660 0 0 116 5 - - - +/dev/snd/hwC0D2 c 660 0 0 116 6 - - - +/dev/snd/hwC0D3 c 660 0 0 116 7 - - - +/dev/snd/pcmC0D0c c 660 0 0 116 24 - - - +/dev/snd/pcmC0D0p c 660 0 0 116 16 - - - +/dev/snd/pcmC0D1c c 660 0 0 116 25 - - - +/dev/snd/pcmC0D1p c 660 0 0 116 17 - - - +/dev/snd/pcmC0D2c c 660 0 0 116 26 - - - +/dev/snd/pcmC0D2p c 660 0 0 116 18 - - - +/dev/snd/pcmC0D3c c 660 0 0 116 27 - - - +/dev/snd/pcmC0D3p c 660 0 0 116 19 - - - /dev/st0 c 660 0 11 9 0 - - - /dev/st0a c 660 0 11 9 96 - - - /dev/st0l c 660 0 11 9 32 - - - diff --git a/packages/initscripts/initscripts-1.0/devices b/packages/initscripts/initscripts-1.0/devices index fb0f851d16..67a2ec8092 100755 --- a/packages/initscripts/initscripts-1.0/devices +++ b/packages/initscripts/initscripts-1.0/devices @@ -50,6 +50,7 @@ else mkdir -p dev/msys mkdir -p dev/pts mkdir -p dev/vc + mkdir -p dev/snd for i in 0 1 2 3 4 5 6 7 8 9; do ln -s /dev/tty$i /dev/vc/$i done -- cgit v1.2.3 From 54f6e2623012b4ac6bd1b87523e6981bbed14dfb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 17:21:09 +0000 Subject: gpe-shield: test run of Cyril's sanitizer and drop obsolete versions --- packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty | 0 packages/gpe-shield/gpe-shield-0.2/makefile.patch | 79 ---------------------- packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty | 0 .../gpe-shield-0.6/backend-iptables.patch | 71 ------------------- .../gpe-shield/gpe-shield-0.6/desktop-name.patch | 15 ---- packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty | 0 packages/gpe-shield/gpe-shield-0.7/nostropts.patch | 34 ---------- packages/gpe-shield/gpe-shield_0.2.bb | 15 ---- packages/gpe-shield/gpe-shield_0.3.bb | 14 ---- packages/gpe-shield/gpe-shield_0.4.bb | 15 ---- packages/gpe-shield/gpe-shield_0.6.bb | 15 ---- packages/gpe-shield/gpe-shield_0.7.bb | 10 --- packages/gpe-shield/gpe-shield_0.8.bb | 11 --- packages/gpe-shield/gpe-shield_0.9.bb | 11 +-- 14 files changed, 7 insertions(+), 283 deletions(-) delete mode 100644 packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty delete mode 100644 packages/gpe-shield/gpe-shield-0.2/makefile.patch delete mode 100644 packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty delete mode 100644 packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch delete mode 100644 packages/gpe-shield/gpe-shield-0.6/desktop-name.patch delete mode 100644 packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty delete mode 100644 packages/gpe-shield/gpe-shield-0.7/nostropts.patch delete mode 100644 packages/gpe-shield/gpe-shield_0.2.bb delete mode 100644 packages/gpe-shield/gpe-shield_0.3.bb delete mode 100644 packages/gpe-shield/gpe-shield_0.4.bb delete mode 100644 packages/gpe-shield/gpe-shield_0.6.bb delete mode 100644 packages/gpe-shield/gpe-shield_0.7.bb delete mode 100644 packages/gpe-shield/gpe-shield_0.8.bb (limited to 'packages') diff --git a/packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-shield/gpe-shield-0.2/makefile.patch b/packages/gpe-shield/gpe-shield-0.2/makefile.patch deleted file mode 100644 index 58c4c0bd00..0000000000 --- a/packages/gpe-shield/gpe-shield-0.2/makefile.patch +++ /dev/null @@ -1,79 +0,0 @@ -? .tm_project.cache -? gpe-shield -? gpe-shield.desktop -? gpe-shield_0.2.batch -? gpe-shield_0.2_arm.ipk -? gpe-shield_0.2_arm.ipk.asc -? gpe-shield_0.2_arm.ipk.upload.html -? makefile.patch -? po -Index: Makefile -=================================================================== -RCS file: /cvs/gpe/base/gpe-shield/Makefile,v -retrieving revision 1.2 -diff -r1.2 Makefile -14a15,17 -> GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-2.0` -> GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0` -> -16,17c19,20 -< GTKLDFLAGS += -L../libgpewidget -L. -< CFLAGS += -Wall -I../libgpewidget -I. ---- -> PACKAGE_LDFLAGS += -L../libgpewidget -L. -> PACKAGE_CFLAGS += -I../libgpewidget -I. -20d22 -< GTKCFLAGS += -I$(PREFIX)/include/gpe -23a26,30 -> PACKAGE_CPPFLAGS = $(STANDARD_CPPFLAGS) -> PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS) -> PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) $(GTKLDFLAGS) -> -> -27c34 -< CFLAGS += -g -DDEBUG ---- -> PACKAGE_CFLAGS += -g -DDEBUG -29c36 -< CFLAGS += -Os -fomit-frame-pointer ---- -> PACKAGE_CFLAGS += -Os -fomit-frame-pointer -32,58c39,40 -< CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE -< CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -< -< GTKCFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` -< GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0` -< -< # setup how to compile -< ifeq ($(NATIVE),yes) -< -< STRIP=strip -< CC=gcc -< -< CFLAGS += $(GTKCFLAGS) -Wall -< LDFLAGS += -lgpewidget $(GTKLDFLAGS) -< -< else # we do cross-compile... -< -< CC=arm-linux-gcc -< STRIP=arm-linux-strip -< -< CFLAGS += -march=armv4 -mtune=strongarm -< CFLAGS += $(GTKCFLAGS) -Wall -< LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Wall -< LDFLAGS += -lXinerama -< -< endif #native or cross-compile -< ---- -> PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE -> PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -70c52 -< $(CC) -g -o $@ $(OBJS) $(LDFLAGS) -lgpewidget $(GTKLDFLAGS) ---- -> $(CC) -g -o $@ $(OBJS) $(LDFLAGS) $(PACKAGE_LDFLAGS) -80c62 -< for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done ---- -> for i in $(PIXMAPS); do install -m 4755 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done diff --git a/packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch b/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch deleted file mode 100644 index 5c306be02f..0000000000 --- a/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: backend.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-shield/backend.c,v -retrieving revision 1.8 -diff -u -r1.8 backend.c ---- backend.c 21 Jun 2004 08:54:53 -0000 1.8 -+++ backend.c 16 Aug 2004 12:17:54 -0000 -@@ -41,6 +41,7 @@ - #define IPTABLES_CMD1 "/usr/sbin/iptables" - #define IPTABLES_CMD2 "/sbin/iptables" - #define IPTABLES_CMD3 "/usr/local/sbin/iptables" -+#define IPTABLES_CMD4 "/usr/bin/iptables" - - static const char* IPTABLES_CMD = NULL; - -@@ -144,13 +145,17 @@ - void - do_clear(void) - { -- char* cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush"); -+ char* cmd; -+ -+ cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush"); - system(cmd); -+ - g_free(cmd); - cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"-P INPUT ACCEPT"); /* reset input policy */ - system(cmd); - g_free(cmd); - g_free(rule_info); -+ - rule_info = NULL; - rule_count = 0; - } -@@ -387,6 +392,7 @@ - - pfd[0].fd = sock; - pfd[0].events = (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI); -+ - while (poll (pfd, 1, -1) > 0) - { - if ((pfd[0].revents & POLLERR) || (pfd[0].revents & POLLHUP)) -@@ -497,7 +503,8 @@ - IPTABLES_CMD = IPTABLES_CMD2; - else if (!access(IPTABLES_CMD3,X_OK)) - IPTABLES_CMD = IPTABLES_CMD3; -- -+ else if (!access(IPTABLES_CMD4,X_OK)) -+ IPTABLES_CMD = IPTABLES_CMD4; - } - - /* app mainloop */ -@@ -505,8 +512,16 @@ - int - suidloop (int csock) - { -- find_iptables(); -- -+ find_iptables(); -+ -+ if (IPTABLES_CMD == NULL) -+ { -+ fprintf(stderr, "Iptables not found, exiting.\n"); -+ close (sock); -+ unlink (PK_SOCKET); -+ exit (2); -+ } -+ - sock = csock; - - while (wait_message ()) ; diff --git a/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch b/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch deleted file mode 100644 index c2afd3907e..0000000000 --- a/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gpe-shield.desktop.in -=================================================================== -RCS file: /cvs/gpe/base/gpe-shield/gpe-shield.desktop.in,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- gpe-shield.desktop.in 4 Jun 2004 14:51:41 -0000 1.1 -+++ gpe-shield.desktop.in 2 Sep 2004 22:16:43 -0000 1.2 -@@ -1,5 +1,5 @@ - [Desktop Entry] --_Name=Desktop Firewall -+_Name=Network Shield - _Comment=Change security settings and access control - Exec=gpe-shield - Terminal=0 diff --git a/packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-shield/gpe-shield-0.7/nostropts.patch b/packages/gpe-shield/gpe-shield-0.7/nostropts.patch deleted file mode 100644 index 83740c7a8f..0000000000 --- a/packages/gpe-shield/gpe-shield-0.7/nostropts.patch +++ /dev/null @@ -1,34 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- gpe-shield-0.7/interface.c~nostropts.patch 2004-09-21 12:35:30.000000000 -0400 -+++ gpe-shield-0.7/interface.c 2005-01-04 15:43:49.604380608 -0500 -@@ -18,26 +18,6 @@ - #include - #include - #include --#include --#include --#include --#include --#include --#include -- --#include --#include --#define _(x) gettext(x) -- --#include -- --#include --#include --#include --#include --#include --#include --#include - #include - #include - #include diff --git a/packages/gpe-shield/gpe-shield_0.2.bb b/packages/gpe-shield/gpe-shield_0.2.bb deleted file mode 100644 index f5766871bc..0000000000 --- a/packages/gpe-shield/gpe-shield_0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -PR = "r1" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget iptables" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ - file://${FILESDIR}/makefile.patch;patch=1;pnum=0" - - diff --git a/packages/gpe-shield/gpe-shield_0.3.bb b/packages/gpe-shield/gpe-shield_0.3.bb deleted file mode 100644 index 7fe229e35d..0000000000 --- a/packages/gpe-shield/gpe-shield_0.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -PR = "r0" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget iptables" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - - diff --git a/packages/gpe-shield/gpe-shield_0.4.bb b/packages/gpe-shield/gpe-shield_0.4.bb deleted file mode 100644 index 8a9d5b693c..0000000000 --- a/packages/gpe-shield/gpe-shield_0.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -PR = "r0" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget iptables" -RDEPENDS = "iptables" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - - diff --git a/packages/gpe-shield/gpe-shield_0.6.bb b/packages/gpe-shield/gpe-shield_0.6.bb deleted file mode 100644 index eff82cb38d..0000000000 --- a/packages/gpe-shield/gpe-shield_0.6.bb +++ /dev/null @@ -1,15 +0,0 @@ -PR = "r2" -LICENSE = "GPL" -inherit gpe pkgconfig - -DEPENDS = "libgpewidget iptables" -RDEPENDS = "iptables" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" -export CVSBUILD = "no" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ - file://backend-iptables.patch;patch=1;pnum=0 \ - file://desktop-name.patch;patch=1;pnum=0" diff --git a/packages/gpe-shield/gpe-shield_0.7.bb b/packages/gpe-shield/gpe-shield_0.7.bb deleted file mode 100644 index fdce8c91c2..0000000000 --- a/packages/gpe-shield/gpe-shield_0.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -PR = "r1" -inherit gpe pkgconfig -LICENSE = "GPL" -DEPENDS = "libgpewidget iptables" -RDEPENDS = "iptables" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" -SRC_URI += "file://nostropts.patch;patch=1" diff --git a/packages/gpe-shield/gpe-shield_0.8.bb b/packages/gpe-shield/gpe-shield_0.8.bb deleted file mode 100644 index ce6843a468..0000000000 --- a/packages/gpe-shield/gpe-shield_0.8.bb +++ /dev/null @@ -1,11 +0,0 @@ -PR = "r1" -inherit gpe pkgconfig -LICENSE = "GPL" -DEPENDS = "libgpewidget iptables virtual/kernel" -RDEPENDS = "iptables" -RRECOMMENDS = "kernel-module-ipt-state" -SECTION = "gpe" -MAINTAINER = "Florian Boor " - -DESCRIPTION = "GPE network security tool" - diff --git a/packages/gpe-shield/gpe-shield_0.9.bb b/packages/gpe-shield/gpe-shield_0.9.bb index fd1d2c4a17..898d67a181 100644 --- a/packages/gpe-shield/gpe-shield_0.9.bb +++ b/packages/gpe-shield/gpe-shield_0.9.bb @@ -1,11 +1,14 @@ -PR = "r0" +DESCRIPTION = "GPE network security tool" +SECTION = "gpe" +MAINTAINER = "Florian Boor " LICENSE = "GPL" + DEPENDS = "libgpewidget iptables virtual/kernel" RDEPENDS = "iptables" RRECOMMENDS = "kernel-module-ipt-state" -SECTION = "gpe" -MAINTAINER = "Florian Boor " -DESCRIPTION = "GPE network security tool" +PR = "r0" inherit gpe pkgconfig + + -- cgit v1.2.3 From fe5bfb0d15b118e0c590e752ed320593604b5094 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 19:52:45 +0000 Subject: fuse: fix RRECOMMEND(S) --- packages/fuse/fuse-module_2.4.2.bb | 33 --------------------------------- packages/fuse/fuse-module_2.5.3.bb | 4 +++- packages/fuse/fuse_2.4.2.bb | 23 ----------------------- packages/fuse/fuse_2.5.3.bb | 4 +++- 4 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 packages/fuse/fuse-module_2.4.2.bb delete mode 100644 packages/fuse/fuse_2.4.2.bb (limited to 'packages') diff --git a/packages/fuse/fuse-module_2.4.2.bb b/packages/fuse/fuse-module_2.4.2.bb deleted file mode 100644 index 512f0453a1..0000000000 --- a/packages/fuse/fuse-module_2.4.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi " - -LICENSE = "GPL" - - -DEPENDS = "fakeroot-native" -RRECOMMEND = "fuse" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" -S = "${WORKDIR}/fuse-${PV}" - -inherit autotools pkgconfig module -EXTRA_OECONF = " --with-kernel=${STAGING_KERNEL_DIR}" - -do_configure() { -cd ${S} ; oe_runconf -} - -do_compile(){ -LDFLAGS="" -cd ${S}/kernel -oe_runmake -} - -fakeroot do_install() { -LDFLAGS="" -cd ${S}/kernel -oe_runmake install DESTDIR=${D} -} - -FILES_${PN} = "/dev /lib/modules" diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb index 94cd87c603..0b887ba4bc 100644 --- a/packages/fuse/fuse-module_2.5.3.bb +++ b/packages/fuse/fuse-module_2.5.3.bb @@ -6,7 +6,9 @@ LICENSE = "GPL" DEPENDS = "fakeroot-native" -RRECOMMEND = "fuse" +RRECOMMENDS = "fuse" + +PR = "r1" SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" S = "${WORKDIR}/fuse-${PV}" diff --git a/packages/fuse/fuse_2.4.2.bb b/packages/fuse/fuse_2.4.2.bb deleted file mode 100644 index a51c659153..0000000000 --- a/packages/fuse/fuse_2.4.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -MAINTAINER = "Koen Kooi " - -LICENSE_${PN} = "LGPL" - -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - -inherit autotools pkgconfig -EXTRA_OECONF = " --disable-kernel-module" - -fakeroot do_install() { -oe_runmake install DESTDIR=${D} -} - -fakeroot do_stage() { -autotools_stage_all -} - - diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index 8aa1f3578d..2f893d5192 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -4,8 +4,10 @@ MAINTAINER = "Koen Kooi " LICENSE_${PN} = "LGPL" +PR = "r1" + DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module" +RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" -- cgit v1.2.3 From c2255f38d6a6c4a2bab571ab2cf547d7493891cd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Sep 2006 20:10:35 +0000 Subject: gpe-buttonbox: fix embarrasing typos --- packages/gpe-buttonbox/gpe-buttonbox_0.5.bb | 2 +- packages/gpe-buttonbox/gpe-buttonbox_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb index dcf8640611..ed69f01df1 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_0.5.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DESCIPTION = "Buttonbox for gpe" +DESCRIPTION = "Buttonbox for gpe" MAINTAINER = "Koen Kooi " DEPENDS = "libgpewidget libgpelaunch" diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb index 86e5cabcf0..f982c4517f 100644 --- a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb +++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" LICENSE = "GPL" -DESCIPTION = "Buttonbox for gpe" +DESCRIPTION = "Buttonbox for gpe" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-buttonbox" -- cgit v1.2.3 From 4826bc3766e6e70e5d2bcaade7a5b1a3f58c92a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 6 Sep 2006 11:40:27 +0000 Subject: various: correct typos spotted by Cyril Romain --- packages/otpkeygen/otpkeygen_1.3.0.bb | 2 +- packages/sn9c102/sn9c102_1.32.bb | 2 +- packages/tcp-wrappers/tcp-wrappers_7.6.bb | 2 +- packages/xorg-app/xprop_cvs.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/otpkeygen/otpkeygen_1.3.0.bb b/packages/otpkeygen/otpkeygen_1.3.0.bb index b679b4c380..786c5ab835 100644 --- a/packages/otpkeygen/otpkeygen_1.3.0.bb +++ b/packages/otpkeygen/otpkeygen_1.3.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OTP S/Key password generator" SECTION = "opie/applications" HOMEPAGE = "http://www.bitrot.de/pda_otpkeygen.html" AUTHOR = "Thomas Driemeyer " -MAINTANER = "Marcin Juszkiewicz " +MAINTAINER = "Marcin Juszkiewicz " LICENSE = "GPL" APPTYPE="binary" PR = "r2" diff --git a/packages/sn9c102/sn9c102_1.32.bb b/packages/sn9c102/sn9c102_1.32.bb index bc2d9d9aa2..fae68d0473 100644 --- a/packages/sn9c102/sn9c102_1.32.bb +++ b/packages/sn9c102/sn9c102_1.32.bb @@ -1,4 +1,4 @@ -DESRIPTION = "Drivers for sn9c10x webcams" +DESCRIPTION = "Drivers for sn9c10x webcams" LICENSE = "GPL" HOMEPAGE = "http://www.linux-projects.org/" SRC_URI = "http://www.linux-projects.org/downloads/${P}.tar.gz" diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb index 3531f43463..bff4d720df 100644 --- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb @@ -1,4 +1,4 @@ -DESRIPTION = "Tools for monitoring and filtering incoming requests for tcp \ +DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \ services." LICENSE = "tcp-wrappers" MAINTAINER = "Chris Larson " diff --git a/packages/xorg-app/xprop_cvs.bb b/packages/xorg-app/xprop_cvs.bb index 1079d6a591..6fb3cf4c59 100644 --- a/packages/xorg-app/xprop_cvs.bb +++ b/packages/xorg-app/xprop_cvs.bb @@ -2,7 +2,7 @@ PV = "0.0+cvs${SRCDATE}" LICENSE = "MIT" DEPENDS = "virtual/libx11 libxmu libxext" DESCRIPTION = "property displayer for X" -MAINTER = "Rene Wagner " +MAINTAINER = "Rene Wagner " SECTION = "x11/base" PR = "r2" -- cgit v1.2.3 From f4c5bad2b962336d79ac962e4f5cb014b311c584 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Wed, 6 Sep 2006 19:21:00 +0000 Subject: puvrusb2-mci: added 20090903 snapshot; made bb file style guide compliant --- .../pvrusb2-mci-20060903/.mtn2git_empty | 0 .../pvrusb2-mci-20060903/Makefile.patch | 25 +++++++++++ packages/pvrusb2-mci/pvrusb2-mci_20060903.bb | 49 ++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060903/.mtn2git_empty create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060903/Makefile.patch create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060903.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060903/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060903/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060903/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060903/Makefile.patch new file mode 100644 index 0000000000..3db0b2c9d6 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060903/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 +--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 +*************** +*** 57,66 **** + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install + + else + +--- 57,66 ---- + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb new file mode 100644 index 0000000000..c06b34251e --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +AUTHOR = Mike Isely +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Frans Meulenbroeks " +LICENSE = "GPL" +RRECOMMENDS = "kernel-module-tveeprom \ + kernel-module-firmware-class \ + kernel-module-tuner \ + kernel-module-msp3400 \ + kernel-module-saa7115 \ + kernel-module-tda9887 \ + kernel-module-v4l1-compat \ + kernel-module-v4l2-common \ + kernel-module-videodev" +PR = "r0" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://hotplug.functions \ + file://firmware.hotplug \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + mkdir -p ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware +} -- cgit v1.2.3 From 2ca0a4e92903aff560061711b91d4f0c62795fd9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 6 Sep 2006 20:28:59 +0000 Subject: calibrateproto: s/DATE/SRCDATE/ --- packages/xorg-proto/calibrateproto_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb index 964380d943..8c61f3c0a4 100644 --- a/packages/xorg-proto/calibrateproto_git.bb +++ b/packages/xorg-proto/calibrateproto_git.bb @@ -2,7 +2,7 @@ require xorg-proto-common.inc DESCRIPTION = " Touchscreen calibration protocol" -PV = "0.0+git${DATE}" +PV = "0.0+git${SRCDATE}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" S = "${WORKDIR}/git" -- cgit v1.2.3 From 68369bccea960e60a01570fff3da7789b1e2b452 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 7 Sep 2006 12:30:16 +0000 Subject: busybox: Update slugos-specific defconfig --- packages/busybox/busybox-1.2.1/slugos/defconfig | 332 ++++++++++++++++++------ packages/busybox/busybox_1.2.1.bb | 2 +- 2 files changed, 249 insertions(+), 85 deletions(-) (limited to 'packages') diff --git a/packages/busybox/busybox-1.2.1/slugos/defconfig b/packages/busybox/busybox-1.2.1/slugos/defconfig index b5ff84550a..c35b4f7f70 100644 --- a/packages/busybox/busybox-1.2.1/slugos/defconfig +++ b/packages/busybox/busybox-1.2.1/slugos/defconfig @@ -3,37 +3,70 @@ # HAVE_DOT_CONFIG=y +# +# Busybox Settings +# + # # General Configuration # +# CONFIG_NITPICK is not set # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set # CONFIG_FEATURE_INSTALLER is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # # Build Options # # CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y # # Installation Options # # CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" CONFIG_INSTALL_APPLET_SYMLINKS=y -CONFIG_INSTALL_APPLET_HARDLINKS=n +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# # # Archival Utilities @@ -44,6 +77,7 @@ CONFIG_BUNZIP2=y # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set CONFIG_GZIP=y @@ -52,19 +86,25 @@ CONFIG_GZIP=y CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set CONFIG_FEATURE_TAR_FROM=y CONFIG_FEATURE_TAR_GZIP=y # CONFIG_FEATURE_TAR_COMPRESS is not set -CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set CONFIG_UNZIP=y # # Common options for cpio and tar # # CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -72,29 +112,37 @@ CONFIG_UNZIP=y CONFIG_BASENAME=y # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y +# CONFIG_CKSUM is not set # CONFIG_CMP is not set +# CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# # CONFIG_FEATURE_DATE_ISOFMT is not set CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set CONFIG_HEAD=y @@ -102,6 +150,7 @@ CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set CONFIG_ID=y # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y CONFIG_LOGNAME=y @@ -113,41 +162,49 @@ CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y CONFIG_MKNOD=y CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set CONFIG_OD=y +# CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set CONFIG_STTY=y +# CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -# CONFIG_USLEEP is not set +CONFIG_USLEEP=y # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set CONFIG_WATCH=y @@ -162,7 +219,7 @@ CONFIG_YES=y # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -174,7 +231,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Common options for md5sum, sha1sum # -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities @@ -183,12 +240,14 @@ CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set -CONFIG_GETKEY=y # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set # CONFIG_OPENVT is not set CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities @@ -198,7 +257,10 @@ CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_FEATURE_READLINK_FOLLOW=y CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y CONFIG_WHICH=y # @@ -206,7 +268,8 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set +# CONFIG_ED is not set +CONFIG_PATCH=y CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_COLON=y @@ -224,6 +287,7 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # Finding Utilities # # CONFIG_FIND is not set +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -234,14 +298,20 @@ CONFIG_FEATURE_GREP_CONTEXT=y # Init Utilities # # CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set # CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # CONFIG_MESG is not set # # Login/Password Management Utilities # +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_ADDGROUP is not set # CONFIG_DELGROUP is not set @@ -249,46 +319,152 @@ CONFIG_FEATURE_GREP_CONTEXT=y # CONFIG_DELUSER is not set # CONFIG_GETTY is not set CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_SU is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set + # # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set # CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set # CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set CONFIG_TIME=y # CONFIG_WATCHDOG is not set -# -# Linux Module Utilities -# -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_MODPROBE is not set -# CONFIG_RMMOD is not set - # # Networking Utilities # CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set @@ -303,14 +479,23 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y # CONFIG_FEATURE_IFUPDOWN_IPX is not set # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set # CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set # CONFIG_IP is not set -# CONFIG_IPCALC is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y CONFIG_PING=y @@ -322,43 +507,53 @@ CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_DEBUG is not set +# CONFIG_DEBUG_TFTP is not set CONFIG_TRACEROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set # # udhcp Server/Client # -# CONFIG_UDHCPD is not set -CONFIG_UDHCPC=y +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y CONFIG_FEATURE_UDHCP_SYSLOG=y # CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set # # Process Utilities # CONFIG_FREE=y +CONFIG_FUSER=y CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_UPTIME=y -CONFIG_SYSCTL=y # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set @@ -371,14 +566,19 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -389,6 +589,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set CONFIG_FEATURE_COMMAND_HISTORY=63 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y @@ -399,48 +600,11 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y -# CONFIG_FEATURE_ROTATE_LOGFILE is not set +CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -# CONFIG_LOSETUP is not set -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_MOUNT is not set -# CONFIG_UMOUNT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 74c69319f4..ee71f37fa8 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1.2" +PR = "r1.3" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://dhcp-hostname.patch;patch=1 \ -- cgit v1.2.3 From aaad1c8c596a0568435bf72ebcbfc1a19f012112 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 7 Sep 2006 12:34:00 +0000 Subject: openntpd: Fix initscript and reformat .bb to match OE style guidelines --- packages/openntpd/files/init | 2 +- packages/openntpd/openntpd_3.7p1.bb | 38 ++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 21 deletions(-) (limited to 'packages') diff --git a/packages/openntpd/files/init b/packages/openntpd/files/init index d35c65299d..745f1701aa 100644 --- a/packages/openntpd/files/init +++ b/packages/openntpd/files/init @@ -7,7 +7,7 @@ ntpd=/usr/sbin/ntpd test -x "$ntpd" || exit 0 -[ ! -d /var/shared/empty ] && mkdir /var/shared/empty +[ ! -d /var/shared/empty ] && mkdir -p /var/shared/empty case "$1" in start) diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb index 6649361fd4..4001eb7dae 100644 --- a/packages/openntpd/openntpd_3.7p1.bb +++ b/packages/openntpd/openntpd_3.7p1.bb @@ -6,43 +6,41 @@ LICENSE = "BSD" SECTION = "console/network" MAINTAINER = "Oyvind Repvik " DEPENDS = "timezones" -PR="r12" +PR="r13" SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \ - file://autofoo.patch;patch=1 \ - file://adjtimex-${PV}.patch;patch=1 \ - file://makefile-install.patch;patch=1 \ - file://init" -S = "${WORKDIR}/openntpd-${PV}" - -INITSCRIPT_NAME = "openntpd" -INITSCRIPT_PARAMS = "defaults" + file://autofoo.patch;patch=1 \ + file://adjtimex-${PV}.patch;patch=1 \ + file://makefile-install.patch;patch=1 \ + file://init" +S = "${WORKDIR}/openntpd-${PV}" inherit autotools update-rc.d +INITSCRIPT_NAME = "openntpd" +INITSCRIPT_PARAMS = "defaults" + EXTRA_OECONF += "CFLAGS=-DUSE_ADJTIMEX --disable-strip --prefix=/usr \ - --sysconfdir=/etc --with-privsep-path=/${localstatedir}/shared/empty \ - --with-privsep-user=ntpd \ - --with-builtin-arc4random \ - --without-ssl-dir \ - " + --sysconfdir=/etc --with-privsep-path=/${localstatedir}/shared/empty \ + --with-privsep-user=ntpd \ + --with-builtin-arc4random \ + --without-ssl-dir" do_install_prepend() { install -d ${D}${sysconfdir}/init.d } do_install_append() { - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openntpd } pkg_postrm () { - grep ntpd ${sysconfdir}/passwd && deluser ntpd + grep ntpd ${sysconfdir}/passwd && deluser ntpd } pkg_postinst () { - [ ! -d ${localstatedir}/shared ] && mkdir -p ${localstatedir}/shared - grep ntpd ${sysconfdir}/passwd || adduser --disabled-password --home=${localstatedir}/shared/empty --ingroup nogroup ntpd - chown root:root ${localstatedir}/shared/empty + [ ! -d ${localstatedir}/shared ] && mkdir -p ${localstatedir}/shared + grep ntpd ${sysconfdir}/passwd || adduser --disabled-password --home=${localstatedir}/shared/empty --ingroup nogroup ntpd + chown root:root ${localstatedir}/shared/empty } - -- cgit v1.2.3 From 2ac7f43dd9df8854c55690fb5e820cf5c3d9514b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 7 Sep 2006 12:35:39 +0000 Subject: zd1211: Reformat .bb --- packages/zd1211/zd1211_r83.bb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/zd1211/zd1211_r83.bb b/packages/zd1211/zd1211_r83.bb index 398d516372..5f0c6a0d0a 100644 --- a/packages/zd1211/zd1211_r83.bb +++ b/packages/zd1211/zd1211_r83.bb @@ -7,14 +7,12 @@ PR = "r1" RDEPENDS = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ - file://makefile.patch;patch=1 \ - " + file://makefile.patch;patch=1" SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile-unslung.patch;patch=1 \ - file://unslung-iwpriv-hack.patch;patch=1 \ - file://unslung-writel-logging.patch;patch=1 \ - " + file://unslung-iwpriv-hack.patch;patch=1 \ + file://unslung-writel-logging.patch;patch=1" S = "${WORKDIR}/zd1211-driver-${PV}" @@ -23,9 +21,9 @@ inherit module do_compile () { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ - 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNEL_VERSION=${KERNEL_VERSION}' \ + 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'KERNEL_VERSION=${KERNEL_VERSION}' \ 'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' } -- cgit v1.2.3 From 3d426fa9cd242cc650e7163277ff3c958b907fb3 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 7 Sep 2006 12:36:31 +0000 Subject: litestream: Reformat .bb --- packages/litestream/litestream_1.3RC3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/litestream/litestream_1.3RC3.bb b/packages/litestream/litestream_1.3RC3.bb index 6c83266764..4de9bc8327 100644 --- a/packages/litestream/litestream_1.3RC3.bb +++ b/packages/litestream/litestream_1.3RC3.bb @@ -8,10 +8,10 @@ SRC_URI = "http://www.litestream.org/litestream/${PN}-${PV}.tar.gz" inherit autotools do_install () { - mkdir -p ${D}${bindir} + install -d ${D}${bindir} install -m 755 litestream ${D}${bindir} install -m 755 literestream ${D}${bindir} install -m 755 source ${D}${bindir} install -m 755 client ${D}${bindir} - install -m 755 server ${D}${bindir} + install -m 755 server ${D}${bindir} } \ No newline at end of file -- cgit v1.2.3 From 566fe1804ed01b7cc89a3d2eea1d278ce1536394 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 7 Sep 2006 12:37:50 +0000 Subject: ssmtp: Reformat .bb --- packages/ssmtp/ssmtp_2.61.bb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index 6a4a94a0e3..25d1aa2d66 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -9,32 +9,31 @@ SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ file://ldflags.patch;patch=1 \ file://configure.patch;patch=1 \ file://libs-lcrypto.patch;patch=1 \ - file://dont-strip.patch;patch=1 \ file://ssmtp.conf" -S = "${WORKDIR}/${PN}-2.61" -LICENSE = "GPL" -CONFFILES_${PN} = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" +S = "${WORKDIR}/${PN}-${PV}" + inherit autotools +CONFFILES_${PN} = "${sysconfdir}/ssmtp/ssmtp.conf ${sysconfdir}/ssmtp/revaliases" EXTRA_OECONF = "--enable-ssl" +INHIBIT_AUTO_STAGE = "1" + do_compile () { - oe_runmake 'LDFLAGS=${LDFLAGS}' + oe_runmake 'LDFLAGS=${LDFLAGS}' } -INHIBIT_AUTO_STAGE = "1" - do_install () { - oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ - 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \ - 'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install - install -d ${D}${sysconfdir}/ssmtp - install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf + oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \ + 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \ + 'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install + install -d ${D}${sysconfdir}/ssmtp + install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf } pkg_postinst () { - update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 30 + update-alternatives --install ${sbindir}/sendmail sendmail ${bindir}/ssmtp 30 } pkg_postrm () { - update-alternatives --remove ${sbindir}/sendmail sendmail + update-alternatives --remove ${sbindir}/sendmail sendmail } -- cgit v1.2.3 From d38cd863bfa830afbde586ad7478bfd8ae6b2987 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Sep 2006 12:54:16 +0000 Subject: gpe-calendar: reformat according to styleguide and drop obsolete versions --- packages/gpe-calendar/gpe-calendar_0.66.bb | 12 ------------ packages/gpe-calendar/gpe-calendar_0.67.bb | 11 ----------- packages/gpe-calendar/gpe-calendar_0.68.bb | 12 ------------ packages/gpe-calendar/gpe-calendar_0.69.bb | 12 ------------ packages/gpe-calendar/gpe-calendar_0.70.bb | 15 --------------- packages/gpe-calendar/gpe-calendar_0.71.bb | 15 --------------- packages/gpe-calendar/gpe-calendar_0.72.bb | 20 ++++++++++++-------- packages/gpe-calendar/gpe-calendar_cvs.bb | 21 ++++++++++++--------- 8 files changed, 24 insertions(+), 94 deletions(-) delete mode 100644 packages/gpe-calendar/gpe-calendar_0.66.bb delete mode 100644 packages/gpe-calendar/gpe-calendar_0.67.bb delete mode 100644 packages/gpe-calendar/gpe-calendar_0.68.bb delete mode 100644 packages/gpe-calendar/gpe-calendar_0.69.bb delete mode 100644 packages/gpe-calendar/gpe-calendar_0.70.bb delete mode 100644 packages/gpe-calendar/gpe-calendar_0.71.bb (limited to 'packages') diff --git a/packages/gpe-calendar/gpe-calendar_0.66.bb b/packages/gpe-calendar/gpe-calendar_0.66.bb deleted file mode 100644 index d3741787ea..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.66.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" -MAINTAINER = "Florian Boor " - -inherit autotools gpe - -DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar" - diff --git a/packages/gpe-calendar/gpe-calendar_0.67.bb b/packages/gpe-calendar/gpe-calendar_0.67.bb deleted file mode 100644 index da50299bcd..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.67.bb +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" - -inherit autotools gpe - -DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar" - diff --git a/packages/gpe-calendar/gpe-calendar_0.68.bb b/packages/gpe-calendar/gpe-calendar_0.68.bb deleted file mode 100644 index 3c8fbbc148..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.68.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" -MAINTAINER = "Florian Boor " - -inherit autotools gpe - -DEPENDS = "libeventdb libschedule libxsettings-client libgpepimc libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar" - diff --git a/packages/gpe-calendar/gpe-calendar_0.69.bb b/packages/gpe-calendar/gpe-calendar_0.69.bb deleted file mode 100644 index 3c8fbbc148..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.69.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" -MAINTAINER = "Florian Boor " - -inherit autotools gpe - -DEPENDS = "libeventdb libschedule libxsettings-client libgpepimc libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar" - diff --git a/packages/gpe-calendar/gpe-calendar_0.70.bb b/packages/gpe-calendar/gpe-calendar_0.70.bb deleted file mode 100644 index d88c8c3930..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.70.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" -MAINTAINER = "Florian Boor " - -inherit autotools gpe - -DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." - -do_configure () { - autotools_do_configure -} diff --git a/packages/gpe-calendar/gpe-calendar_0.71.bb b/packages/gpe-calendar/gpe-calendar_0.71.bb deleted file mode 100644 index d88c8c3930..0000000000 --- a/packages/gpe-calendar/gpe-calendar_0.71.bb +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" -MAINTAINER = "Florian Boor " - -inherit autotools gpe - -DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." - -do_configure () { - autotools_do_configure -} diff --git a/packages/gpe-calendar/gpe-calendar_0.72.bb b/packages/gpe-calendar/gpe-calendar_0.72.bb index d88c8c3930..10bb221ff2 100644 --- a/packages/gpe-calendar/gpe-calendar_0.72.bb +++ b/packages/gpe-calendar/gpe-calendar_0.72.bb @@ -1,15 +1,19 @@ -LICENSE = "GPL" -PR = "r0" -GPE_TARBALL_SUFFIX = "bz2" +DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." +SECTION = "gpe" MAINTAINER = "Florian Boor " - -inherit autotools gpe +LICENSE = "GPL" DEPENDS = "dbus-glib libeventdb libschedule libxsettings-client libgpepimc libgpevtype" -SECTION = "gpe" RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe do_configure () { - autotools_do_configure + autotools_do_configure } + + diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb index 228d701fec..f93f9d1fae 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_cvs.bb @@ -1,17 +1,20 @@ -LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" +DESCRIPTION = "GPE calendar" +SECTION = "gpe" +LICENSE = "GPL" + +DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +RDEPENDS = "gpe-icons" + +PV = "0.73+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" S = "${WORKDIR}/${PN}" -PV = "0.72+cvs${SRCDATE}" -PR = "r1" -PARALLEL_MAKE = "" inherit autotools gpe -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +PARALLEL_MAKE = "" -DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" -SECTION = "gpe" -RDEPENDS = "gpe-icons" -DESCRIPTION = "GPE calendar" -- cgit v1.2.3 From d7c5504299f2215ad653fb4352e196405a2dd3dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Sep 2006 13:04:32 +0000 Subject: gpe-conf: reformat according to styleguide and drop obsolete versions --- packages/gpe-conf/files/.mtn2git_empty | 0 packages/gpe-conf/files/Makefile.dpkg_ipkg | 114 --------------------- packages/gpe-conf/files/Makefile.translation | 107 ------------------- packages/gpe-conf/files/desktop-categories.patch | 10 -- packages/gpe-conf/files/fixsegfault.patch | 44 -------- .../gpe-conf/files/ipaq-sleep-configName.patch | 20 ---- packages/gpe-conf/gpe-conf_0.1.30.bb | 28 ----- packages/gpe-conf/gpe-conf_0.2.1.bb | 24 ----- packages/gpe-conf/gpe-conf_0.2.2.bb | 10 +- packages/gpe-conf/gpe-conf_cvs.bb | 28 ++--- 10 files changed, 20 insertions(+), 365 deletions(-) delete mode 100644 packages/gpe-conf/files/.mtn2git_empty delete mode 100644 packages/gpe-conf/files/Makefile.dpkg_ipkg delete mode 100644 packages/gpe-conf/files/Makefile.translation delete mode 100644 packages/gpe-conf/files/desktop-categories.patch delete mode 100644 packages/gpe-conf/files/fixsegfault.patch delete mode 100644 packages/gpe-conf/files/ipaq-sleep-configName.patch delete mode 100644 packages/gpe-conf/gpe-conf_0.1.30.bb delete mode 100644 packages/gpe-conf/gpe-conf_0.2.1.bb (limited to 'packages') diff --git a/packages/gpe-conf/files/.mtn2git_empty b/packages/gpe-conf/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-conf/files/Makefile.dpkg_ipkg b/packages/gpe-conf/files/Makefile.dpkg_ipkg deleted file mode 100644 index 978b08d91a..0000000000 --- a/packages/gpe-conf/files/Makefile.dpkg_ipkg +++ /dev/null @@ -1,114 +0,0 @@ -## Please read the README in this directory to see how to use this -## Makefile snippet - -# Let's use whatever clean target the specific app provides - -CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` - -# URL to source tarball -SOURCE = ftp://gpe.handhelds.org/projects/gpe/source/$(PACKAGE)-$(VERSION).tar.gz - -# can change this to e.g. /var/tmp/deb -DEB_PATH = ../deb - -ifeq ($(CVSBUILD),yes) -LIBGPEWIDGET_PC = libgpewidget-uninstalled -PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget -else -LIBGPEWIDGET_PC = libgpewidget -endif - -ifeq ($(IN_LIBGPEWIDGET),) -GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) -GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) -endif - -GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) -GTKLIBS = $(shell pkg-config --libs gtk+-2.0) - -STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -STANDARD_CFLAGS = -MD -Wall - -ifeq ($(DEBUG),yes) -CFLAGS += -O2 -g -LDFLAGS = -g -else -CFLAGS += -Os -fomit-frame-pointer -endif - -dist: check-source clean dist-prep - rm -rf ../$(PACKAGE)-$(VERSION) - mkdir ../$(PACKAGE)-$(VERSION) - ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) - ( if [ -f linguas ]; then LINGUAS=`cat linguas`; PATCH_LINGUAS="s:^LINGUAS =.*:LINGUAS = $${LINGUAS}:"; fi; cd ../$(PACKAGE)-$(VERSION) && mkdir build && cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ && sed "s:^CVSBUILD =.*:CVSBUILD = no:;s:^DEBUG =.*:DEBUG = no:;s:Makefile.translation-auto-linguas:Makefile.translation:;$${PATCH_LINGUAS}" < Makefile > Makefile.new && mv Makefile.new Makefile ) - ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) - rm -rf ../$(PACKAGE)-$(VERSION) - $(MAKE) printinfo - -dist-upload: dist - scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/projects/gpe/source/ - -dist-prep: -ipkg-prep: -install-mo: -# empty, can be filled in Makefile.translation - -install: install-program install-mo - -clean-dist: - rm -rf familiar/dist familiar/dist.list - -clean: clean-dist - -check-source: - @if [ -f familiar/$(CONTROL) ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi - -ipkg: check-source ipkg-prep clean - rm -rf familiar/dist - mkdir -p familiar/dist/CONTROL - sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control - if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi - if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi - if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi - if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi - if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi - $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program - rm -rf familiar/dist.list - ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list - if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi - md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch - rm -rf familiar/dist familiar/dist.list - $(MAKE) printinfo - -dpkg: dist - mkdir -p $(DEB_PATH) - ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) - mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian - for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done - -CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) -printinfo: - @printf '-------------------------------------------------------------------------------\n' - @printf "If this becomes a package release, please add a CVS tag.\n" - @printf "You can use 'make tag' for that, it will execute\n" - @printf " cvs tag %s\n" $(CVSTAG) - @printf "Please upload a tarball (created with 'make dist') to\n" - @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" - @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" - @printf "You can use 'make dist-upload' to do that.\n" - @printf "You are currently known as USER %s.\n" $(USER) - @printf '-------------------------------------------------------------------------------\n' - -tag: check-source - cvs tag $(CVSTAG) - -retag: check-source - cvs tag -F $(CVSTAG) - -source: tag dist-upload - -%.pc: %.pc.in - sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ - -.c.o:; - $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ diff --git a/packages/gpe-conf/files/Makefile.translation b/packages/gpe-conf/files/Makefile.translation deleted file mode 100644 index 1ca7d648fd..0000000000 --- a/packages/gpe-conf/files/Makefile.translation +++ /dev/null @@ -1,107 +0,0 @@ -.SUFFIXES: .mo .po .pot .po8 - -CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` - -# use ipkg-build or ipkg-deb-build -IPKG_BUILD := ipkg-build - -TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint - -ifeq ($(DIR_PO),) -DIR_PO := po -endif - -ifeq ($(BINPACKAGE),) -BINPACKAGE := $(PACKAGE) -endif - -mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) -po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) - -ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) -desktop-files += $(PACKAGE).desktop -endif - -ifneq ($(EXTRA_DESKTOPS),) -desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) -endif - -all-mo: $(mo-files) - -all-desktop: $(desktop-files) - -install-mo: all-mo - if [ "$(ENABLE_NLS)" != "no" ]; then \ - if [ "x$(LINGUAS)" != "x" ]; then \ - for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ - fi; \ - fi; - -.po8.mo:; - if [ "$(ENABLE_NLS)" != "no" ]; then \ - msgfmt -o $@ $<; \ - fi; - -.po.po8:; - CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ - -update-po: $(po-files) extract-po - -dist-prep: update-po freshen-po -# empty - -ifeq ($(CVSBUILD),yes) -ipkg-prep: freshen-po -# empty -endif - -extract-po: - mkdir -p $(DIR_PO) - ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) - if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi - -clean: clean-po clean-dist-translation - -clean-po: - rm -rf $(DIR_PO)/*.mo - for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done - -%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) - intltool-merge -u -d $(DIR_PO) $< $@ - -freshen-po: - rm -rf tmp-po - mkdir tmp-po - cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done - for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done - rm -rf tmp-po - -# ------------------------------------------------------------------------ - -MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) - -ifndef BUILD -BUILD = ../build -endif - -transdist := familiar/dist-translation -templates := $(BUILD)/familiar -ipkglist := translation-ipkgs.txt - -clean-dist-translation: - rm -rf $(transdist) $(ipkglist) - -real-translation-package: all-mo - rm -rf $(transdist) $(ipkglist) - for LINGUA in $(LINGUAS); do \ - i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ - mkdir -p $(transdist)/$$i/CONTROL; \ - mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ - install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ - sed -e "s//$(MAINTAINER)/;s//$(BINPACKAGE)/;s//$(VERSION)/;s//$$i/;s!!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ - install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ - $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ - done - -translation-ipkg: - make PREFIX=/usr real-translation-package diff --git a/packages/gpe-conf/files/desktop-categories.patch b/packages/gpe-conf/files/desktop-categories.patch deleted file mode 100644 index 57215aae6b..0000000000 --- a/packages/gpe-conf/files/desktop-categories.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gpe-conf-0.1.22/gpe-conf.desktop.in.old 2004-11-29 19:54:23.000000000 +0000 -+++ gpe-conf-0.1.22/gpe-conf.desktop.in 2004-11-29 19:54:35.000000000 +0000 -@@ -5,6 +5,6 @@ - Terminal=0 - Type=Application - Icon=gpe-config.png --Categories=Application;SystemSettings;GPE -+Categories=Application;GPE; - StartupNotify=True - SingleInstance=True diff --git a/packages/gpe-conf/files/fixsegfault.patch b/packages/gpe-conf/files/fixsegfault.patch deleted file mode 100644 index 7f1ccbe432..0000000000 --- a/packages/gpe-conf/files/fixsegfault.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: network.c -=================================================================== -RCS file: /cvs/gpe/base/gpe-conf/network.c,v -retrieving revision 1.55.2.2 -retrieving revision 1.55.2.3 -diff -u -r1.55.2.2 -r1.55.2.3 ---- network.c 16 Feb 2006 22:32:30 -0000 1.55.2.2 -+++ network.c 20 Feb 2006 01:34:44 -0000 1.55.2.3 -@@ -289,19 +289,23 @@ - i = iflen-1; - - fd = fopen(_PATH_PROCNET_WIRELESS, "r"); -- fgets(buffer, 256, fd); // chuck first two lines; -- fgets(buffer, 256, fd); -- while (!feof(fd)) { -- if (fgets(buffer, 256, fd) == NULL) -- break; -- name = buffer; -- sep = strrchr(buffer, ':'); -- if (sep) *sep = 0; -- while(*name == ' ') name++; -- if (!strcmp(name, ifname)) -- iflist[iflen - 1].iswireless = TRUE; -- } -+ if (fd != NULL) -+ { -+ fgets(buffer, 256, fd); // chuck first two lines; -+ fgets(buffer, 256, fd); -+ while (!feof(fd)) -+ { -+ if (fgets(buffer, 256, fd) == NULL) -+ break; -+ name = buffer; -+ sep = strrchr(buffer, ':'); -+ if (sep) *sep = 0; -+ while(*name == ' ') name++; -+ if (!strcmp(name, ifname)) -+ iflist[iflen - 1].iswireless = TRUE; -+ } - fclose(fd); -+ } - } - else - i = existing; diff --git a/packages/gpe-conf/files/ipaq-sleep-configName.patch b/packages/gpe-conf/files/ipaq-sleep-configName.patch deleted file mode 100644 index 34f22094ad..0000000000 --- a/packages/gpe-conf/files/ipaq-sleep-configName.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gpe-conf-0.1.30/sleep/main.c.orig 2006-06-05 12:23:34.458994776 +0200 -+++ gpe-conf-0.1.30/sleep/main.c 2006-06-05 12:23:40.216119560 +0200 -@@ -23,7 +23,7 @@ - g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL); - if(save_ISconf(ISconf, ISconf->confName)) { - char homeConf[MAXPATHLEN]; -- sprintf(homeConf, "%s/ipaq-sleep.conf", getenv("HOME")); -+ sprintf(homeConf, "%s/.sleep.conf", getenv("HOME")); - if(!save_ISconf(ISconf, homeConf)) - strcpy(ISconf->confName, homeConf); - } -@@ -42,7 +42,7 @@ - char cname[MAXPATHLEN]; - GtkWidget *GPE_Config_Sleep; - -- sprintf(cname,"%s/ipaq-sleep.conf",g_get_home_dir()); -+ sprintf(cname,"%s/.sleep.conf",g_get_home_dir()); - ISconf = load_ISconf(cname); - if(ISconf == NULL) { - strcpy(cname, "/etc/ipaq-sleep.conf"); diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb deleted file mode 100644 index 5588420e45..0000000000 --- a/packages/gpe-conf/gpe-conf_0.1.30.bb +++ /dev/null @@ -1,28 +0,0 @@ -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" -MAINTAINER = "Florian Boor " -PR="r2" - -inherit gpe - -SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0 \ - file://ipaq-sleep-configName.patch;patch=1" - -DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" -RDEPENDS_gpe-conf-panel = "gpe-conf" -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - -do_compile () { - oe_runmake PREFIX=${prefix} - oe_runmake all-desktop PREFIX=${prefix} -} - -do_install () { - oe_runmake MACHINE=${MACHINE} PREFIX=${prefix} DESTDIR=${D} install-program -} diff --git a/packages/gpe-conf/gpe-conf_0.2.1.bb b/packages/gpe-conf/gpe-conf_0.2.1.bb deleted file mode 100644 index 9cb5b6b059..0000000000 --- a/packages/gpe-conf/gpe-conf_0.2.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPL" -SECTION = "gpe" -PRIORITY = "optional" - -DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" -RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" -RDEPENDS_gpe-conf-panel = "gpe-conf" - -MAINTAINER = "Florian Boor " -PR="r0" - -GPE_TARBALL_SUFFIX = "bz2" - -inherit gpe autotools pkgconfig - -PACKAGES += "gpe-conf-panel" - -FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" - -FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" - - diff --git a/packages/gpe-conf/gpe-conf_0.2.2.bb b/packages/gpe-conf/gpe-conf_0.2.2.bb index 9cb5b6b059..995a42f621 100644 --- a/packages/gpe-conf/gpe-conf_0.2.2.bb +++ b/packages/gpe-conf/gpe-conf_0.2.2.bb @@ -1,13 +1,14 @@ -LICENSE = "GPL" -SECTION = "gpe" +DESCRIPTION = "Configuration applets for GPE" +SECTION = "gpe" PRIORITY = "optional" +MAINTAINER = "Florian Boor " +LICENSE = "GPL" DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" RDEPENDS_gpe-conf-panel = "gpe-conf" -MAINTAINER = "Florian Boor " -PR="r0" +PR = "r0" GPE_TARBALL_SUFFIX = "bz2" @@ -18,7 +19,6 @@ PACKAGES += "gpe-conf-panel" FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ ${datadir}/gpe-conf" - FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb index a0bec2b70f..e8da8a2646 100644 --- a/packages/gpe-conf/gpe-conf_cvs.bb +++ b/packages/gpe-conf/gpe-conf_cvs.bb @@ -1,25 +1,27 @@ DEFAULT_PREFERENCE = "-1" -S = "${WORKDIR}/${PN}" -PV = "0.1.29+cvs${SRCDATE}" -PR = "r2" - -inherit autotools gpe - -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" - -PACKAGES = "gpe-conf gpe-conf-panel" -LICENSE = "GPL" +DESCRIPTION = "Configuration applets for GPE" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Florian Boor " - +LICENSE = "GPL" DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" RDEPENDS_gpe-conf-panel = "gpe-conf" + +PV = "0.2.2+cvs${SRCDATE}" +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +S = "${WORKDIR}/${PN}" + +inherit autotools gpe + +PACKAGES = "gpe-conf gpe-conf-panel" + FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ - ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ - ${datadir}/gpe-conf" + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" -- cgit v1.2.3 From 3428d0098febbb8553df208dafffb8400db9c566 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Sep 2006 13:54:35 +0000 Subject: openocd: unbreak build --- packages/openocd/openocd_svn.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2652e15eae..26ab365b0e 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,11 +2,13 @@ HOMEPAGE = "http://openocd.berlios.de/" DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" LICENSE = "GPL" +PV = "0.0+svn${SRCDATE}" + inherit autotools SRC_URI = "svn://svn.berlios.de/;module=${PN}" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/${PN}/trunk" EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" -- cgit v1.2.3 From 6f5ad23ff4f0e08383a18355330ceb7b2f79f4a6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 7 Sep 2006 14:27:25 +0000 Subject: gimp: add 2.3.10 --- packages/gimp/gimp_2.3.10.bb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'packages') diff --git a/packages/gimp/gimp_2.3.10.bb b/packages/gimp/gimp_2.3.10.bb index eb760ec9d8..f28ff7d52d 100644 --- a/packages/gimp/gimp_2.3.10.bb +++ b/packages/gimp/gimp_2.3.10.bb @@ -1,23 +1,23 @@ -DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." -HOMEPAGE = "http://www.gimp.org" -LICENSE = "GPL" -MAINTAINER = "Koen Kooi " +DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." +HOMEPAGE = "http://www.gimp.org" +MAINTAINER = "Koen Kooi " +LICENSE = "GPL" -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ - file://configure-libwmf.patch;patch=1" - -DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" +DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" -DEFAULT_PREFERENCE = "-1" +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ + file://configure-libwmf.patch;patch=1" inherit autotools pkgconfig + #Don't laugh, this just builds a threaded gimp -EXTRA_OECONF = " --disable-gtktest \ - --disable-print \ - --disable-python \ - --enable-mp \ - --without-libwmf" +EXTRA_OECONF = " --disable-gtktest \ + --disable-print \ + --disable-python \ + --enable-mp \ + --without-libwmf" do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } + -- cgit v1.2.3 From 1cd49843e337ea08e4f35facc77f62a11c272fd7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Sep 2006 23:02:42 +0000 Subject: linux-oz-2.6.17: Update to latest ASoC (and disable 32bit audio to get cxx00 working, include mmc conflict fix). Add cxx00 overlay support. Update poodle patches preparing patch for mainline. --- .../linux/linux-openzaurus-2.6.17/defconfig-spitz | 107 +++++++++++++-------- packages/linux/linux-openzaurus_2.6.17.bb | 14 +-- 2 files changed, 76 insertions(+), 45 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz index 22a544f1b4..1fbf999473 100644 --- a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz @@ -1,13 +1,15 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16 -# Thu Mar 23 22:11:12 2006 +# Linux kernel version: 2.6.17 +# Sun Sep 3 23:29:17 2006 # CONFIG_ARM=y CONFIG_MMU=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y +CONFIG_VECTORS_BASE=0xffff0000 # # Code maturity level options @@ -30,6 +32,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -45,10 +48,6 @@ CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_CC_ALIGN_FUNCTIONS=0 -CONFIG_CC_ALIGN_LABELS=0 -CONFIG_CC_ALIGN_LOOPS=0 -CONFIG_CC_ALIGN_JUMPS=0 CONFIG_SLAB=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 @@ -60,7 +59,6 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -68,6 +66,7 @@ CONFIG_KMOD=y # # Block layer # +# CONFIG_BLK_DEV_IO_TRACE is not set # # IO Schedulers @@ -89,11 +88,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_INTEGRATOR is not set # CONFIG_ARCH_IOP3XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -113,6 +114,7 @@ CONFIG_ARCH_PXA=y # Intel PXA2xx Implementations # # CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set CONFIG_PXA_SHARPSL=y @@ -171,6 +173,7 @@ CONFIG_PCMCIA_PXA2XX=y # CONFIG_PREEMPT=y CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=100 # CONFIG_AEABI is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y @@ -188,6 +191,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set # @@ -249,6 +253,7 @@ CONFIG_SYN_COOKIES=y # 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_DIAG=m CONFIG_INET_TCP_DIAG=m @@ -261,9 +266,11 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y @@ -289,6 +296,7 @@ CONFIG_IP_NF_IRC=m CONFIG_IP_NF_TFTP=m CONFIG_IP_NF_AMANDA=m # CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_H323 is not set CONFIG_IP_NF_QUEUE=m # @@ -409,6 +417,8 @@ CONFIG_IEEE80211=m CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -481,7 +491,6 @@ CONFIG_MTD_SHARP_SL=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD is not set # CONFIG_MTD_BLOCK2MTD is not set # @@ -525,7 +534,7 @@ CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set -CONFIG_BLK_DEV_RAM_COUNT=16 +# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -662,6 +671,7 @@ CONFIG_MII=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set # # Obsolete Wireless cards support (pre-802.11) @@ -893,10 +903,6 @@ CONFIG_I2C_PXA=y # Misc devices # -# -# Multimedia Capabilities Port drivers -# - # # Multi-Function Devices # @@ -906,9 +912,17 @@ CONFIG_I2C_PXA=y # CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -CONFIG_LEDS_TRIGGERS=y + +# +# LED drivers +# CONFIG_LEDS_SPITZ=y # CONFIG_LEDS_TOSA is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_IDE_DISK=y @@ -916,11 +930,13 @@ CONFIG_LEDS_TRIGGER_IDE_DISK=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +CONFIG_USB_DABUSB=m # # Graphics support @@ -930,10 +946,14 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set +CONFIG_FB_FIRMWARE_EDID=y # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y +CONFIG_FB_PXA_LCD_QVGA=y +# CONFIG_FB_PXA_LCD_VGA is not set +CONFIG_FB_PXA_OVERLAY=y # CONFIG_FB_PXA_PARAMETERS is not set # CONFIG_FB_W100 is not set # CONFIG_FB_VIRTUAL is not set @@ -960,14 +980,20 @@ CONFIG_FONT_8x16=y # # Logo configuration # -# CONFIG_LOGO is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_CLUT224 is not set +# CONFIG_LOGO_OHAND_CLUT224 is not set +# CONFIG_LOGO_OZ240_CLUT224 is not set +# CONFIG_LOGO_OZ480_CLUT224 is not set +CONFIG_LOGO_OZ640_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y CONFIG_BACKLIGHT_CORGI=y -# CONFIG_BACKLIGHT_HP680 is not set # # Sound @@ -980,17 +1006,22 @@ CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y # CONFIG_SND_DEBUG_DETECT is not set +# CONFIG_SND_PCM_XRUN_DEBUG is not set # # Generic devices @@ -1017,6 +1048,8 @@ CONFIG_SND_USB_AUDIO=m # # PCMCIA devices # +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set # # SoC audio support @@ -1032,13 +1065,15 @@ CONFIG_SND_SOC=m # CONFIG_SND_PXA2xx_SOC=m CONFIG_SND_PXA2xx_SOC_I2S=m -# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9713 is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9712 is not set -# CONFIG_SND_PXA2xx_SOC_CORGI is not set CONFIG_SND_PXA2xx_SOC_SPITZ=m -# CONFIG_SND_PXA2xx_SOC_TOSA is not set + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Freescale i.MX +# # # Soc Codecs @@ -1049,6 +1084,7 @@ CONFIG_SND_SOC_WM8750=m # CONFIG_SND_SOC_WM8753 is not set # CONFIG_SND_SOC_WM8772 is not set # CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM8974 is not set # CONFIG_SND_SOC_WM9713 is not set # CONFIG_SND_SOC_WM9712 is not set # CONFIG_SND_SOC_UDA1380 is not set @@ -1064,6 +1100,7 @@ CONFIG_SND_SOC_WM8750=m # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set CONFIG_USB=m # CONFIG_USB_DEBUG is not set @@ -1089,7 +1126,6 @@ CONFIG_USB_SL811_CS=m # # USB Device Class drivers # -# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m @@ -1132,9 +1168,7 @@ CONFIG_USB_WACOM=m # CONFIG_USB_ACECAD is not set CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m -CONFIG_USB_MTOUCH=m -# CONFIG_USB_ITMTOUCH is not set -CONFIG_USB_EGALAX=m +# CONFIG_USB_TOUCHSCREEN is not set # CONFIG_USB_YEALINK is not set CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m @@ -1148,15 +1182,6 @@ CONFIG_USB_ATI_REMOTE=m CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m -# -# USB Multimedia devices -# -CONFIG_USB_DABUSB=m - -# -# Video4Linux support is needed for USB Multimedia device support -# - # # USB Network Adapters # @@ -1187,6 +1212,7 @@ CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_AIRPRIME is not set # CONFIG_USB_SERIAL_ANYDATA is not set +# CONFIG_USB_SERIAL_ARK3116 is not set CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m @@ -1194,6 +1220,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IR=m @@ -1218,6 +1245,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m @@ -1263,6 +1291,7 @@ CONFIG_USB_PXA27X=m # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set CONFIG_USB_ZERO=m @@ -1284,6 +1313,7 @@ CONFIG_MMC_PXA=y # # Real Time Clock # +CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" @@ -1302,6 +1332,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set @@ -1353,7 +1384,6 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_RELAYFS_FS is not set # CONFIG_CONFIGFS_FS is not set # @@ -1508,6 +1538,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set CONFIG_FRAME_POINTER=y +# CONFIG_UNWIND_INFO is not set # CONFIG_FORCED_INLINING is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set @@ -1561,5 +1592,5 @@ CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set CONFIG_CRC32=y CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index ef03c0e434..a1bcec9b86 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ require linux-openzaurus.inc -PR = "r21" +PR = "r22" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -28,10 +28,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/spectrumcs_fix-r0.patch;patch=1 \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ - ${RPSRC}/alsa/asoc-v0.11pre12.patch;patch=1 \ + ${RPSRC}/alsa/asoc-v0.11.3.patch;patch=1 \ + ${RPSRC}/alsa/asoc_zaurus_fixups-r0.patch;patch=1 \ ${RPSRC}/asoc_makefile-r0.patch;patch=1 \ - ${RPSRC}/alsa/asoc_platform_dev_fix-r0.patch;patch=1 \ - ${RPSRC}/asoc_poodle_morehack-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r27.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ @@ -46,10 +45,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r3.patch;patch=1 \ - ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ - ${RPSRC}/poodle_pm-r1.patch;patch=1 \ + ${RPSRC}/locomo_kbd_tweak-r1.patch;patch=1 \ + ${RPSRC}/poodle_pm-r2.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ - ${RPSRC}/poodle_audio-r1.patch;patch=1 \ + ${RPSRC}/poodle_audio-r2.patch;patch=1 \ + ${RPSRC}/pxa27x_overlay-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ -- cgit v1.2.3 From 85a2bb4f66cf3ccd6307d65491995118366b2b36 Mon Sep 17 00:00:00 2001 From: Leon Zhang Date: Fri, 8 Sep 2006 09:10:16 +0000 Subject: opie-eye: fix install --- packages/opie-eye/opie-eye.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/opie-eye/opie-eye.inc b/packages/opie-eye/opie-eye.inc index 71b41b56b0..d78acfc167 100644 --- a/packages/opie-eye/opie-eye.inc +++ b/packages/opie-eye/opie-eye.inc @@ -20,6 +20,7 @@ do_compile_append() { } do_install() { + install -d ${D}${palmtopdir}/bin install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ -- cgit v1.2.3 From 8a3aeeb6e7a3ba86cf130dbc34474c0b7be23369 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Sep 2006 09:27:55 +0000 Subject: minimo: check in stuff from #1391 (various authors) to make it easier for people to test --- packages/mozilla/files/minimo.desktop | 13 +- packages/mozilla/minimo/minimo | 4 + packages/mozilla/minimo/minimo.patch | 567 ++++++++++++++++++++++++++++++++++ packages/mozilla/minimo/minimo.png | Bin 0 -> 4323 bytes packages/mozilla/minimo/mozconfig | 43 ++- packages/mozilla/minimo_0.016+cvs.bb | 144 +++++++++ 6 files changed, 750 insertions(+), 21 deletions(-) create mode 100644 packages/mozilla/minimo/minimo create mode 100644 packages/mozilla/minimo/minimo.patch create mode 100644 packages/mozilla/minimo/minimo.png create mode 100644 packages/mozilla/minimo_0.016+cvs.bb (limited to 'packages') diff --git a/packages/mozilla/files/minimo.desktop b/packages/mozilla/files/minimo.desktop index 5ef0f2075a..7120ee5202 100644 --- a/packages/mozilla/files/minimo.desktop +++ b/packages/mozilla/files/minimo.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Name=Minimo -Comment=Minimo web browser -Exec=minimo http://www.mozilla.org/projects/minimo/home.html -Terminal=0 Type=Application +Name=Minimo +GenericName=Web Browser +Comment=Browse the web Icon=minimo.png -Categories=Application;Network; -StartupNotify=True +Exec=minimo +Terminal=false +Categories=Network;WebBrowser; +StartupNotify=true diff --git a/packages/mozilla/minimo/minimo b/packages/mozilla/minimo/minimo new file mode 100644 index 0000000000..d130173adf --- /dev/null +++ b/packages/mozilla/minimo/minimo @@ -0,0 +1,4 @@ +#!/bin/sh +export MOZILLA_FIVE_HOME=/usr/lib/mozilla-minimo +export LD_LIBRARY_PATH=${MOZILLA_FIVE_HOME} +exec ${MOZILLA_FIVE_HOME}/minimo "$@" diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch new file mode 100644 index 0000000000..a1f9291167 --- /dev/null +++ b/packages/mozilla/minimo/minimo.patch @@ -0,0 +1,567 @@ +Index: mozilla/content/html/content/src/nsFormSubmission.cpp +=================================================================== +RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v +retrieving revision 1.46 +diff --context=3 -r1.46 nsFormSubmission.cpp +*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46 +--- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000 +*************** +*** 1315,1325 **** + nsresult rv = NS_OK; + + nsCAutoString charset(aCharset); +- // canonical name is passed so that we just have to check against +- // *our* canonical names listed in charsetaliases.properties +- if (charset.EqualsLiteral("ISO-8859-1")) { +- charset.AssignLiteral("windows-1252"); +- } + + // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of + // MS IE/Opera). +--- 1315,1320 ---- +Index: mozilla/embedding/base/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v +retrieving revision 1.34.8.2 +diff --context=3 -r1.34.8.2 Makefile.in +*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2 +--- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000 +*************** +*** 43,48 **** +--- 43,49 ---- + + MODULE = embed_base + LIBRARY_NAME = embed_base_s ++ EXPORT_LIBRARY = 1 + XPIDL_MODULE = embed_base + + include $(DEPTH)/config/autoconf.mk +Index: mozilla/js/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/js/src/Makefile.in,v +retrieving revision 3.95.4.4 +diff --context=3 -r3.95.4.4 Makefile.in +*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4 +--- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000 +*************** +*** 46,51 **** +--- 46,52 ---- + + MODULE = js + LIBRARY_NAME = mozjs ++ EXPORT_LIBRARY = 1 + LIB_IS_C_ONLY = 1 + GRE_MODULE = 1 + +Index: mozilla/minimo/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/minimo/Makefile.in,v +retrieving revision 1.1.2.2 +diff --context=3 -r1.1.2.2 Makefile.in +*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2 +--- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000 +*************** +*** 41,46 **** + + include $(DEPTH)/config/autoconf.mk + +! DIRS = config components chrome locales customization base + + include $(topsrcdir)/config/rules.mk +--- 41,46 ---- + + include $(DEPTH)/config/autoconf.mk + +! DIRS = config chrome locales customization base + + include $(topsrcdir)/config/rules.mk +Index: mozilla/minimo/base/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v +retrieving revision 1.3.2.7 +diff --context=3 -r1.3.2.7 Makefile.in +*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7 +--- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000 +*************** +*** 95,101 **** + + # this should move into the toolkit! + LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ +- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + RCINCLUDE = wince/SplashScreen.rc +--- 95,100 ---- +*************** +*** 139,148 **** + endif + + +- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps +- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names +- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs +- + include $(topsrcdir)/config/static-config.mk + + EXTRA_DEPS += $(STATIC_EXTRA_DEPS) +--- 138,143 ---- +*************** +*** 176,189 **** + # (same as in mozilla/js/src/Makefile.in) + ifdef WINCE + LDFLAGS += -OPT:NOICF + endif + +- export:: +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . +- +- +- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + package:: +--- 171,181 ---- + # (same as in mozilla/js/src/Makefile.in) + ifdef WINCE + LDFLAGS += -OPT:NOICF ++ else ++ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. ++ LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P + endif + + + ifdef WINCE + package:: +Index: mozilla/minimo/base/Minimo.cpp +=================================================================== +RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v +retrieving revision 1.1.2.11 +diff --context=3 -r1.1.2.11 Minimo.cpp +*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11 +--- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000 +*************** +*** 781,789 **** + CreateListenerWindow(); + #endif + +! #ifdef MOZ_WIDGET_GTK2 + gtk_set_locale(); + gtk_init(&argc, &argv); + #endif + + #ifdef HACKY_PRE_LOAD_LIBRARY +--- 781,794 ---- + CreateListenerWindow(); + #endif + +! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) +! #if defined(MOZ_WIDGET_GTK) + gtk_set_locale(); ++ #endif + gtk_init(&argc, &argv); ++ ++ gtk_widget_set_default_visual(gdk_rgb_get_visual()); ++ gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); + #endif + + #ifdef HACKY_PRE_LOAD_LIBRARY +Index: mozilla/minimo/base/SplashScreen.cpp +=================================================================== +RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v +retrieving revision 1.1.2.3 +diff --context=3 -r1.1.2.3 SplashScreen.cpp +*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3 +--- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000 +*************** +*** 180,188 **** +--- 180,203 ---- + void KillSplashScreen() {} + void GetScreenSize(unsigned long* x, unsigned long* y) + { ++ #ifdef MOZ_WIDGET_GTK2 ++ GdkDisplay* display = gdk_display_get_default(); ++ if (display != NULL) ++ { ++ GdkScreen *screen; ++ screen = gdk_display_get_default_screen(display); ++ *x = gdk_screen_get_width(screen); ++ *y = gdk_screen_get_height(screen); ++ } ++ else ++ { ++ #endif + // we need to figure this out. + *x = 240; + *y = 320; ++ #ifdef MOZ_WIDGET_GTK2 ++ } ++ #endif + } + + +Index: mozilla/minimo/chrome/content/minimo.js +=================================================================== +RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v +retrieving revision 1.9.2.90 +diff --context=3 -r1.9.2.90 minimo.js +*** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90 +--- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000 +*************** +*** 1313,1319 **** + 43 const FIND_LINKS = 2; + http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js + */ +! gBrowser.fastFind.find(vQuery,0); + } + } catch (e) { + onErrorHandler(e); +--- 1313,1319 ---- + 43 const FIND_LINKS = 2; + http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js + */ +! gBrowser.fastFind.find(vQuery,0,this.mHasFocus); + } + } catch (e) { + onErrorHandler(e); +*************** +*** 1324,1330 **** + + function DoBrowserFindNext() { + try { +! gBrowser.fastFind.findNext(); + } catch (e) { + onErrorHandler(e); + } +--- 1324,1330 ---- + + function DoBrowserFindNext() { + try { +! gBrowser.fastFind.findNext(this.mHasFocus); + } catch (e) { + onErrorHandler(e); + } +Index: mozilla/minimo/config/linux_package.sh +=================================================================== +RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v +retrieving revision 1.8.2.3 +diff --context=3 -r1.8.2.3 linux_package.sh +*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3 +--- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000 +*************** +*** 29,37 **** + cp -pRL bin/libnssckbi.so minimo + cp -pRL bin/libsmime3.so minimo + cp -pRL bin/libsoftokn3.so minimo +- cp -pRL bin/libsoftokn3.chk minimo + cp -pRL bin/libfreebl3.so minimo +- cp -pRL bin/libfreebl3.chk minimo + cp -pRL bin/libssl3.so minimo + + mkdir -p minimo/chrome +--- 29,35 ---- +*************** +*** 62,69 **** + cp -pRL bin/components/nsHelperAppDlg.js minimo/components + cp -pRL bin/components/nsProgressDialog.js minimo/components + +- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components +- + mkdir -p minimo/greprefs + cp -pRL bin/greprefs/* minimo/greprefs + +--- 60,65 ---- +*************** +*** 80,86 **** + + echo Linking XPT files. + +! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt + + echo Chewing on chrome + +--- 76,82 ---- + + echo Linking XPT files. + +! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt + + echo Chewing on chrome + +Index: mozilla/profile/dirserviceprovider/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v +retrieving revision 1.7 +diff --context=3 -r1.7 Makefile.in +*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7 +--- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000 +*************** +*** 44,49 **** +--- 44,50 ---- + + MODULE = profdirserviceprovider + LIBRARY_NAME = profdirserviceprovider_s ++ EXPORT_LIBRARY = 1 + MOZILLA_INTERNAL_API = 1 + + REQUIRES = xpcom \ +Index: mozilla/security/coreconf/Linux.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v +retrieving revision 1.18.18.1 +diff --context=3 -r1.18.18.1 Linux.mk +*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1 +--- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000 +*************** +*** 117,122 **** +--- 117,126 ---- + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = mips + else ++ ifeq ($(OS_TEST),arm) ++ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++ CPU_ARCH = arm ++ else + OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE + CPU_ARCH = x86 + endif +*************** +*** 133,138 **** +--- 137,143 ---- + endif + endif + endif ++ endif + + + LIBC_TAG = _glibc +Index: mozilla/security/coreconf/arch.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v +retrieving revision 1.17.14.2 +diff --context=3 -r1.17.14.2 arch.mk +*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2 +--- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000 +*************** +*** 60,77 **** + 64BIT_TAG= + endif + +! OS_ARCH := $(subst /,_,$(shell uname -s)) + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +! OS_TEST := $(shell uname -m) +! ifeq ($(OS_TEST),i86pc) +! OS_RELEASE := $(shell uname -r)_$(OS_TEST) +! else +! OS_RELEASE := $(shell uname -r) +! endif + + # + # Force the IRIX64 machines to use IRIX. +--- 60,73 ---- + 64BIT_TAG= + endif + +! OS_ARCH := Linux + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +! OS_TEST := arm +! OS_RELEASE := 2.6 + + # + # Force the IRIX64 machines to use IRIX. +Index: mozilla/toolkit/components/build/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v +retrieving revision 1.24.2.10 +diff --context=3 -r1.24.2.10 Makefile.in +*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10 +--- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 112,118 **** + $(NULL) + + SHARED_LIBRARY_LIBS = \ +- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_XPINSTALL +--- 112,117 ---- +Index: mozilla/toolkit/components/startup/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v +retrieving revision 1.7 +diff --context=3 -r1.7 Makefile.in +*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7 +--- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 43,48 **** +--- 43,49 ---- + + MODULE = toolkitcomps + LIBRARY_NAME = appstartup_s ++ EXPORT_LIBRARY = 1 + FORCE_STATIC_LIB = 1 + LIBXUL_LIBRARY = 1 + +Index: mozilla/toolkit/xre/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v +retrieving revision 1.48.2.3 +diff --context=3 -r1.48.2.3 Makefile.in +*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3 +--- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 45,51 **** + + MODULE = xulapp + LIBRARY_NAME = xulapp_s +- EXPORT_LIBRARY = 1 + LIBXUL_LIBRARY = 1 + + REQUIRES = \ +--- 45,50 ---- +*************** +*** 176,189 **** + + include $(topsrcdir)/config/rules.mk + +- ifdef BUILD_STATIC_LIBS +- export:: +- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner +- # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to +- # FINAL_LINK_COMPS to keep the two lists in sync :-( +- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) "" +- endif +- + LOCAL_INCLUDES += \ + -I$(srcdir) \ + -I$(topsrcdir)/xpfe/bootstrap \ +--- 175,180 ---- +Index: mozilla/xpcom/build/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v +retrieving revision 1.90.2.2 +diff --context=3 -r1.90.2.2 Makefile.in +*** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2 +--- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 61,67 **** + endif + + # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list +! #EXPORT_LIBRARY = 1 + GRE_MODULE = 1 + MOZILLA_INTERNAL_API = 1 + +--- 61,67 ---- + endif + + # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list +! EXPORT_LIBRARY = 1 + GRE_MODULE = 1 + MOZILLA_INTERNAL_API = 1 + +Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +=================================================================== +RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v +retrieving revision 1.7 +diff --context=3 -r1.7 xptcstubs_arm.cpp +*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000 +*************** +*** 45,53 **** + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); + +! static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + { + #define PARAM_BUFFER_COUNT 16 +--- 45,53 ---- + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); + +! nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + { + #define PARAM_BUFFER_COUNT 16 +Index: mozilla/xpfe/browser/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v +retrieving revision 1.70 +diff --context=3 -r1.70 Makefile.in +*** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70 +--- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 44,49 **** +--- 44,50 ---- + + MODULE = browser + LIBRARY_NAME = mozbrwsr_s ++ EXPORT_LIBRARY = 1 + FORCE_STATIC_LIB = 1 + LIBXUL_LIBRARY = 1 + MODULE_NAME = nsBrowserModule +Index: mozilla/xpfe/components/build/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v +retrieving revision 1.69.8.1 +diff --context=3 -r1.69.8.1 Makefile.in +*** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1 +--- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 44,50 **** + + MODULE = appcomps + LIBRARY_NAME = appcomps +- EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = application + LIBXUL_LIBRARY = 1 +--- 44,49 ---- +Index: mozilla/xpfe/components/filepicker/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v +retrieving revision 1.9.8.1 +diff --context=3 -r1.9.8.1 Makefile.in +*** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1 +--- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 47,53 **** + MODULE = filepicker + LIBRARY_NAME = fileview + SHORT_LIBNAME = fileview +- EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = nsFileViewModule + MOZILLA_INTERNAL_API = 1 +--- 47,52 ---- +Index: mozilla/xpfe/components/find/src/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v +retrieving revision 1.37 +diff --context=3 -r1.37 Makefile.in +*** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37 +--- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000 +*************** +*** 45,51 **** + MODULE = appcomps + XPIDL_MODULE = mozfind + LIBRARY_NAME = mozfind +- EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = nsFindComponent + LIBXUL_LIBRARY = 1 +--- 45,50 ---- diff --git a/packages/mozilla/minimo/minimo.png b/packages/mozilla/minimo/minimo.png new file mode 100644 index 0000000000..f8b2e2192b Binary files /dev/null and b/packages/mozilla/minimo/minimo.png differ diff --git a/packages/mozilla/minimo/mozconfig b/packages/mozilla/minimo/mozconfig index 59cf8c77fb..393981e9fa 100644 --- a/packages/mozilla/minimo/mozconfig +++ b/packages/mozilla/minimo/mozconfig @@ -1,23 +1,36 @@ -mk_add_options MOZ_CO_PROJECT=minimo -ac_add_options --enable-application=minimo - +# mozilla/configure: Features and packages: -# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-application=minimo ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft ac_add_options --disable-freetype2 -ac_add_options --disable-plugins - +ac_add_options --enable-xft +ac_add_options --disable-postscript +ac_add_options --disable-xprint +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui +ac_add_options --disable-jsd +ac_add_options --disable-plugins +ac_add_options --disable-view-source +ac_add_options --disable-accessibility +ac_add_options --disable-xpinstall +ac_add_options --enable-single-profile +ac_add_options --disable-jsloader +ac_add_options --disable-printing +ac_add_options --enable-native-uconv +ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-xpcom-obsolete +ac_add_options --disable-pref-extensions +ac_add_options --disable-extensions +ac_add_options --enable-image-decoders=png,gif,jpeg +ac_add_options --disable-mathml +ac_add_options --disable-installer +ac_add_options --disable-updater +ac_add_options --disable-tests ac_add_options --enable-optimize=-Os +ac_add_options --disable-logging ac_add_options --enable-strip -ac_add_options --disable-debug -ac_add_options --enable-reorder ac_add_options --enable-elf-dynstr-gc - -# enable static build ac_add_options --disable-shared ac_add_options --enable-static - -# remove link dependency on libstdc++.so -LIBS=-lsupc++ - +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb new file mode 100644 index 0000000000..4505a1f63e --- /dev/null +++ b/packages/mozilla/minimo_0.016+cvs.bb @@ -0,0 +1,144 @@ +DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices" +SECTION = "x11/network" +LICENSE = "MPL/GPL/LGPL" +HOMEPAGE = "http://www.mozilla.org/projects/minimo/" +PRIORITY = "optional" + +DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+" + +CVSSVR="cvs-mirror.mozilla.org" +BRTAG = "MOZILLA_1_8_BRANCH" +MOZDATE = "20060720" + +PV = "0.016+cvs${MOZDATE}" +PR = r0 + +SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \ + file://minimo.patch;patch=1 \ + file://mozconfig file://minimo \ + file://minimo.desktop file://minimo.png" + +inherit autotools + +S = "${WORKDIR}/mozilla" + +export MOZCONFIG = "${WORKDIR}/mozconfig" + +export CROSS_COMPILE="1" +export ac_cv_prog_HOST_CC="${BUILD_CC}" +export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}" +export ac_cv_prog_HOST_CXX="${BUILD_CXX}" +export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}" + +mozdir="${D}${libdir}/mozilla-minimo" + +EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} " + +do_configure() { + cd ${S} + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile() { + cd ${S} + oe_runmake -f client.mk build +} + +do_install() { + cd ${WORKDIR} + + install -d ${D}${bindir} + install -m 0755 minimo ${D}${bindir} + + install -d ${D}${datadir}/applications + install -m 0644 minimo.desktop ${D}${datadir}/applications + + install -d ${D}/${datadir}/pixmaps + install -m 0644 minimo.png ${D}${datadir}/pixmaps + + cd ${S} + + ./minimo/config/linux_package.sh ${S} ${S}/minimo/config + + cd dist/minimo + + install -d ${D}${mozdir} + install -m 0755 minimo ${D}${mozdir} + install -m 0755 libfreebl3.so ${D}${mozdir} + install -m 0755 libnspr4.so ${D}${mozdir} + install -m 0755 libnss3.so ${D}${mozdir} + install -m 0755 libnssckbi.so ${D}${mozdir} + install -m 0755 libplc4.so ${D}${mozdir} + install -m 0755 libplds4.so ${D}${mozdir} + install -m 0755 libsmime3.so ${D}${mozdir} + install -m 0755 libsoftokn3.so ${D}${mozdir} + install -m 0755 libssl3.so ${D}${mozdir} + + install -d ${D}${mozdir}/chrome + install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome + install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome + install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome + install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome + install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome + + install -d ${D}${mozdir}/components + install -m 0644 components/all.xpt ${D}${mozdir}/components + install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components + install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components + + install -d ${D}${mozdir}/greprefs + install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs + install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs + + install -d ${D}${mozdir}/res + install -m 0644 res/forms.css ${D}${mozdir}/res + install -m 0644 res/html.css ${D}${mozdir}/res + install -m 0644 res/quirk.css ${D}${mozdir}/res + install -m 0644 res/ua.css ${D}${mozdir}/res + install -m 0644 res/arrow.gif ${D}${mozdir}/res + install -m 0644 res/arrowd.gif ${D}${mozdir}/res + install -m 0644 res/broken-image.gif ${D}${mozdir}/res + install -m 0644 res/loading-image.gif ${D}${mozdir}/res + install -m 0644 res/charsetData.properties ${D}${mozdir}/res + install -m 0644 res/charsetalias.properties ${D}${mozdir}/res + install -m 0644 res/langGroups.properties ${D}${mozdir}/res + install -m 0644 res/language.properties ${D}${mozdir}/res + install -m 0644 res/unixcharset.properties ${D}${mozdir}/res + + install -d ${D}${mozdir}/res/dtd + install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd + + install -d ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables + + install -d ${D}${mozdir}/res/fonts + install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts + install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts + + install -d ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html +} + +FILES_${PN} += "${mozdir}" -- cgit v1.2.3 From eb79f18a31b65ba137cfaeb7e121e134b2b20d87 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 8 Sep 2006 11:21:15 +0000 Subject: udev: add 0.100, default preference = -1 --- packages/udev/udev-100/.mtn2git_empty | 0 packages/udev/udev-100/flags.patch | 51 +++++++ packages/udev/udev-100/init | 242 +++++++++++++++++++++++++++++++ packages/udev/udev-100/links.conf | 20 +++ packages/udev/udev-100/local.rules | 31 ++++ packages/udev/udev-100/permissions.rules | 109 ++++++++++++++ packages/udev/udev-100/udev.rules | 98 +++++++++++++ packages/udev/udev_100.bb | 63 ++++++++ 8 files changed, 614 insertions(+) create mode 100644 packages/udev/udev-100/.mtn2git_empty create mode 100644 packages/udev/udev-100/flags.patch create mode 100644 packages/udev/udev-100/init create mode 100644 packages/udev/udev-100/links.conf create mode 100644 packages/udev/udev-100/local.rules create mode 100644 packages/udev/udev-100/permissions.rules create mode 100644 packages/udev/udev-100/udev.rules create mode 100644 packages/udev/udev_100.bb (limited to 'packages') diff --git a/packages/udev/udev-100/.mtn2git_empty b/packages/udev/udev-100/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-100/flags.patch b/packages/udev/udev-100/flags.patch new file mode 100644 index 0000000000..492a39881c --- /dev/null +++ b/packages/udev/udev-100/flags.patch @@ -0,0 +1,51 @@ +--- udev-089/Makefile.orig 2006-04-08 13:32:53.000000000 +0200 ++++ udev-089/Makefile 2006-04-08 13:34:27.000000000 +0200 +@@ -117,28 +117,28 @@ + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ + -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ + -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes +-CFLAGS += $(WARNINGS) ++override CFLAGS += $(WARNINGS) + + LDFLAGS = -Wl,-warn-common + + OPTFLAGS = -Os +-CFLAGS += $(OPTFLAGS) ++override CFLAGS += $(OPTFLAGS) + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -DDEBUG ++ override CFLAGS += -DDEBUG + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS += -fprofile-arcs + endif + +@@ -151,11 +151,11 @@ + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux -lsepol +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-100/init b/packages/udev/udev-100/init new file mode 100644 index 0000000000..cc25c026a3 --- /dev/null +++ b/packages/udev/udev-100/init @@ -0,0 +1,242 @@ +#!/bin/sh -e +### BEGIN INIT INFO +# Provides: udev +# Required-Start: mountvirtfs +# Required-Stop: +# Default-Start: S +# Default-Stop: +# Short-Description: Start udevd, populate /dev and load drivers. +### END INIT INFO + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + # The mount options in busybox are non-standard... + if test -x /bin/mount.util-linux + then + /bin/mount.util-linux --move /etc/udev /dev/.static/dev + elif test -x /bin/busybox + then + busybox mount -n -o move /etc/udev /dev/.static/dev + else + echo "udev requires an identifiable mount command, not started." + umount /etc/udev + umount /dev + exit 1 + fi +} + +create_dev_makedev() { + if [ -e /sbin/MAKEDEV ]; then + [ ! -e /dev/MAKEDEV ] || ln -s /sbin/MAKEDEV /dev/MAKEDEV + else + ln -s /bin/true /dev/MAKEDEV + fi +} + +# I hate this hack. -- Md +make_extra_nodes() { + if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then + cp -a /lib/udev/devices/* /dev/ + fi + + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod -m 600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[0-4]|2.6.1[0-4][!0-9]*) return 1 ;; + esac + return 0 +} + +load_input_modules() { + case "$(uname -r)" in + 2.6.1[0-5]|2.6.1[0-5][!0-9]*) ;; # <= 2.6.15 + *) return 0 + esac + + for module in mousedev evdev joydev; do + modprobe -q $module || true + done +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +[ -x /sbin/udevd ] || exit 0 + +PATH="/sbin:/bin:/usr/bin" + +# defaults +tmpfs_size="10M" +udev_root="/dev" + +if [ -e /etc/udev/udev.conf ]; then + . /etc/udev/udev.conf +fi + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.15, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevsynthesize has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +udev_root=${udev_root%/} + +case "$1" in + start) + if [ -e "$udev_root/.udev/" ]; then + if mountpoint -q $udev_root/; then + TMPFS_MOUNTED=1 + else + echo ".udev/ already exists on the static $udev_root!" + fi + else + warn_if_interactive + fi + + echo > /proc/sys/kernel/hotplug + + if [ -z "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + fi + + # /dev/null must be created before udevd is started + make_extra_nodes + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + + # if this directory is not present /dev will not be updated by udev + mkdir -p /dev/.udev/db/ /dev/.udev/queue/ + + echo "Synthesizing the initial hotplug events" + udevtrigger + + load_input_modules + create_dev_makedev + + # wait for the udevd childs to finish + echo "Waiting for /dev to be fully populated" + if ! udevsettle; then + echo 'timeout' + fi + ;; + + stop) + echo "Stopping the hotplug events dispatcher" "udevd" + start-stop-daemon --stop --name udevd --quiet + ;; + + restart) + echo "Stopping the hotplug events dispatcher" "udevd" + if start-stop-daemon --stop --name udevd --quiet ; then + exit 1 + fi + + echo "Starting the hotplug events dispatcher" "udevd" + udevd --daemon + ;; + + reload) + udevcontrol reload_rules + ;; + + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 + diff --git a/packages/udev/udev-100/links.conf b/packages/udev/udev-100/links.conf new file mode 100644 index 0000000000..ee26012039 --- /dev/null +++ b/packages/udev/udev-100/links.conf @@ -0,0 +1,20 @@ +# This file does not exist. Please do not ask the debian maintainer about it. +# You may use it to do strange and wonderful things, at your risk. + +L fd /proc/self/fd +L stdin /proc/self/fd/0 +L stdout /proc/self/fd/1 +L stderr /proc/self/fd/2 +L core /proc/kcore +L sndstat /proc/asound/oss/sndstat + +D pts +D shm + +# Hic sunt leones. +M ppp c 108 0 +D loop +M loop/0 b 7 0 +D net +M net/tun c 10 200 + diff --git a/packages/udev/udev-100/local.rules b/packages/udev/udev-100/local.rules new file mode 100644 index 0000000000..2308b52c4a --- /dev/null +++ b/packages/udev/udev-100/local.rules @@ -0,0 +1,31 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL=="rtc0", SYMLINK+="rtc" + +# Try and modprobe for drivers for new hardware +ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" + +# Create a symlink to any touchscreen input device +SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" diff --git a/packages/udev/udev-100/permissions.rules b/packages/udev/udev-100/permissions.rules new file mode 100644 index 0000000000..8da35c3090 --- /dev/null +++ b/packages/udev/udev-100/permissions.rules @@ -0,0 +1,109 @@ +ACTION!="add", GOTO="permissions_end" + +# workarounds needed to synchronize with sysfs +DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" +# only needed for kernels < 2.6.16 +SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +# only needed for kernels < 2.6.17 +SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" + +# default permissions for block devices +SUBSYSTEM=="block", GROUP="disk" +SUBSYSTEM=="block", SYSFS{removable}=="1", GROUP="floppy" + +# IDE devices +BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \ + IMPORT{program}="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", GROUP="cdrom" +BUS=="ide", KERNEL=="ht[0-9]*", GROUP="tape" +BUS=="ide", KERNEL=="nht[0-9]*", GROUP="tape" + +# SCSI devices +BUS=="scsi", SYSFS{type}=="1", GROUP="tape" +BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner" +BUS=="scsi", SYSFS{type}=="5", GROUP="cdrom" +BUS=="scsi", SYSFS{type}=="6", GROUP="scanner" + +# USB devices +BUS=="usb", KERNEL=="legousbtower*", MODE="0666" +BUS=="usb", KERNEL=="lp[0-9]*", GROUP="lp" + +# usbfs-like devices +SUBSYSTEM=="usb_device", MODE="0664" + +# iRiver music players +SUBSYSTEM=="usb_device", GROUP="plugdev", \ + SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]" + +# serial devices +SUBSYSTEM=="tty", GROUP="dialout" +SUBSYSTEM=="capi", GROUP="dialout" +SUBSYSTEM=="slamr", GROUP="dialout" +SUBSYSTEM=="zaptel", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL=="ptmx", MODE="0666", GROUP="root" +KERNEL=="console", MODE="0600", GROUP="root" +KERNEL=="tty", MODE="0666", GROUP="root" +KERNEL=="tty[0-9]*", GROUP="root" +KERNEL=="pty*", MODE="0666", GROUP="tty" + +# video devices +SUBSYSTEM=="video4linux", GROUP="video" +SUBSYSTEM=="drm", GROUP="video" +SUBSYSTEM=="dvb", GROUP="video" +SUBSYSTEM=="em8300", GROUP="video" +SUBSYSTEM=="graphics", GROUP="video" +SUBSYSTEM=="nvidia", GROUP="video" + +# misc devices +KERNEL=="random", MODE="0666" +KERNEL=="urandom", MODE="0666" +KERNEL=="mem", MODE="0640", GROUP="kmem" +KERNEL=="kmem", MODE="0640", GROUP="kmem" +KERNEL=="port", MODE="0640", GROUP="kmem" +KERNEL=="full", MODE="0666" +KERNEL=="null", MODE="0666" +KERNEL=="zero", MODE="0666" +KERNEL=="inotify", MODE="0666" +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" +KERNEL=="agpgart", GROUP="video" +KERNEL=="nvram", GROUP="nvram" +KERNEL=="rtc", GROUP="audio" +KERNEL=="tpm*", MODE="0600", OWNER="tss", GROUP="tss" +KERNEL=="fuse", GROUP="fuse" + +KERNEL=="cdemu[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL=="pktcdvd", MODE="0644" + +KERNEL=="uverbs*", GROUP="rdma" +KERNEL=="ucm*", GROUP="rdma" + +# printers and parallel devices +SUBSYSTEM=="printer", GROUP="lp" +SUBSYSTEM=="ppdev", GROUP="lp" +KERNEL=="pt[0-9]*", GROUP="tape" +KERNEL=="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM=="sound", GROUP="audio" + +# ieee1394 devices +KERNEL=="raw1394", GROUP="disk" +KERNEL=="dv1394*", GROUP="video" +KERNEL=="video1394*", GROUP="video" + +# input devices +KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \ + MODE="0664", GROUP="video" +KERNEL=="js[0-9]*", MODE="0664" + +# AOE character devices +SUBSYSTEM=="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +LABEL="permissions_end" + diff --git a/packages/udev/udev-100/udev.rules b/packages/udev/udev-100/udev.rules new file mode 100644 index 0000000000..9c4ea4214d --- /dev/null +++ b/packages/udev/udev-100/udev.rules @@ -0,0 +1,98 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +KERNEL=="buzzer", NAME="misc/buzzer" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" + +# Firmware Helper +ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb new file mode 100644 index 0000000000..2e9e8d500f --- /dev/null +++ b/packages/udev/udev_100.bb @@ -0,0 +1,63 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \ +/dev/, handles hotplug events and loads drivers at boot time. It replaces \ +the hotplug package and requires a kernel not older than 2.6.15." +DESCRIPTION_libvolume-id = "libvolume_id shared library, \ +used to detect the type of a file system and read its metadata." +DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ +needed to link programs with libvolume_id." + +PR = "r0" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://mount.blacklist \ + " + +require udev.inc + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" + +INITSCRIPT_PARAMS = "start 03 S ." + +PACKAGES =+ "libvolume-id-dev libvolume-id" +PKG_libvolume-id-dev = "libvolume-id-dev" +FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" +FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" +FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN}-dbg += "${base_libdir}/udev/.debug" +UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" +EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" + +do_install () { + install -d ${D}${usrsbindir} \ + ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + + install -d ${D}${sysconfdir}/udev/rules.d/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ + install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules + install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf + if [ "${UDEV_DEVFS_RULES}" = "1" ]; then + install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules + fi + + install -d ${D}${sysconfdir}/udev/scripts/ + + install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh + install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts + + install -d ${D}${base_libdir}/udev/ +} + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} -- cgit v1.2.3 From 067b1c71f57fabc6c8abba4cc2e3420637b06228 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 8 Sep 2006 11:27:02 +0000 Subject: uclibc: chaned do_stage to do_install_prepend to resolve order issue --- packages/uclibc/uclibc.inc | 2 +- packages/uclibc/uclibc_0.9.28.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index e48c6d734d..2064489ec6 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -113,7 +113,7 @@ do_configure() { oe_runmake oldconfig } -do_stage() { +do_install_prepend() { # Install into the cross dir (this MUST be done first because we # will install crt1.o in the install_dev stage and gcc needs it) oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 0a0fe100cd..807fcb8a67 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r6" +PR = "r7" require uclibc.inc -- cgit v1.2.3