diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
| commit | 269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch) | |
| tree | d6e35e6da4bc19f657ac07ff8447ec065d85a4aa | |
| parent | d1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff) | |
| parent | 2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
202 files changed, 8260 insertions, 1980 deletions
diff --git a/.gitignore b/.gitignore index aec87fdd9..7e27e221d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,13 +15,14 @@ toolchain_build_*/ .tmpconfig.h .prereq_done .config* +.busyboxcfg .defconfig all.config .cfg/ .cfg.*/ cross_*/ root_*/ -bin_*/ +bin/ build_*/ config/*.o config/lxdialog/*.o @@ -1,3 +1,4 @@ +- packages with subpackages get recompiled - openssh on amd64 does not work, ssh-keygen endless loop - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches) - qemu-mips64* targets does not boot, kernel problem? @@ -7,7 +7,6 @@ config ADKVERSION mainmenu "OpenADK Configuration" - config MODULES bool default y @@ -21,6 +20,11 @@ menu "ADK settings" config ADK_DEVELSYSTEM bool "Compile a ADK development system" default n + select BUSYBOX_CMP + select BUSYBOX_EXPR + select BUSYBOX_MKTEMP + select BUSYBOX_UNZIP + select BUSYBOX_TEE select ADK_PACKAGE_AUTOCONF select ADK_PACKAGE_AUTOMAKE select ADK_PACKAGE_BASH @@ -1,6 +1,4 @@ -$Id$ - -OpenADK is Copyright © 2008 Waldemar Brodkorb +OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org> All rights reserved. This licence file covers all of the OpenADK meta distribution @@ -19,20 +17,14 @@ by the GNU General Public License, Version 2 or later, as shown in the file COPYING in this directory. Individual files may be covered by the LGPL or BSD-style licences instead. OpenADK also contains tools that are possibly covered by non-GPL-compatible, -but OSD/DFSG-compliant, licences. Specifically, some of these -components may require acknowledgements to be displayed in the -advertising materials; these are listed here: -‣ This product includes material provided by Thorsten Glaser. +but OSD/DFSG-compliant, licences. OpenADK is based upon several other projects which are listed below, in no particular order. If you think you should be li- -sted here but we have forgotten you, please forgive and drop -us an email. - +sted here but I have forgotten you, please forgive and drop +me an email. • The FreeWRT Project • The OpenWrt Project • uClibc Buildroot • The MirOS Project and contributors - -──────────────────────────────────────────────────────────────────────── @@ -5,6 +5,7 @@ This is a menu based buildsystem for your home made embedded Linux system. Before you can start you need to install some tools: - bash +- mksh - gcc - binutils - GNU make @@ -20,16 +21,17 @@ Before you can start you need to install some tools: - unzip - autoconf - automake -- zlib-dev / libz-dev -- libncurses5-dev -- libc-dev +- Ãlibtool +- libc headers +- ncurses5 headers +- zlib headers - perl -There is a check for the required versions of these tools in advance, though +There is a check for the required versions of these tools in advance, though. (to re-issue the checks, use "make prereq"). -Please use "make menuconfig" to choose your embedded system and configure like you -want to. +Please use "make menuconfig" to choose your embedded system and configure +like you want to. Simply running 'make' will build the firmware for your embedded system. The buildsystem will download all sources, build the toolchain, the kernel and all @@ -0,0 +1,6 @@ +These people helped to improve OpenADK by submitting code, manuals, bug +reports, patches or good suggestions: + +Thorsten Glaser <tg@mirbsd.org> +Joerg Seitter <oss@seitter.net> +Phil Sutter <phil@nwl.cc> @@ -1,6 +1,15 @@ +- do a make bulk for all targets +- implement update for MTD devices (foxboard,rb532,ag241) +- network scripts for wireless client and acess point +- add tcsh and describe new package creation procedure in wiki +- add toolchain only support for generic toolchains (mips/ppc/..) +- fix watchdog for alix1c (mfgpt timers problem) - netbsd build - macos x build +- update to 2.6.33 +- use LZMA kernels for MIPS targets +- package drbd +- new packages for openais and pacemaker +- continuos build via hudson or sth. like that - implement rpm package backend -- implement update for MTD devices (foxboard,rb532,ag241) -- network scripts for wireless client and acess point -- customise mconf help texts to better fit for OpenADK +- implement dpkg package backend diff --git a/mk/build.mk b/mk/build.mk index d9d33d6c1..5c26ea4c9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -38,12 +38,18 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ BUSYBOX_FLASH_UNLOCK=n \ BUSYBOX_FLASH_ERASEALL=n \ BUSYBOX_PIE=n \ + BUSYBOX_TASKSET=n \ BUSYBOX_DEBUG=n \ BUSYBOX_NOMMU=n \ BUSYBOX_WERROR=n \ BUSYBOX_STATIC=n \ + BUSYBOX_FEATURE_AIX_LABEL=n \ + BUSYBOX_FEATURE_SUN_LABEL=n \ + BUSYBOX_FEATURE_OSF_LABEL=n \ + BUSYBOX_FEATURE_SGI_LABEL=n \ ADK_KERNEL_RT2X00_DEBUG=n \ - ADK_KERNEL_ATH5K_DEBUG=n + ADK_KERNEL_ATH5K_DEBUG=n \ + ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ _config \ @@ -51,10 +57,7 @@ noconfig_targets:= menuconfig \ distclean \ tags -MAKECLEANDIR_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ - ADK_TARGET_LIB_GLIBC \ - ADK_TARGET_LIB_ECLIBC \ - ADK_DEBUG +MAKECLEANDIR_SYMBOLS= ADK_DEBUG MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \ ADK_TARGET_PACKAGE_RPM \ @@ -83,11 +86,7 @@ POSTCONFIG= -@ \ "$$what' might be required!"; \ break; \ done; \ - fi; \ - if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \ - if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \ - rm build_*/w-busybox*/busybox*/.configure_done; \ - fi; \ + if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \ fi; \ fi @@ -183,7 +182,7 @@ kernelconfig: newpackage: @echo "Creating new package $(PKG)" $(CP) $(TOPDIR)/package/.template $(TOPDIR)/package/$(PKG) - pkg=$$(echo $(PKG)|tr '[:lower:]' '[:upper:]'); \ + pkg=$$(echo $(PKG)|tr '[:lower:]-' '[:upper:]_'); \ $(SED) "s#@UPKG@#$$pkg#" $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@PKG@#$(PKG)#' $(TOPDIR)/package/$(PKG)/Makefile $(SED) 's#@VER@#$(VER)#' $(TOPDIR)/package/$(PKG)/Makefile @@ -232,14 +231,15 @@ cleandir: rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \ $(TOOLS_BUILD_DIR) rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \ - ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk + ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk \ + .busyboxcfg cleantarget: @$(TRACE) cleantarget @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) all.config .defconfig - rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk + rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk .busyboxcfg distclean: @$(TRACE) distclean @@ -248,7 +248,8 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d $(TOPDIR)/bulkdir @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ - .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \ + .busyboxcfg else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) diff --git a/mk/image.mk b/mk/image.mk index a2a6bb176..04506f0cd 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -13,7 +13,6 @@ image-prepare-post: rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \ dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd - # Sanity checks @cd ${TARGET_DIR}; ls=; ln=; li=; x=1; md5sum $$(find . -type f) | \ sed -e "s/*//" | \ while read sum name; do \ @@ -47,6 +46,11 @@ image-prepare-post: done chmod 4511 ${TARGET_DIR}/bin/busybox chmod 1777 ${TARGET_DIR}/tmp + @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ + for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \ + mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ + done; \ + fi INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS} ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img diff --git a/mk/modules.mk b/mk/modules.mk index c208b80a7..b7074a143 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -858,9 +858,12 @@ $(eval $(call KMOD_template,RPCSEC_GSS_KRB5,rpcsec-gss-krb5,\ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5 \ ,26)) +$(eval $(call KMOD_template,LOCKD,lockd,\ + $(MODULES_DIR)/kernel/fs/lockd/lockd \ +,27)) + ifneq ($(ADK_KERNEL_NFS_FS),y) $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ - $(MODULES_DIR)/kernel/fs/lockd/lockd \ $(MODULES_DIR)/kernel/fs/nfs/nfs \ ,30)) endif diff --git a/mk/package.mk b/mk/package.mk index f5a48dba8..50f5ecb61 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -233,7 +233,7 @@ endif @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ + $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$$$fn; \ done ifeq (,$(filter noscripts,$(7))) @cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 4db8b730d..1099a7fac 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -18,7 +18,7 @@ $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) -$(eval $(call rootfs_template,yaffs,YAFFS)) +$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/mk/vars.mk b/mk/vars.mk index cba312e2d..53755266e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -18,20 +18,20 @@ TARGET_CFLAGS:= $(TARGET_OPTIMIZATION) $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING BASE_DIR:= $(TOPDIR) DISTDIR?= ${BASE_DIR}/dl -BUILD_DIR:= ${BASE_DIR}/build_${CPU_ARCH} +BUILD_DIR:= ${BASE_DIR}/build_${ADK_TARGET}_${ADK_LIBC} BUILD_DIR_PFX:= $(BASE_DIR)/build_* -STAGING_PARENT:= ${BASE_DIR}/cross_${CPU_ARCH} +STAGING_PARENT:= ${BASE_DIR}/cross_${ADK_TARGET}_${ADK_LIBC} STAGING_PARENT_PFX:= ${BASE_DIR}/cross_* STAGING_TOOLS:= ${STAGING_PARENT}/host STAGING_DIR:= ${STAGING_PARENT}/target -TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH} +TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${ADK_TARGET}_${ADK_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build SCRIPT_DIR:= $(BASE_DIR)/scripts -BIN_DIR:= $(BASE_DIR)/bin_${ADK_TARGET} -BIN_DIR_PFX:= $(BASE_DIR)/bin_* +BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET}_${ADK_LIBC} +BIN_DIR_PFX:= $(BASE_DIR)/bin PACKAGE_DIR:= $(BIN_DIR)/packages -TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET} +TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX) diff --git a/package/.template/Makefile b/package/.template/Makefile index 67d1cc183..32c24923c 100644 --- a/package/.template/Makefile +++ b/package/.template/Makefile @@ -31,6 +31,7 @@ INSTALL_STYLE:= auto # please install all files and directories to the package dir post-install: $(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \ + $(IDIR_@UPKG@)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/Config.in b/package/Config.in index dadce220f..98b30b967 100644 --- a/package/Config.in +++ b/package/Config.in @@ -4,18 +4,18 @@ menu "Package selection" menu "Basesystem" +source "package/adkinstall/Config.in" source "package/base-files/Config.in" source "package/busybox/Config.in.manual" source "package/cfgfs/Config.in" -source "package/cfinstall/Config.in" source "package/cryptinit/Config.in" source "package/uclibc/Config.in.manual" source "package/glibc/Config.in.manual" source "package/eglibc/Config.in.manual" source "package/libc/Config.in.manual" -source "package/rpm/Config.in" source "package/grub/Config.in" source "package/grub-bin/Config.in" +source "package/rpm/Config.in" endmenu menu "Bluetooth" @@ -27,21 +27,33 @@ source "package/ussp-push/Config.in" endmenu menu "Browser / Editor / Pager" +source "package/elinks/Config.in" source "package/less/Config.in" -source "package/nano/Config.in" -source "package/vim/Config.in" source "package/links/Config.in" -source "package/elinks/Config.in" source "package/lynx/Config.in" +source "package/nano/Config.in" +source "package/vim/Config.in" endmenu -menu "Archivers / Compression" +menu "Compression and Archivers" source "package/bzip2/Config.in" source "package/cpio/Config.in" source "package/tar/Config.in" source "package/xz/Config.in" endmenu +menu "Cryptography" +source "package/cryptsetup/Config.in" +source "package/gpg/Config.in" +source "package/heimdal/Config.in" +source "package/krb5/Config.in" +source "package/openct/Config.in" +source "package/opensc/Config.in" +source "package/openssl/Config.in" +source "package/openssl-pkcs11/Config.in" +source "package/rng-tools/Config.in" +endmenu + menu "Debugging / Analyzing" source "package/exmap/Config.in" source "package/gdb/Config.in" @@ -121,16 +133,6 @@ source "package/mksh/Config.in" source "package/zsh/Config.in" endmenu -menu "Security" -source "package/cryptsetup/Config.in" -source "package/gpg/Config.in" -source "package/heimdal/Config.in" -source "package/krb5/Config.in" -source "package/openct/Config.in" -source "package/opensc/Config.in" -source "package/openssl/Config.in" -source "package/openssl-pkcs11/Config.in" -endmenu menu "Serial communications & terminal emulation" source "package/heyu/Config.in" @@ -148,8 +150,10 @@ endmenu menu "Utilities" source "package/bc/Config.in" source "package/comgt/Config.in" +source "package/cpufrequtils/Config.in" source "package/fbset/Config.in" source "package/file/Config.in" +source "package/findutils/Config.in" source "package/hdparm/Config.in" source "package/usbutils/Config.in" source "package/patch/Config.in" @@ -163,28 +167,6 @@ source "package/swconfig/Config.in" source "package/watchdog/Config.in" endmenu -menu "Programming / Languages" -source "package/autoconf/Config.in" -source "package/automake/Config.in" -source "package/binutils/Config.in" -source "package/bison/Config.in" -source "package/diffutils/Config.in" -source "package/flex/Config.in" -source "package/gawk/Config.in" -source "package/gcc/Config.in" -source "package/gperf/Config.in" -source "package/haserl/Config.in" -source "package/jamvm/Config.in" -source "package/lua/Config.in" -source "package/m4/Config.in" -source "package/make/Config.in" -source "package/microperl/Config.in" -source "package/perl/Config.in" -source "package/php/Config.in" -source "package/python/Config.in" -source "package/ruby/Config.in" -source "package/tcl/Config.in" -endmenu menu "Network - Analyze / Debugging / Monitoring" source "package/bwm/Config.in" @@ -203,6 +185,8 @@ source "package/netperf/Config.in" source "package/nmap/Config.in" source "package/sipsak/Config.in" source "package/tcpdump/Config.in" +source "package/tptest/Config.in" +source "package/traceroute/Config.in" #source "package/trafshow/Config.in" source "package/ttcp/Config.in" endmenu @@ -216,6 +200,7 @@ source "package/dhcp-forwarder/Config.in" source "package/dnsmasq/Config.in" source "package/ez-ipupdate/Config.in" source "package/maradns/Config.in" +source "package/pdnsd/Config.in" source "package/updatedd/Config.in" endmenu @@ -224,6 +209,7 @@ source "package/curl/Config.in" source "package/gatling/Config.in" source "package/lighttpd/Config.in" source "package/mini_httpd/Config.in" +source "package/proftpd/Config.in" source "package/tntnet/Config.in" source "package/vsftpd/Config.in" source "package/wget/Config.in" @@ -269,113 +255,6 @@ source "package/wondershaper/Config.in" source "package/vrrpd/Config.in" endmenu -menu "Networking Misc" -source "package/cups/Config.in" -source "package/fakeidentd/Config.in" -source "package/gkrellmd/Config.in" -source "package/git/Config.in" -source "package/net-snmp/Config.in" -# intentionally inserted here, as it depends on the above -source "package/iptables-snmp/Config.in" -source "package/nut/Config.in" -source "package/openldap/Config.in" -source "package/p910nd/Config.in" -source "package/pipacs/Config.in" -#source "package/pmacct/Config.in" -source "package/portmap/Config.in" -source "package/rarpd/Config.in" -source "package/rrs/Config.in" -source "package/rsync/Config.in" -source "package/shat/Config.in" -source "package/socat/Config.in" -source "package/subversion/Config.in" -source "package/udp-broadcast-relay/Config.in" -source "package/vgp/Config.in" -source "package/vnstat/Config.in" -source "package/vtun/Config.in" -source "package/wccpd/Config.in" -source "package/xinetd/Config.in" -endmenu - -menu "Network Filesystems" -source "package/davfs2/Config.in" -source "package/davfs2/Config.in.kernel" -source "package/nfs-utils/Config.in" -source "package/samba/Config.in" -endmenu - -menu "NTP" -source "package/htpdate/Config.in" -source "package/ntpclient/Config.in" -source "package/openntpd/Config.in" -source "package/rdate/Config.in" -endmenu - -menu "P2P" -source "package/cbtt/Config.in" -source "package/ctorrent/Config.in" -source "package/rtorrent/Config.in" -endmenu - -menu "PPP / PPTP / RADIUS" -source "package/freeradius-client/Config.in" -source "package/freeradius-server/Config.in" -source "package/ppp/Config.in" -source "package/pptp/Config.in" -source "package/pptpd/Config.in" -source "package/rp-pppoe/Config.in" -source "package/raddump/Config.in" -endmenu - -menu "Proxy" -source "package/dansguardian/Config.in" -source "package/frickin/Config.in" -source "package/igmpproxy/Config.in" -source "package/parprouted/Config.in" -source "package/privoxy/Config.in" -source "package/siproxd/Config.in" -source "package/squid/Config.in" -source "package/srelay/Config.in" -source "package/tinyproxy/Config.in" -source "package/tor/Config.in" -source "package/vnc-reflector/Config.in" -endmenu - -menu "Networking Security" -source "package/arpwatch/Config.in" -source "package/autossh/Config.in" -source "package/axtls/Config.in" -source "package/ca-certificates/Config.in" -source "package/dropbear/Config.in" -source "package/httptunnel/Config.in" -source "package/ipsec-tools/Config.in" -source "package/l2tpns/Config.in" -source "package/openssh/Config.in" -source "package/openssh/Config.in.kerberos" -source "package/openswan/Config.in" -source "package/openvpn/Config.in" -source "package/portsentry/Config.in" -source "package/ptunnel/Config.in" -source "package/scanlogd/Config.in" -source "package/snort/Config.in" -source "package/ssltunnel/Config.in" -source "package/tinc/Config.in" -source "package/vpnc/Config.in" -endmenu - -menu "Wireless" -source "package/aircrack-ng/Config.in" -source "package/chillispot/Config.in" -source "package/hostapd/Config.in" -source "package/iw/Config.in" -#source "package/kismet/Config.in" -source "package/olsrd/Config.in" -source "package/wifidog/Config.in" -source "package/wireless-firmware/Config.in" -source "package/wpa_supplicant/Config.in" -endmenu - - menu "Libraries" source "package/alsa-lib/Config.in" source "package/apr/Config.in" @@ -454,6 +333,7 @@ source "package/mysql/Config.in.lib" source "package/nspr/Config.in" source "package/nss/Config.in" source "package/libtool/Config.in" +source "package/libtool/Config.in.lib" source "package/openldap/Config.in.lib" source "package/liblzo/Config.in" source "package/liblzo/Config.in.lib" @@ -466,7 +346,11 @@ source "package/ncurses/Config.in.lib" source "package/neon/Config.in" source "package/libnet/Config.in" source "package/libnet/Config.in.lib" +source "package/libnetfilter_queue/Config.in" +source "package/libnetfilter_queue/Config.in.lib" source "package/libnfsidmap/Config.in" +source "package/libnfnetlink/Config.in" +source "package/libnfnetlink/Config.in.lib" source "package/libnids/Config.in" source "package/libnl/Config.in" source "package/libnl/Config.in.lib" @@ -498,6 +382,7 @@ source "package/libpthread/Config.in" source "package/libpthread/Config.in.lib" source "package/libthread_db/Config.in" source "package/readline/Config.in" +source "package/readline/Config.in.lib" source "package/cyrus-sasl/Config.in.lib" source "package/sdl/Config.in" source "package/sdl/Config.in.lib" @@ -545,13 +430,170 @@ source "package/ustl/Config.in" source "package/zlib/Config.in" endmenu -menu "X" + +menu "Networking Misc" +source "package/cups/Config.in" +source "package/fakeidentd/Config.in" +source "package/gkrellmd/Config.in" +source "package/git/Config.in" +source "package/net-snmp/Config.in" +# intentionally inserted here, as it depends on the above +source "package/iptables-snmp/Config.in" +source "package/nut/Config.in" +source "package/openldap/Config.in" +source "package/p910nd/Config.in" +source "package/pipacs/Config.in" +#source "package/pmacct/Config.in" +source "package/portmap/Config.in" +source "package/rarpd/Config.in" +source "package/rpcbind/Config.in" +source "package/rrs/Config.in" +source "package/rsync/Config.in" +source "package/shat/Config.in" +source "package/socat/Config.in" +source "package/subversion/Config.in" +source "package/udp-broadcast-relay/Config.in" +source "package/vgp/Config.in" +source "package/vnstat/Config.in" +source "package/vtun/Config.in" +source "package/wccpd/Config.in" +source "package/xinetd/Config.in" +endmenu + +menu "Network Filesystems" +source "package/davfs2/Config.in" +source "package/davfs2/Config.in.kernel" +source "package/nfs-utils/Config.in" +source "package/samba/Config.in" +endmenu + +menu "NTP" +source "package/htpdate/Config.in" +source "package/ntpclient/Config.in" +source "package/openntpd/Config.in" +source "package/rdate/Config.in" +endmenu + +menu "P2P" +source "package/cbtt/Config.in" +source "package/ctorrent/Config.in" +source "package/rtorrent/Config.in" +endmenu + +menu "PPP / PPTP / RADIUS" +source "package/freeradius-client/Config.in" +source "package/freeradius-server/Config.in" +source "package/ppp/Config.in" +source "package/pptp/Config.in" +source "package/pptpd/Config.in" +source "package/rp-pppoe/Config.in" +source "package/raddump/Config.in" +endmenu + +menu "Proxy" +source "package/dansguardian/Config.in" +source "package/frickin/Config.in" +source "package/igmpproxy/Config.in" +source "package/parprouted/Config.in" +source "package/privoxy/Config.in" +source "package/siproxd/Config.in" +source "package/squid/Config.in" +source "package/srelay/Config.in" +source "package/tinyproxy/Config.in" +source "package/tor/Config.in" +source "package/vnc-reflector/Config.in" +endmenu + +menu "Programming / Languages" +source "package/autoconf/Config.in" +source "package/automake/Config.in" +source "package/binutils/Config.in" +source "package/bison/Config.in" +source "package/diffutils/Config.in" +source "package/flex/Config.in" +source "package/gawk/Config.in" +source "package/gcc/Config.in" +source "package/gperf/Config.in" +source "package/haserl/Config.in" +source "package/jamvm/Config.in" +source "package/lua/Config.in" +source "package/m4/Config.in" +source "package/make/Config.in" +source "package/microperl/Config.in" +source "package/perl/Config.in" +source "package/php/Config.in" +source "package/python/Config.in" +source "package/ruby/Config.in" +source "package/tcl/Config.in" +endmenu + +menu "Networking Security" +source "package/arpwatch/Config.in" +source "package/autossh/Config.in" +source "package/axtls/Config.in" +source "package/ca-certificates/Config.in" +source "package/dropbear/Config.in" +source "package/httptunnel/Config.in" +source "package/ipsec-tools/Config.in" +source "package/l2tpns/Config.in" +source "package/openssh/Config.in" +source "package/openssh/Config.in.kerberos" +source "package/openswan/Config.in" +source "package/openvpn/Config.in" +source "package/portsentry/Config.in" +source "package/ptunnel/Config.in" +source "package/scanlogd/Config.in" +source "package/snort/Config.in" +source "package/ssltunnel/Config.in" +source "package/tinc/Config.in" +source "package/vpnc/Config.in" +endmenu + +menu "Wireless" +source "package/aircrack-ng/Config.in" +source "package/chillispot/Config.in" +source "package/hostapd/Config.in" +source "package/iw/Config.in" +#source "package/kismet/Config.in" +source "package/olsrd/Config.in" +source "package/wifidog/Config.in" +source "package/wireless-firmware/Config.in" +source "package/wpa_supplicant/Config.in" +endmenu + + +menu "Xorg server and drivers" source "package/xorg-server/Config.in" source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-input-mouse/Config.in" source "package/xf86-input-keyboard/Config.in" source "package/xf86-input-evtouch/Config.in" +endmenu + +menu "X Applications" +source "package/evilwm/Config.in" +source "package/font-util/Config.in" +source "package/rxvt-unicode/Config.in" +source "package/xauth/Config.in" +source "package/xlsfonts/Config.in" +endmenu + +menu "X Fonts" +source "package/font-adobe-75dpi/Config.in" +source "package/font-adobe-100dpi/Config.in" +source "package/font-bitstream-75dpi/Config.in" +source "package/font-bitstream-100dpi/Config.in" +source "package/font-bitstream-type1/Config.in" +source "package/font-bh-lucidatypewriter-75dpi/Config.in" +source "package/font-bh-lucidatypewriter-100dpi/Config.in" +source "package/font-bh-75dpi/Config.in" +source "package/font-bh-100dpi/Config.in" +source "package/font-bh-type1/Config.in" +source "package/font-bh-ttf/Config.in" +source "package/font-misc-misc/Config.in" +source "package/font-xfree86-type1/Config.in" +endmenu menu "X Libraries" source "package/libICE/Config.in" @@ -593,9 +635,6 @@ source "package/pixman/Config.in" source "package/xkbcomp/Config.in" source "package/xkeyboard-config/Config.in" endmenu - -endmenu - endmenu menu "Kernel configuration" diff --git a/package/Makefile b/package/Makefile index 2e83a0799..0f8c43a92 100644 --- a/package/Makefile +++ b/package/Makefile @@ -41,9 +41,6 @@ compile: base-files-compile $(COMPILE_PACKAGES) install: base-files-install $(INSTALL_PACKAGES) endif -#$(COMPILE_PACKAGES): base-files-compile -#$(INSTALL_PACKAGES): base-files-install - $(TARGET_DIR): mkdir -p $(TARGET_DIR) @@ -59,7 +56,8 @@ $(TARGET_DIR): $(CMD_TRACE) " done" $(END_TRACE) -%-install: %-compile +#%-install: %-compile +%-install: @$(START_TRACE) "package/$(patsubst %-install,%,$@)-install: " @$(MAKE) -C $(patsubst %-install,%,$@) install @$(CMD_TRACE) " done" diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile new file mode 100644 index 000000000..d250a1e70 --- /dev/null +++ b/package/adkinstall/Makefile @@ -0,0 +1,37 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= adkinstall +PKG_VERSION:= 1.0 +PKG_RELEASE:= 3 +PKG_DESCR:= installer for compact flash or nand/mtd devices +PKG_SECTION:= base +PKG_DEPENDS:= parted sfdisk + +PKG_TARGET_DEPENDS:= alix wrap rb532 + +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} +NO_DISTFILES:= 1 + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +pre-configure: + mkdir -p ${WRKBUILD} + +do-install: + ${INSTALL_DIR} $(IDIR_ADKINSTALL)/sbin +ifeq ($(ADK_LINUX_MIPS_RB532),y) + ${INSTALL_BIN} ./src/adkinstall.rb532 \ + $(IDIR_ADKINSTALL)/sbin/adkinstall +else + ${INSTALL_BIN} ./src/adkinstall $(IDIR_ADKINSTALL)/sbin +endif + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfinstall/src/cfinstall b/package/adkinstall/src/adkinstall index 7e9a0d1ad..7e9a0d1ad 100644 --- a/package/cfinstall/src/cfinstall +++ b/package/adkinstall/src/adkinstall diff --git a/package/adkinstall/src/adkinstall.rb532 b/package/adkinstall/src/adkinstall.rb532 new file mode 100644 index 000000000..ca2ffde0d --- /dev/null +++ b/package/adkinstall/src/adkinstall.rb532 @@ -0,0 +1,78 @@ +#!/bin/sh +# installs a rootfs tar archive from OpenADK onto +# a Compact Flash disk or NAND device +# special script for routerboard rb532 + +nandinstall=0 +cfinstall=0 + +if [ -z $1 ];then + printf "Please give your target device as first parameter [cf|nand]\n" + exit 1 +fi +if [ -z $2 ];then + printf "Please give your root tar archive as second parameter\n" + exit 1 +fi +if [ -z $3 ];then + printf "Please give your kernel as third parameter\n" + exit 1 +fi +case $1 in + nand) + nandinstall=1 + ;; + cf) + cfinstall=1 + ;; + *) + printf "Target not recognized\n" + exit 1 + ;; +esac + +if [ $cfinstall -eq 1 ];then + # create empty partition table + printf "Creating partition scheme\n" + parted -s /dev/sda mklabel msdos + sleep 2 + maxsize=$(env LC_ALL=C parted /dev/sda -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') + rootsize=$(($maxsize-2)) + parted -s /dev/sda unit cyl mkpart primary ext2 0 1 + parted -s /dev/sda unit cyl mkpartfs primary ext2 1 $rootsize + parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize + parted -s /dev/sda set 1 boot on + sfdisk --change-id /dev/sda 1 27 >/dev/null 2>&1 + sfdisk --change-id /dev/sda 3 88 >/dev/null 2>&1 + sleep 2 + sync + printf "Installing kernel\n" + dd if=$3 of=/dev/sda1 bs=2048 >/dev/null 2>&1 + sync + mount -t ext2 /dev/sda2 /mnt +fi + +if [ $nandinstall -eq 1 ];then + printf "Installing kernel\n" + mount -t yaffs2 /dev/mtdblock0 /mnt + cp $3 /mnt/kernel + sync + umount /mnt + mount -t yaffs2 /dev/mtdblock1 /mnt + rm -rf /mnt/* >/dev/null 2>&1 +fi + +printf "Extracting install archive\n" +tar -C /mnt -xzpf $2 + +chmod 1777 /mnt/tmp +chmod 4755 /mnt/bin/busybox + +printf "Creating device nodes\n" +mknod -m 666 /mnt/dev/null c 1 3 +mknod -m 622 /mnt/dev/console c 5 1 +mknod -m 666 /mnt/dev/tty c 5 0 + +umount /mnt +printf "Successfully installed.\n" +exit 0 diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index c66f4c7e5..86d311c83 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.28 +PKG_VERSION:= 1.6.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= e8006ce319e18ce07ce1335ad583330a +PKG_MD5SUM:= 8fbc60f9d80e686c749ae95292e225d8 PKG_DESCR:= Open Source PBX PKG_SECTION:= net PKG_MULTI:= 1 @@ -24,11 +24,10 @@ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ PKG_TARGET_DEPENDS:= !foxboard -#PKG_DEPENDS_MAIN:= asterisk -PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation -PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation -PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol -PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator +PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation +PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation +PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol +PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator include $(TOPDIR)/mk/package.mk @@ -65,27 +64,31 @@ endif CONFIGURE_ARGS= --with-z=${STAGING_DIR}/usr \ --with-ncurses=${STAGING_DIR}/usr \ --with-ssl=${STAGING_DIR}/usr \ - --without-zaptel \ + --disable-xmldoc \ --without-tonezone \ --without-asound \ --without-curses \ - --without-gnutls \ + --without-gtk \ + --without-gtk2 \ --without-h323 \ --without-iksemel \ --without-imap \ - --without-kde \ --without-nbs \ --without-netsnmp \ --without-newt \ - --without-odbc \ --without-osptk \ --without-oss \ + --without-popt \ --without-pri \ --without-pwlib \ --without-tds \ --without-termcap \ --without-tinfo \ - --without-vpb + --without-vpb \ + --without-misdn \ + --without-isdnnet \ + --without-suppserv + ifneq (${ADK_PACKAGE_ASTERISK_CODEC_GSM},) CONFIGURE_ARGS+= --with-gsm=internal else @@ -110,17 +113,9 @@ CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr else CONFIGURE_ARGS+= --without-postgres endif -ifneq (${ADK_PACKAGE_LIBPOPT},) -CONFIGURE_ARGS+= --with-popt=${STAGING_DIR}/usr -else -CONFIGURE_ARGS+= --without-popt -endif -CONFIGURE_ARGS+= --without-misdn \ - --without-isdnnet \ - --without-suppserv +TLDFLAGS+= -lm CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= STRIP=${STRIP} BUILD_STYLE:= auto MAKE_ENV= ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TLDFLAGS}" @@ -132,13 +127,12 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - rm ${WRKBUILD}/apps/app_followme.c cd "$(WRKBUILD)/menuselect"; ./configure post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.16.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.16.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.17.tar.gz @echo @echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---" @echo @@ -157,8 +151,9 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} rm -rf mohmp3/*.mp3; \ rm -rf sounds/*; \ cd modules; \ - rm -rf *adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \ - *mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \ + rm -rf *adsi* *festival* *modem* *meetme* *oss* \ + *phone* *intercom* *mp3* *nbscat* *mysql* \ + *postgres* *pgsql* *voicemail* *speex* \ *zapateller* *jpeg*; \ rm -f chan_bluetooth.so ; \ rm -f chan_h323.so ; \ @@ -172,80 +167,105 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} rm -f res_agi.so ; \ ) (cd $(IDIR_ASTERISK)/etc/asterisk; \ - rm -f *iax* *odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \ - *festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \ + rm -f *iax* *odbc* *mysql* *postgres* *pgsql* \ + *voicemail* *adsi* *oss* *alsa* \ + *festival* *modem* *meetme* *phone* *tds* \ + *vofr* *rpt* *vpb* \ *zapata*; \ rm -f bluetooth.conf ; \ rm -f mgcp.conf ; \ + rm -f gtalk.conf ; \ rm -f skinny.conf ; \ rm -f dundi.conf ; \ ) ${INSTALL_DATA} ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ - $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf + $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' \ + $(WRKINST)/etc/asterisk/musiconhold.conf asterisk-pgsql-install: ${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf + ${INSTALL_DATA} $(WRKBUILD)/configs/cdr_pgsql.conf.sample \ + $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf ${INSTALL_DIR} $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/cdr/cdr_pgsql.so \ + $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/ asterisk-sounds-install: ${INSTALL_DIR} $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds - $(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ + $(CP) $(WRKBUILD)/sounds/* \ + $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3 rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-* asterisk-voicemail-install: ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules - ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf - ${CP} $(WRKBUILD)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ - ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ + ${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample \ + $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf + ${CP} $(WRKBUILD)/apps/*voicemail.so \ + $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/res/res_adsi.so \ + $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ ${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds - $(CP) $(WRKBUILD)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ + $(CP) $(WRKBUILD)/sounds/vm-*.gsm \ + $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ asterisk-chan-mgcp-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf + ${INSTALL_DATA} $(WRKBUILD)/configs/mgcp.conf.sample \ + $(IDIR_ASTERISK_CHAN_MGCP)/etc/asterisk/mgcp.conf ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/channels/chan_mgcp.so \ + $(IDIR_ASTERISK_CHAN_MGCP)/usr/lib/asterisk/modules/ asterisk-chan-skinny-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf + ${INSTALL_DATA} $(WRKBUILD)/configs/skinny.conf.sample \ + $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/skinny.conf ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/channels/chan_skinny.so \ + $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/ asterisk-chan-iax2-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules - ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf - ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf - ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/ + ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample \ + $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iax.conf + ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample \ + $(IDIR_ASTERISK_CHAN_IAX2)/etc/asterisk/iaxprov.conf + ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so \ + $(IDIR_ASTERISK_CHAN_IAX2)/usr/lib/asterisk/modules/ asterisk-codec-speex-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_speex.so \ + $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/ asterisk-codec-gsm-install: ${INSTALL_DIR} $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/ - ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/codecs/codec_gsm.so \ + $(IDIR_ASTERISK_CODEC_GSM)/usr/lib/asterisk/modules/ asterisk-pbx-dundi-install: ${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk - ${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf + ${INSTALL_DATA} $(WRKBUILD)/configs/dundi.conf.sample \ + $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf ${INSTALL_DIR} $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/pbx/pbx_dundi.so \ + $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/ asterisk-res-agi-install: ${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/agi-bin ${INSTALL_DIR} $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules - ${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/ + ${INSTALL_BIN} $(WRKBUILD)/res/res_agi.so \ + $(IDIR_ASTERISK_RES_AGI)/usr/lib/asterisk/modules/ asterisk-meetme-install: ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/ ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules - ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf - ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules + ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample \ + ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf + ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so \ + ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/asterisk/files/asterisk.init b/package/asterisk/files/asterisk.init index 01a4edd51..d11a1f1b1 100644 --- a/package/asterisk/files/asterisk.init +++ b/package/asterisk/files/asterisk.init @@ -10,13 +10,14 @@ autostart) exec sh $0 start ;; start) - [ -d /var/run ] || mkdir -p /var/run + [ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk [ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk /usr/sbin/asterisk ;; stop) - [ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1 + [ -f /var/run/asterisk/asterisk.pid ] && \ + kill $(cat /var/run/asterisk/asterisk.pid) >/dev/null 2>&1 ;; restart) sh $0 stop diff --git a/package/asterisk/patches/patch-apps__moduleinfo b/package/asterisk/patches/patch-apps__moduleinfo deleted file mode 100644 index efbdcae4a..000000000 --- a/package/asterisk/patches/patch-apps__moduleinfo +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- asterisk-1.4.24.1.orig/apps/.moduleinfo 2009-04-02 19:44:22.000000000 +0200 -+++ asterisk-1.4.24.1/apps/.moduleinfo 2009-05-12 16:07:52.000000000 +0200 -@@ -56,9 +56,6 @@ - <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so"> - <depend>dahdi</depend> - </member> --<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so"> -- <depend>chan_local</depend> --</member> - <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so"> - </member> - <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so"> diff --git a/package/asterisk/patches/patch-channels_chan_iax2_c b/package/asterisk/patches/patch-channels_chan_iax2_c deleted file mode 100644 index f39c2bf5b..000000000 --- a/package/asterisk/patches/patch-channels_chan_iax2_c +++ /dev/null @@ -1,20 +0,0 @@ ---- asterisk-1.4.27.1.orig/channels/chan_iax2.c 2009-11-10 18:15:57.000000000 +0100 -+++ asterisk-1.4.27.1/channels/chan_iax2.c 2009-12-03 20:57:05.000000000 +0100 -@@ -7076,7 +7076,7 @@ static int try_transfer(struct chan_iax2 - - memset(&ied, 0, sizeof(ied)); - if (ies->apparent_addr) -- bcopy(ies->apparent_addr, &new, sizeof(new)); -+ memcpy(&new, ies->apparent_addr, sizeof(new)); - if (ies->callno) - newcall = ies->callno; - if (!newcall || !new.sin_addr.s_addr || !new.sin_port) { -@@ -7235,7 +7235,7 @@ static int iax2_ack_registry(struct iax_ - - memset(&us, 0, sizeof(us)); - if (ies->apparent_addr) -- bcopy(ies->apparent_addr, &us, sizeof(us)); -+ memcpy(&us, ies->apparent_addr, sizeof(us)); - if (ies->username) - ast_copy_string(peer, ies->username, sizeof(peer)); - if (ies->refresh) diff --git a/package/asterisk/patches/patch-channels_chan_oss_c b/package/asterisk/patches/patch-channels_chan_oss_c deleted file mode 100644 index 33e9aaad7..000000000 --- a/package/asterisk/patches/patch-channels_chan_oss_c +++ /dev/null @@ -1,37 +0,0 @@ ---- asterisk-1.4.27.1.orig/channels/chan_oss.c 2009-08-10 21:15:57.000000000 +0200 -+++ asterisk-1.4.27.1/channels/chan_oss.c 2009-12-03 20:58:13.000000000 +0100 -@@ -562,7 +562,7 @@ static void send_sound(struct chan_oss_p - l = FRAME_SIZE - ofs; - if (l > s->datalen - start) /* don't overflow the source */ - l = s->datalen - start; -- bcopy(s->data + start, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, s->data + start, l * 2); - if (0) - ast_log(LOG_WARNING, "send_sound sound %d/%d of %d into %d\n", l_sampsent, l, s->samplen, ofs); - l_sampsent += l; -@@ -573,14 +573,14 @@ static void send_sound(struct chan_oss_p - if (l > 0) { - if (l > FRAME_SIZE - ofs) - l = FRAME_SIZE - ofs; -- bcopy(silence, myframe + ofs, l * 2); -+ memcpy(myframe + ofs, silence, l * 2); - l_sampsent += l; - } else { /* silence is over, restart sound if loop */ - if (s->repeat == 0) { /* last block */ - o->cursound = -1; - o->nosound = 0; /* allow audio data */ - if (ofs < FRAME_SIZE) /* pad with silence */ -- bcopy(silence, myframe + ofs, (FRAME_SIZE - ofs) * 2); -+ memcpy(myframe + ofs, silence, (FRAME_SIZE - ofs) * 2); - } - l_sampsent = 0; - } -@@ -905,7 +905,7 @@ static struct ast_frame *oss_read(struct - - /* XXX can be simplified returning &ast_null_frame */ - /* prepare a NULL frame in case we don't have enough data to return */ -- bzero(f, sizeof(struct ast_frame)); -+ memset(f, 0, sizeof(struct ast_frame)); - f->frametype = AST_FRAME_NULL; - f->src = oss_tech.type; - diff --git a/package/asterisk/patches/patch-codecs_gsm_Makefile b/package/asterisk/patches/patch-codecs_gsm_Makefile deleted file mode 100644 index 82653cc9b..000000000 --- a/package/asterisk/patches/patch-codecs_gsm_Makefile +++ /dev/null @@ -1,66 +0,0 @@ -disable uname -m checks ---- asterisk-1.4.26.orig/codecs/gsm/Makefile 2008-11-19 22:34:47.000000000 +0100 -+++ asterisk-1.4.26/codecs/gsm/Makefile 2009-08-21 12:29:21.450418652 +0200 -@@ -37,13 +37,13 @@ WAV49 = -DWAV49 - ######### ppro's, etc, as well as the AMD K6 and K7. The compile will - ######### probably require gcc. - --ifeq (, $(findstring $(OSARCH) , Darwin SunOS )) --ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips)) --ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 )) --OPTIMIZE+=-march=$(PROC) --endif --endif --endif -+#ifeq (, $(findstring $(OSARCH) , Darwin SunOS )) -+#ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips)) -+#ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 )) -+#OPTIMIZE+=-march=$(PROC) -+#endif -+#endif -+#endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. - #This works for even old (2.96) versions of gcc and provides a small boost either way. -@@ -207,13 +207,13 @@ GSM_SOURCES = $(SRC)/add.c \ - # add k6-specific code only if not on a non-k6 hardware or proc. - # XXX Keep a space after each findstring argument - # XXX should merge with GSM_OBJECTS --ifeq ($(OSARCH),linux-gnu) --ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) --ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips )) --GSM_SOURCES+= $(SRC)/k6opt.s --endif --endif --endif -+#ifeq ($(OSARCH),linux-gnu) -+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) -+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips )) -+#GSM_SOURCES+= $(SRC)/k6opt.s -+#endif -+#endif -+#endif - - TOAST_SOURCES = $(SRC)/toast.c \ - $(SRC)/toast_lin.c \ -@@ -259,13 +259,13 @@ GSM_OBJECTS = $(SRC)/add.o \ - $(SRC)/short_term.o \ - $(SRC)/table.o - --ifeq ($(OSARCH),linux-gnu) --ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) --ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips )) --GSM_OBJECTS+= $(SRC)/k6opt.o --endif --endif --endif -+#ifeq ($(OSARCH),linux-gnu) -+#ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) -+#ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips )) -+#GSM_OBJECTS+= $(SRC)/k6opt.o -+#endif -+#endif -+#endif - - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ diff --git a/package/asterisk/patches/patch-main_astobj2_c b/package/asterisk/patches/patch-main_astobj2_c deleted file mode 100644 index d8aaf114b..000000000 --- a/package/asterisk/patches/patch-main_astobj2_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/main/astobj2.c 2009-10-06 03:16:36.000000000 +0200 -+++ asterisk-1.4.27.1/main/astobj2.c 2009-12-03 20:54:12.000000000 +0100 -@@ -236,7 +236,7 @@ int ao2_ref(void *user_data, const int d - /* for safety, zero-out the astobj2 header and also the - * first word of the user-data, which we make sure is always - * allocated. */ -- bzero(obj, sizeof(struct astobj2 *) + sizeof(void *) ); -+ memset(obj, 0, sizeof(struct astobj2 *) + sizeof(void *) ); - free(obj); - } - diff --git a/package/asterisk/patches/patch-main_translate_c b/package/asterisk/patches/patch-main_translate_c deleted file mode 100644 index 36d7c3058..000000000 --- a/package/asterisk/patches/patch-main_translate_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/main/translate.c 2009-10-21 18:44:49.000000000 +0200 -+++ asterisk-1.4.27.1/main/translate.c 2009-12-03 20:53:36.000000000 +0100 -@@ -442,7 +442,7 @@ static void rebuild_matrix(int samples) - if (option_debug) - ast_log(LOG_DEBUG, "Resetting translation matrix\n"); - -- bzero(tr_matrix, sizeof(tr_matrix)); -+ memset(tr_matrix, 0, sizeof(tr_matrix)); - - /* first, compute all direct costs */ - AST_LIST_TRAVERSE(&translators, t, list) { diff --git a/package/asterisk/patches/patch-menuselect-tree b/package/asterisk/patches/patch-menuselect-tree deleted file mode 100644 index 6bac1894d..000000000 --- a/package/asterisk/patches/patch-menuselect-tree +++ /dev/null @@ -1,12 +0,0 @@ ---- asterisk-1.4.27.1.orig/menuselect-tree 2009-11-30 19:30:41.000000000 +0100 -+++ asterisk-1.4.27.1/menuselect-tree 2009-12-03 20:55:04.000000000 +0100 -@@ -59,9 +59,6 @@ - <member name="app_flash" displayname="Flash channel application" remove_on_change="apps/app_flash.o apps/app_flash.so"> - <depend>dahdi</depend> - </member> --<member name="app_followme" displayname="Find-Me/Follow-Me Application" remove_on_change="apps/app_followme.o apps/app_followme.so"> -- <depend>chan_local</depend> --</member> - <member name="app_forkcdr" displayname="Fork The CDR into 2 separate entities" remove_on_change="apps/app_forkcdr.o apps/app_forkcdr.so"> - </member> - <member name="app_getcpeid" displayname="Get ADSI CPE ID" remove_on_change="apps/app_getcpeid.o apps/app_getcpeid.so"> diff --git a/package/asterisk/patches/patch-res_res_features_c b/package/asterisk/patches/patch-res_res_features_c deleted file mode 100644 index a237fbf97..000000000 --- a/package/asterisk/patches/patch-res_res_features_c +++ /dev/null @@ -1,11 +0,0 @@ ---- asterisk-1.4.27.1.orig/res/res_features.c 2009-10-20 19:46:37.000000000 +0200 -+++ asterisk-1.4.27.1/res/res_features.c 2009-12-03 20:53:57.000000000 +0100 -@@ -279,7 +279,7 @@ static void *ast_bridge_call_thread(void - ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig); - ast_hangup(tobj->chan); - ast_hangup(tobj->peer); -- bzero(tobj, sizeof(*tobj)); /*! \todo XXX for safety */ -+ memset(tobj, 0, sizeof(*tobj)); /*! \todo XXX for safety */ - free(tobj); - return NULL; - } diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 82541e6f4..92949ea13 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 9 +PKG_RELEASE:= 10 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base @@ -24,8 +24,15 @@ INSTALL_STYLE:= manual do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) $(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES) +ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y) + @-rm $(IDIR_BASE_FILES)/etc/network/interfaces +endif +ifeq (${ADK_TARGET_PACKAGE_IPKG},y) $(SED) 's,@TARGET@,$(ADK_TARGET),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VERSION@,$(ADK_VERSION),g' $(IDIR_BASE_FILES)/etc/ipkg.conf +else + @-rm $(IDIR_BASE_FILES)/etc/ipkg.conf +endif echo /bin/sh >${IDIR_BASE_FILES}/etc/shells echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells ifneq (${ADK_PACKAGE_BASH},) diff --git a/package/base-files/extra/init b/package/base-files/extra/init index e11446366..618547693 100755 --- a/package/base-files/extra/init +++ b/package/base-files/extra/init @@ -1,5 +1,5 @@ #!/bin/sh -echo "Starting system ..." +echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount -nt proc proc /proc mount -o nosuid,nodev,noexec -t sysfs sysfs /sys diff --git a/package/binutils/Makefile b/package/binutils/Makefile index c130804de..c622a1af7 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -13,7 +13,9 @@ $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ TCFLAGS+= -fPIC CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-werror +CONFIGURE_ARGS+= --disable-werror \ + --host=$(REAL_GNU_TARGET_NAME) \ + --target=$(REAL_GNU_TARGET_NAME) BUILD_STYLE= auto INSTALL_STYLE= auto diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 37f50bdd6..8481fd64f 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.15.2 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c PKG_DESCR:= Core utilities for embedded Linux systems PKG_SECTION:= base @@ -18,23 +18,28 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -do-configure: +${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \ - ${WRKBUILD}/.config - $(SED) 's@IDIR@${WRKINST}' ${WRKBUILD}/.config + ${TOPDIR}/.busyboxcfg + +${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg + cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config + $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config + +do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) yes '' | \ $(MAKE) V=1 \ IPKG_ARCH="$(ARCH)" \ - ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig + ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) else yes '' | \ $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \ - ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig + ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) endif -do-build: +do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox @@ -43,18 +48,20 @@ else IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif -do-install: ${TOPDIR}/.config +do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install + IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) else $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install + IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) endif -ifeq ($(DEBUG),1) + $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ +ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ $(IDIR_BUSYBOX)/bin/busybox endif - $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ + +fake: $(TOPDIR)/.busyboxcfg do-configure do-install include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst index 761fb777d..71d18be30 100644 --- a/package/busybox/files/busybox.postinst +++ b/package/busybox/files/busybox.postinst @@ -2,6 +2,7 @@ . $IPKG_INSTROOT/etc/functions.sh add_rcconf network network YES add_rcconf crond crond NO -add_rcconf watchdog watchdog NO +add_rcconf watchdog watchdog YES +add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20' add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32' -add_rcconf inetd +add_rcconf inetd inetd NO diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init index c5d0e9545..3aad38380 100644 --- a/package/busybox/files/watchdog.init +++ b/package/busybox/files/watchdog.init @@ -10,7 +10,7 @@ autostart) exec sh $0 start ;; start) - watchdog /dev/watchdog + watchdog $watchdog_flags /dev/watchdog ;; stop) pkill watchdog diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index dd5784512..806da3199 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,12 +8,12 @@ PKG_VERSION:= 1.0.6 PKG_RELEASE:= 5 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix1c alix2d alix2d13 wrap foxboard ag241 rb532 +PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG +CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT\n\tdepends on !ADK_TARGET_ROOTFS_YAFFS include ${TOPDIR}/mk/package.mk diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile deleted file mode 100644 index 1197fd15a..000000000 --- a/package/cfinstall/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= cfinstall -PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 -PKG_DESCR:= compact flash installer -PKG_SECTION:= base -PKG_DEPENDS:= parted sfdisk - -PKG_TARGET_DEPENDS:= alix1c alix2d wrap rb532 - -WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} -NO_DISTFILES:= 1 - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,CFINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -pre-configure: - mkdir -p ${WRKBUILD} - -do-install: - ${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin - ${INSTALL_BIN} ./src/cfinstall $(IDIR_CFINSTALL)/sbin - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile new file mode 100644 index 000000000..0e4d22450 --- /dev/null +++ b/package/cpufrequtils/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= cpufrequtils +PKG_VERSION:= 007 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 40271a1e1eadce31457e9891cdb071f1 +PKG_DESCR:= Userspace utilities for the Linux kernel cpufreq subsystem +PKG_SECTION:= utils +PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html +PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +BUILD_STYLE:= auto +INSTALL_STYLE:= auto +MAKE_FLAGS+= CROSS=${TARGET_CROSS} + +post-install: + $(INSTALL_DIR) $(IDIR_CPUFREQUTILS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libcpufreq.so* \ + $(IDIR_CPUFREQUTILS)/usr/lib + $(INSTALL_DIR) $(IDIR_CPUFREQUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cpufreq-set \ + $(IDIR_CPUFREQUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/cpufreq-info \ + $(IDIR_CPUFREQUTILS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cpufrequtils/patches/patch-Makefile b/package/cpufrequtils/patches/patch-Makefile new file mode 100644 index 000000000..c85aba1ab --- /dev/null +++ b/package/cpufrequtils/patches/patch-Makefile @@ -0,0 +1,155 @@ +--- cpufrequtils-007.orig/Makefile 2010-01-16 14:47:44.000000000 +0100 ++++ cpufrequtils-007/Makefile 2010-01-23 18:52:15.905985935 +0100 +@@ -27,11 +27,11 @@ + DEBUG ?= false + + # make the build silent. Set this to something else to make it noisy again. +-V ?= false ++V ?= true + + # Internationalization support (output in different languages). + # Requires gettext. +-NLS ?= true ++NLS ?= false + + # Set the following to 'true' to build/install the + # cpufreq-bench benchmarking tool +@@ -55,7 +55,9 @@ DESTDIR ?= + # and _should_ modify the PACKAGE_BUGREPORT definition + + VERSION = 007 +-LIB_VERSION = 0:0:0 ++LIB_MAJ= 0.0.0 ++LIB_MIN= 0 ++ + PACKAGE = cpufrequtils + PACKAGE_BUGREPORT = cpufreq@vger.kernel.org + LANGUAGES = de fr it cs pt +@@ -80,7 +82,6 @@ INSTALL = /usr/bin/install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} +-LIBTOOL = /usr/bin/libtool + + # If you are running a cross compiler, you may want to set this + # to something more interesting, like "arm-linux-". If you want +@@ -116,20 +117,22 @@ WARNINGS += -Wshadow + CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \ + -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE + +-UTIL_OBJS = utils/info.c utils/set.c ++UTIL_SRC = utils/info.c utils/set.c + LIB_HEADERS = lib/cpufreq.h lib/interfaces.h +-LIB_OBJS = lib/cpufreq.c lib/proc.c lib/sysfs.c +-LIB_PARTS = lib/cpufreq.lo ++LIB_SRC = lib/cpufreq.c ++LIB_OBJS = lib/cpufreq.o + + CFLAGS += -pipe + + ifeq ($(strip $(PROC)),true) +- LIB_PARTS += lib/proc.lo ++ LIB_OBJS += lib/proc.o ++ LIB_SRC += lib/proc.c + CPPFLAGS += -DINTERFACE_PROC + endif + + ifeq ($(strip $(SYSFS)),true) +- LIB_PARTS += lib/sysfs.lo ++ LIB_OBJS += lib/sysfs.o ++ LIB_SRC += lib/sysfs.c + CPPFLAGS += -DINTERFACE_SYSFS + endif + +@@ -147,11 +150,9 @@ CFLAGS += $(WARNINGS) + + ifeq ($(strip $(V)),false) + QUIET=@$(PWD)/build/ccdv +- LIBTOOL_OPT=--silent + HOST_PROGS=build/ccdv + else + QUIET= +- LIBTOOL_OPT= + HOST_PROGS= + endif + +@@ -175,24 +176,26 @@ all: ccdv libcpufreq utils $(COMPILE_NLS + ccdv: build/ccdv + build/ccdv: build/ccdv.c + @echo "Building ccdv" +- @$(HOSTCC) -O1 -O1 $< -o $@ ++ @$(HOSTCC) -O1 $< -o $@ + +-%.lo: $(LIB_OBJS) $(LIB_HEADERS) ccdv +- $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $*.c ++lib/%.o: $(LIB_SRC) $(LIB_HEADERS) build/ccdv ++ $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c lib/$*.c + +-libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS) $(LIB_PARTS) Makefile ++libcpufreq.so.$(LIB_MAJ): $(LIB_OBJS) + @if [ $(strip $(SYSFS)) != true -a $(strip $(PROC)) != true ]; then \ + echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \ + exit -1; \ + fi; +- $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \ +- ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS) ++ $(QUIET) $(CC) -shared $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ ++ -Wl,-soname,libcpufreq.so.$(LIB_MIN) $(LIB_OBJS) ++ @ln -sf $@ libcpufreq.so ++ @ln -sf $@ libcpufreq.so.$(LIB_MIN) + +-libcpufreq: libcpufreq.la ++libcpufreq: libcpufreq.so.$(LIB_MAJ) + +-cpufreq-%: libcpufreq.la $(UTIL_OBJS) ++cpufreq-%: libcpufreq.so.$(LIB_MAJ) $(UTIL_OBJS) + $(QUIET) $(CC) $(CPPFLAGS) $(CFLAGS) -I. -I./lib/ -c -o utils/$@.o utils/$*.c +- $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -L./.libs/ -o $@ utils/$@.o -lcpufreq ++ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq + $(QUIET) $(STRIPCMD) $@ + + utils: cpufreq-info cpufreq-set cpufreq-aperf +@@ -217,22 +220,21 @@ update-gmo: po/$(PACKAGE).pot + done; + + compile-bench: libcpufreq +- @V=$(V) confdir=$(confdir) make -C bench ++ @V=$(V) confdir=$(confdir) $(MAKE) -C bench + + clean: +- -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' -o -name '*.l[oas]' \) -type f -print \ ++ -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \ + | xargs rm -f +- -rm -rf lib/.libs +- -rm -rf .libs + -rm -f cpufreq-info cpufreq-set cpufreq-aperf ++ -rm -f libcpufreq.so* + -rm -f build/ccdv + -rm -rf po/*.gmo po/*.pot +- make -C bench clean ++ $(MAKE) -C bench clean + + + install-lib: + $(INSTALL) -d $(DESTDIR)${libdir} +- $(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la ++ $(INSTALL) libcpufreq.so* $(DESTDIR)${libdir}/ + $(INSTALL) -d $(DESTDIR)${includedir} + $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h + +@@ -255,7 +257,7 @@ install-gmo: + + install-bench: + @#DESTDIR must be set from outside to survive +- @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) make -C bench install ++ @sbindir=$(sbindir) bindir=$(bindir) docdir=$(docdir) confdir=$(confdir) $(MAKE) -C bench install + + install: install-lib install-tools install-man $(INSTALL_NLS) $(INSTALL_BENCH) + +@@ -271,5 +273,5 @@ uninstall: + rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpufrequtils.mo; \ + done; + +-.PHONY: all utils libcpufreq update-po update-gmo install-lib install-tools install-man install-gmo install uninstall \ ++.PHONY: all utils libcpufreq ccdv update-po update-gmo install-lib install-tools install-man install-gmo install uninstall \ + clean diff --git a/package/cpufrequtils/patches/patch-bench_Makefile b/package/cpufrequtils/patches/patch-bench_Makefile new file mode 100644 index 000000000..08b0049ca --- /dev/null +++ b/package/cpufrequtils/patches/patch-bench_Makefile @@ -0,0 +1,8 @@ +--- cpufrequtils-007.orig/bench/Makefile 2010-01-16 14:47:44.000000000 +0100 ++++ cpufrequtils-007/bench/Makefile 2010-01-23 18:51:28.329986048 +0100 +@@ -1,4 +1,4 @@ +-LIBS = -L../.libs/ -lm -lcpufreq ++LIBS = -L../ -lm -lcpufreq + + OBJS = main.o parse.o system.o benchmark.o + CFLAGS += -D_GNU_SOURCE -I../lib -DDEFAULT_CONFIG_FILE=\"$(confdir)/cpufreq-bench.conf\" diff --git a/package/cpufrequtils/patches/patch-utils_info_c b/package/cpufrequtils/patches/patch-utils_info_c new file mode 100644 index 000000000..d8047f798 --- /dev/null +++ b/package/cpufrequtils/patches/patch-utils_info_c @@ -0,0 +1,244 @@ +--- cpufrequtils-007.orig/utils/info.c 2010-01-16 14:47:44.000000000 +0100 ++++ cpufrequtils-007/utils/info.c 2010-01-23 18:51:50.165866845 +0100 +@@ -10,9 +10,6 @@ + #include <errno.h> + #include <stdlib.h> + #include <string.h> +-#include <libintl.h> +-#include <locale.h> +- + #include <getopt.h> + + #include "cpufreq.h" +@@ -33,7 +30,7 @@ static unsigned int count_cpus(void) + + fp = fopen("/proc/stat", "r"); + if(!fp) { +- printf(gettext("Couldn't count the number of CPUs (%s: %s), assuming 1\n"), "/proc/stat", strerror(errno)); ++ printf("Couldn't count the number of CPUs (%s: %s), assuming 1\n", "/proc/stat", strerror(errno)); + return 1; + } + +@@ -65,7 +62,7 @@ static void proc_cpufreq_output(void) + unsigned int max_pctg = 0; + unsigned long min, max; + +- printf(gettext(" minimum CPU frequency - maximum CPU frequency - governor\n")); ++ printf(" minimum CPU frequency - maximum CPU frequency - governor\n"); + + nr_cpus = count_cpus(); + for (cpu=0; cpu < nr_cpus; cpu++) { +@@ -153,26 +150,26 @@ static void debug_output_one(unsigned in + struct cpufreq_stats *stats; + + if (cpufreq_cpu_exists(cpu)) { +- printf(gettext ("couldn't analyze CPU %d as it doesn't seem to be present\n"), cpu); ++ printf("couldn't analyze CPU %d as it doesn't seem to be present\n", cpu); + return; + } + +- printf(gettext ("analyzing CPU %d:\n"), cpu); ++ printf("analyzing CPU %d:\n", cpu); + + freq_kernel = cpufreq_get_freq_kernel(cpu); + freq_hardware = cpufreq_get_freq_hardware(cpu); + + driver = cpufreq_get_driver(cpu); + if (!driver) { +- printf(gettext (" no or unknown cpufreq driver is active on this CPU\n")); ++ printf(" no or unknown cpufreq driver is active on this CPU\n"); + } else { +- printf(gettext (" driver: %s\n"), driver); ++ printf(" driver: %s\n", driver); + cpufreq_put_driver(driver); + } + + cpus = cpufreq_get_related_cpus(cpu); + if (cpus) { +- printf(gettext (" CPUs which run at the same hardware frequency: ")); ++ printf(" CPUs which run at the same hardware frequency: "); + while (cpus->next) { + printf("%d ", cpus->cpu); + cpus = cpus->next; +@@ -183,7 +180,7 @@ static void debug_output_one(unsigned in + + cpus = cpufreq_get_affected_cpus(cpu); + if (cpus) { +- printf(gettext (" CPUs which need to have their frequency coordinated by software: ")); ++ printf(" CPUs which need to have their frequency coordinated by software: "); + while (cpus->next) { + printf("%d ", cpus->cpu); + cpus = cpus->next; +@@ -194,13 +191,13 @@ static void debug_output_one(unsigned in + + latency = cpufreq_get_transition_latency(cpu); + if (latency) { +- printf(gettext (" maximum transition latency: ")); ++ printf(" maximum transition latency: "); + print_duration(latency); + printf(".\n"); + } + + if (!(cpufreq_get_hardware_limits(cpu, &min, &max))) { +- printf(gettext (" hardware limits: ")); ++ printf(" hardware limits: "); + print_speed(min); + printf(" - "); + print_speed(max); +@@ -209,7 +206,7 @@ static void debug_output_one(unsigned in + + freqs = cpufreq_get_available_frequencies(cpu); + if (freqs) { +- printf(gettext (" available frequency steps: ")); ++ printf(" available frequency steps: "); + while (freqs->next) { + print_speed(freqs->frequency); + printf(", "); +@@ -222,7 +219,7 @@ static void debug_output_one(unsigned in + + governors = cpufreq_get_available_governors(cpu); + if (governors) { +- printf(gettext (" available cpufreq governors: ")); ++ printf(" available cpufreq governors: "); + while (governors->next) { + printf("%s, ", governors->governor); + governors = governors->next; +@@ -233,23 +230,23 @@ static void debug_output_one(unsigned in + + policy = cpufreq_get_policy(cpu); + if (policy) { +- printf(gettext (" current policy: frequency should be within ")); ++ printf(" current policy: frequency should be within "); + print_speed(policy->min); +- printf(gettext (" and ")); ++ printf(" and "); + print_speed(policy->max); + + printf(".\n "); +- printf(gettext ("The governor \"%s\" may" +- " decide which speed to use\n within this range.\n"), ++ printf("The governor \"%s\" may" ++ " decide which speed to use\n within this range.\n", + policy->governor); + cpufreq_put_policy(policy); + } + + if (freq_kernel || freq_hardware) { +- printf(gettext (" current CPU frequency is ")); ++ printf(" current CPU frequency is "); + if (freq_hardware) { + print_speed(freq_hardware); +- printf(gettext (" (asserted by call to hardware)")); ++ printf(" (asserted by call to hardware)"); + } + else + print_speed(freq_kernel); +@@ -257,7 +254,7 @@ static void debug_output_one(unsigned in + } + stats = cpufreq_get_stats(cpu, &total_time); + if (stats) { +- printf(gettext (" cpufreq stats: ")); ++ printf(" cpufreq stats: "); + while (stats) { + print_speed(stats->frequency); + printf(":%.2f%%", (100.0 * stats->time_in_state) / total_time); +@@ -437,37 +434,37 @@ static int get_latency(unsigned int cpu, + + static void print_header(void) { + printf(PACKAGE " " VERSION ": cpufreq-info (C) Dominik Brodowski 2004-2009\n"); +- printf(gettext ("Report errors and bugs to %s, please.\n"), PACKAGE_BUGREPORT); ++ printf("Report errors and bugs to %s, please.\n", PACKAGE_BUGREPORT); + } + + static void print_help(void) { +- printf(gettext ("Usage: cpufreq-info [options]\n")); +- printf(gettext ("Options:\n")); +- printf(gettext (" -c CPU, --cpu CPU CPU number which information shall be determined about\n")); +- printf(gettext (" -e, --debug Prints out debug information\n")); +- printf(gettext (" -f, --freq Get frequency the CPU currently runs at, according\n" +- " to the cpufreq core *\n")); +- printf(gettext (" -w, --hwfreq Get frequency the CPU currently runs at, by reading\n" +- " it from hardware (only available to root) *\n")); +- printf(gettext (" -l, --hwlimits Determine the minimum and maximum CPU frequency allowed *\n")); +- printf(gettext (" -d, --driver Determines the used cpufreq kernel driver *\n")); +- printf(gettext (" -p, --policy Gets the currently used cpufreq policy *\n")); +- printf(gettext (" -g, --governors Determines available cpufreq governors *\n")); +- printf(gettext (" -r, --related-cpus Determines which CPUs run at the same hardware frequency *\n")); +- printf(gettext (" -a, --affected-cpus Determines which CPUs need to have their frequency\n" +- " coordinated by software *\n")); +- printf(gettext (" -s, --stats Shows cpufreq statistics if available\n")); +- printf(gettext (" -y, --latency Determines the maximum latency on CPU frequency changes *\n")); +- printf(gettext (" -o, --proc Prints out information like provided by the /proc/cpufreq\n" +- " interface in 2.4. and early 2.6. kernels\n")); +- printf(gettext (" -m, --human human-readable output for the -f, -w, -s and -y parameters\n")); +- printf(gettext (" -h, --help Prints out this screen\n")); ++ printf("Usage: cpufreq-info [options]\n"); ++ printf("Options:\n"); ++ printf(" -c CPU, --cpu CPU CPU number which information shall be determined about\n"); ++ printf(" -e, --debug Prints out debug information\n"); ++ printf(" -f, --freq Get frequency the CPU currently runs at, according\n" ++ " to the cpufreq core *\n"); ++ printf(" -w, --hwfreq Get frequency the CPU currently runs at, by reading\n" ++ " it from hardware (only available to root) *\n"); ++ printf(" -l, --hwlimits Determine the minimum and maximum CPU frequency allowed *\n"); ++ printf(" -d, --driver Determines the used cpufreq kernel driver *\n"); ++ printf(" -p, --policy Gets the currently used cpufreq policy *\n"); ++ printf(" -g, --governors Determines available cpufreq governors *\n"); ++ printf(" -r, --related-cpus Determines which CPUs run at the same hardware frequency *\n"); ++ printf(" -a, --affected-cpus Determines which CPUs need to have their frequency\n" ++ " coordinated by software *\n"); ++ printf(" -s, --stats Shows cpufreq statistics if available\n"); ++ printf(" -y, --latency Determines the maximum latency on CPU frequency changes *\n"); ++ printf(" -o, --proc Prints out information like provided by the /proc/cpufreq\n" ++ " interface in 2.4. and early 2.6. kernels\n"); ++ printf(" -m, --human human-readable output for the -f, -w, -s and -y parameters\n"); ++ printf(" -h, --help Prints out this screen\n"); + + printf("\n"); +- printf(gettext ("If no argument or only the -c, --cpu parameter is given, debug output about\n" +- "cpufreq is printed which is useful e.g. for reporting bugs.\n")); +- printf(gettext ("For the arguments marked with *, omitting the -c or --cpu argument is\n" +- "equivalent to setting it to zero\n")); ++ printf("If no argument or only the -c, --cpu parameter is given, debug output about\n" ++ "cpufreq is printed which is useful e.g. for reporting bugs.\n"); ++ printf("For the arguments marked with *, omitting the -c or --cpu argument is\n" ++ "equivalent to setting it to zero\n"); + } + + static struct option info_opts[] = { +@@ -497,9 +494,6 @@ int main(int argc, char **argv) { + unsigned int human = 0; + int output_param = 0; + +- setlocale(LC_ALL, ""); +- textdomain (PACKAGE); +- + do { + ret = getopt_long(argc, argv, "c:hoefwldpgrasmy", info_opts, NULL); + switch (ret) { +@@ -560,7 +554,7 @@ int main(int argc, char **argv) { + case 'o': + if (cpu_defined) { + print_header(); +- printf(gettext ("The argument passed to this tool can't be combined with passing a --cpu argument\n")); ++ printf("The argument passed to this tool can't be combined with passing a --cpu argument\n"); + return -EINVAL; + } + break; +@@ -573,13 +567,13 @@ int main(int argc, char **argv) { + switch (output_param) { + case -1: + print_header(); +- printf(gettext ("You can't specify more than one --cpu parameter and/or\n" +- "more than one output-specific argument\n")); ++ printf("You can't specify more than one --cpu parameter and/or\n" ++ "more than one output-specific argument\n"); + return -EINVAL; + break; + case '?': + print_header(); +- printf(gettext ("invalid or unknown argument\n")); ++ printf("invalid or unknown argument\n"); + print_help(); + ret = -EINVAL; + break; diff --git a/package/cpufrequtils/patches/patch-utils_set_c b/package/cpufrequtils/patches/patch-utils_set_c new file mode 100644 index 000000000..b1dee1b3f --- /dev/null +++ b/package/cpufrequtils/patches/patch-utils_set_c @@ -0,0 +1,118 @@ +--- cpufrequtils-007.orig/utils/set.c 2010-01-16 14:47:44.000000000 +0100 ++++ cpufrequtils-007/utils/set.c 2010-01-23 18:51:50.185869113 +0100 +@@ -12,9 +12,6 @@ + #include <limits.h> + #include <string.h> + #include <ctype.h> +-#include <libintl.h> +-#include <locale.h> +- + #include <getopt.h> + + #include "cpufreq.h" +@@ -28,29 +25,29 @@ + static void print_header(void) + { + printf(PACKAGE " " VERSION ": cpufreq-set (C) Dominik Brodowski 2004-2009\n"); +- printf(gettext("Report errors and bugs to %s, please.\n"), PACKAGE_BUGREPORT); ++ printf("Report errors and bugs to %s, please.\n", PACKAGE_BUGREPORT); + } + + static void print_help(void) + { +- printf(gettext("Usage: cpufreq-set [options]\n")); +- printf(gettext("Options:\n")); +- printf(gettext(" -c CPU, --cpu CPU number of CPU where cpufreq settings shall be modified\n")); +- printf(gettext(" -d FREQ, --min FREQ new minimum CPU frequency the governor may select\n")); +- printf(gettext(" -u FREQ, --max FREQ new maximum CPU frequency the governor may select\n")); +- printf(gettext(" -g GOV, --governor GOV new cpufreq governor\n")); +- printf(gettext(" -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n" +- " governor to be available and loaded\n")); +- printf(gettext(" -r, --related Switches all hardware-related CPUs\n")); +- printf(gettext(" -h, --help Prints out this screen\n")); ++ printf("Usage: cpufreq-set [options]\n"); ++ printf("Options:\n"); ++ printf(" -c CPU, --cpu CPU number of CPU where cpufreq settings shall be modified\n"); ++ printf(" -d FREQ, --min FREQ new minimum CPU frequency the governor may select\n"); ++ printf(" -u FREQ, --max FREQ new maximum CPU frequency the governor may select\n"); ++ printf(" -g GOV, --governor GOV new cpufreq governor\n"); ++ printf(" -f FREQ, --freq FREQ specific frequency to be set. Requires userspace\n" ++ " governor to be available and loaded\n"); ++ printf(" -r, --related Switches all hardware-related CPUs\n"); ++ printf(" -h, --help Prints out this screen\n"); + printf("\n"); +- printf(gettext("Notes:\n" ++ printf("Notes:\n" + "1. Omitting the -c or --cpu argument is equivalent to setting it to zero\n" + "2. The -f FREQ, --freq FREQ parameter cannot be combined with any other parameter\n" + " except the -c CPU, --cpu CPU parameter\n" + "3. FREQuencies can be passed in Hz, kHz (default), MHz, GHz, or THz\n" + " by postfixing the value with the wanted unit name, without any space\n" +- " (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n")); ++ " (FREQuency in kHz =^ Hz * 0.001 =^ MHz * 1000 =^ GHz * 1000000).\n"); + + } + +@@ -66,13 +63,13 @@ static struct option set_opts[] = { + + static void print_error(void) + { +- printf(gettext("Error setting new values. Common errors:\n" ++ printf("Error setting new values. Common errors:\n" + "- Do you have proper administration rights? (super-user?)\n" + "- Is the governor you requested available and modprobed?\n" + "- Trying to set an invalid policy?\n" + "- Trying to set a specific frequency, but userspace governor is not available,\n" + " for example because of hardware which cannot be set to a specific frequency\n" +- " or because the userspace governor isn't loaded?\n")); ++ " or because the userspace governor isn't loaded?\n"); + }; + + struct freq_units { +@@ -92,7 +89,7 @@ const struct freq_units def_units[] = { + static void print_unknown_arg(void) + { + print_header(); +- printf(gettext("invalid or unknown argument\n")); ++ printf("invalid or unknown argument\n"); + print_help(); + } + +@@ -180,7 +177,7 @@ static int do_new_policy(unsigned int cp + int ret; + + if (!cur_pol) { +- printf(gettext("wrong, unknown or unhandled CPU?\n")); ++ printf("wrong, unknown or unhandled CPU?\n"); + return -EINVAL; + } + +@@ -248,9 +245,6 @@ int main(int argc, char **argv) + }; + struct cpufreq_affected_cpus *cpus = NULL; + +- setlocale(LC_ALL, ""); +- textdomain (PACKAGE); +- + /* parameter parsing */ + do { + ret = getopt_long(argc, argv, "c:d:u:g:f:hr", set_opts, NULL); +@@ -333,14 +327,14 @@ int main(int argc, char **argv) + } + + if (freq && policychange) { +- printf(gettext("the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" +- "-g/--governor parameters\n")); ++ printf("the -f/--freq parameter cannot be combined with -d/--min, -u/--max or\n" ++ "-g/--governor parameters\n"); + return -EINVAL; + } + + if (!freq && !policychange) { +- printf(gettext("At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" +- "-g/--governor must be passed\n")); ++ printf("At least one parameter out of -f/--freq, -d/--min, -u/--max, and\n" ++ "-g/--governor must be passed\n"); + return -EINVAL; + } + diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 3a51fdf54..7e41abe3b 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com PKG_SITES:= http://cryptsetup.googlecode.com/files/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 8e7e850cd..f23196c67 100644 --- a/package/cups/patches/patch-configure +++ b/package/cups/patches/patch-configure @@ -1,5 +1,16 @@ --- cups-1.4.2.orig/configure 2009-11-10 00:04:25.000000000 +0100 -+++ cups-1.4.2/configure 2009-12-11 09:59:57.000000000 +0100 ++++ cups-1.4.2/configure 2010-01-07 23:11:46.635118361 +0100 +@@ -9850,8 +9850,8 @@ if test "$libdir" = "\${exec_prefix}/lib + libdir="$exec_prefix/lib32" + ;; + Linux*) +- if test -d /usr/lib64; then +- libdir="$exec_prefix/lib64" ++ if test -d /usr/lib; then ++ libdir="$exec_prefix/lib" + fi + ;; + HP-UX*) @@ -10260,11 +10260,6 @@ _ACEOF # Server executables... diff --git a/package/dbus/Makefile b/package/dbus/Makefile index 6bb63c302..4dcb4067b 100644 --- a/package/dbus/Makefile +++ b/package/dbus/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dbus PKG_VERSION:= 1.2.16 PKG_RELEASE:= 1 -PKG_BUILDDEP+= expat PKG_MD5SUM:= c7a47b851ebe02f6726b65b78d1b730b PKG_DESCR:= DBUS library PKG_SECTION:= net PKG_DEPENDS:= libexpat +PKG_BUILDDEP+= expat PKG_URL:= http://dbus.freedesktop.org PKG_SITES:= http://dbus.freedesktop.org/releases/dbus/ ifeq ($(ADK_STATIC),y) diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure new file mode 100644 index 000000000..f33a192a9 --- /dev/null +++ b/package/dbus/patches/patch-configure @@ -0,0 +1,22 @@ +--- dbus-1.2.16.orig/configure 2009-07-14 21:43:08.000000000 +0200 ++++ dbus-1.2.16/configure 2010-01-15 19:03:24.000000000 +0100 +@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then + ;; + esac + +- case " $CFLAGS " in +- *[\ \ ]-fPIE[\ \ ]*) ;; +- *) if cc_supports_flag -fPIE; then +- PIE_CFLAGS="-fPIE" +- if ld_supports_flag -z,relro; then +- PIE_LDFLAGS="-pie -Wl,-z,relro" +- else +- PIE_LDFLAGS="-pie" +- fi +- fi +- ;; +- esac +- + ### Disabled warnings, and compiler flag overrides + + # Let's just ignore unused for now diff --git a/package/depmaker b/package/depmaker index da3923554..67dcb498d 100644 --- a/package/depmaker +++ b/package/depmaker @@ -34,5 +34,5 @@ for dn in */Makefile; do done print -r -- $x done >Depends.mk -pbar=done -print -u2 "$pbar" +#pbar=done +#print -u2 "$pbar" diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h index c25f10856..b0903f45d 100644 --- a/package/dropbear/patches/patch-options_h +++ b/package/dropbear/patches/patch-options_h @@ -1,6 +1,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- dropbear-0.52.orig/options.h 2008-11-11 15:13:50.000000000 +0100 -+++ dropbear-0.52/options.h 2009-03-19 19:24:46.000000000 +0100 ++++ dropbear-0.52/options.h 2010-01-22 17:55:09.000000000 +0100 @@ -10,6 +10,11 @@ * parts are to allow for commandline -DDROPBEAR_XXX options etc. ******************************************************************/ @@ -13,6 +13,15 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ #ifndef DROPBEAR_DEFPORT #define DROPBEAR_DEFPORT "22" #endif +@@ -115,7 +120,7 @@ etc) slower (perhaps by 50%). Recommende + * Removing either of these won't save very much space. + * SSH2 RFC Draft requires dss, recommends rsa */ + #define DROPBEAR_RSA +-#define DROPBEAR_DSS ++/* #define DROPBEAR_DSS */ + + /* RSA can be vulnerable to timing attacks which use the time required for + * signing to guess the private key. Blinding avoids this attack, though makes @@ -129,7 +134,7 @@ etc) slower (perhaps by 50%). Recommende /* #define DSS_PROTOK */ @@ -22,3 +31,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ /* Whether to print the message of the day (MOTD). This doesn't add much code * size */ +@@ -220,7 +225,7 @@ etc) slower (perhaps by 50%). Recommende + /* The command to invoke for xauth when using X11 forwarding. + * "-q" for quiet */ + #ifndef XAUTH_COMMAND +-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q" ++#define XAUTH_COMMAND "/usr/bin/xauth -q" + #endif + + /* if you want to enable running an sftp server (such as the one included with diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index de7c80e45..83d74ab10 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -46,24 +46,28 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ # compile nothing, eglibc is already build in toolchain directory do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib + ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ + $(IDIR_EGLIBC)/usr/lib # install /etc/localtime from host system (FIXME) ${CP} /etc/localtime $(IDIR_EGLIBC)/etc - $(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/ + $(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done - # install linker script - -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so - cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so - cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so - cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so - cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so - cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so eglibc-dev-install: + ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib + # install linker script + -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ diff --git a/package/eglibc/files/libc.so.x86 b/package/eglibc/files/libc.so.x86 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/eglibc/files/libc.so.x86 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile new file mode 100644 index 000000000..1dabdf9d5 --- /dev/null +++ b/package/evilwm/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= evilwm +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8fd9256c635cce2289b648a01d54202c +PKG_DESCR:= A minimalist window manager for the X Window System +PKG_SECTION:= x11 +PKG_DEPENDS:= libx11 libxext +PKG_BUILDDEP+= libX11 libXext +PKG_URL:= http://www.6809.org.uk/evilwm/ +PKG_SITES:= http://www.6809.org.uk/evilwm/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +MAKE_FLAGS+= XROOT="$(STAGING_DIR)/usr" +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/evilwm $(IDIR_EVILWM)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile new file mode 100644 index 000000000..d45dcee52 --- /dev/null +++ b/package/evilwm/patches/patch-Makefile @@ -0,0 +1,46 @@ +do not strip by install +--- evilwm-1.0.1.orig/Makefile 2009-03-30 12:37:06.000000000 +0200 ++++ evilwm-1.0.1/Makefile 2010-01-27 08:14:46.000000000 +0100 +@@ -1,11 +1,11 @@ + # If you don't use CC +-CC = gcc ++CC ?= gcc + + # Edit this line if you don't want evilwm to install under /usr. + # Note that $(DESTDIR) is used by the Debian build process. + prefix = $(DESTDIR)/usr + +-XROOT = /usr/X11R6 ++XROOT ?= /usr/X11R6 + INCLUDES = -I$(XROOT)/include + LDPATH = -L$(XROOT)/lib + LIBS = -lX11 +@@ -35,8 +35,8 @@ LIBS += -lXext + # Be sure that libXrandr is in your library search directory (e.g., under + # Solaris, it is in /usr/X11R6/lib, so can be built against with the default + # XPATH above, but won't necessarily be in the library search path). +-DEFINES += -DRANDR +-LIBS += -lXrandr ++#DEFINES += -DRANDR ++#LIBS += -lXrandr + + # Uncomment for mouse support. You probably want this. + DEFINES += -DMOUSE +@@ -71,7 +71,7 @@ distname = evilwm-$(version) + #DEFINES += -DXDEBUG # show some X calls + + DEFINES += -DVERSION=\"$(version)\" $(DEBIAN) +-CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall ++CFLAGS += $(INCLUDES) $(DEFINES) -Wall + #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall + CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls + LDFLAGS += $(LDPATH) $(LIBS) +@@ -93,7 +93,7 @@ evilwm: $(OBJS) + install: evilwm + if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi + mkdir -p $(prefix)/bin $(prefix)/share/man/man1 +- install -s evilwm $(prefix)/bin ++ install evilwm $(prefix)/bin + install evilwm.1 $(prefix)/share/man/man1 + #gzip -9 $(prefix)/share/man/man1/evilwm.1 + diff --git a/package/expat/Makefile b/package/expat/Makefile index 51ce68858..d0c570f3e 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -25,6 +25,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libexpat.so.* ${IDIR_LIBEXPAT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/file/Makefile b/package/file/Makefile index 58650bb0f..c535ee35b 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 5.03 +PKG_VERSION:= 5.04 PKG_RELEASE:= 1 -PKG_MD5SUM:= d05f08a53e5c2f51f8ee6a4758c0cc53 +PKG_MD5SUM:= accade81ff1cc774904b47c72c8aeea0 PKG_DESCR:= a file type guesser PKG_SECTION:= utils PKG_URL:= http://www.darwinsys.com/file @@ -23,14 +23,16 @@ INSTALL_STYLE:= auto pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure \ + CFLAGS="-static" \ + ./configure --enable-static --disable-shared \ ); ${MAKE} -C ${WRKBUILD} - ${INSTALL_BIN} ${WRKBUILD}/src/.libs/file ${STAGING_TOOLS}/bin + ${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic ${MAKE} -C ${WRKBUILD} clean post-install: - ${INSTALL_DIR} ${IDIR_FILE}/usr/bin ${IDIR_FILE}/usr/lib ${IDIR_FILE}/usr/share/misc + ${INSTALL_DIR} ${IDIR_FILE}/usr/bin ${IDIR_FILE}/usr/lib \ + ${IDIR_FILE}/usr/share/misc ${INSTALL_BIN} ${WRKINST}/usr/bin/file ${IDIR_FILE}/usr/bin ${INSTALL_DATA} ${WRKINST}/usr/share/misc/magic.mgc \ ${IDIR_FILE}/usr/share/misc diff --git a/package/file/patches/patch-magic_Magdir_audio b/package/file/patches/patch-magic_Magdir_audio deleted file mode 100644 index e5e0c9849..000000000 --- a/package/file/patches/patch-magic_Magdir_audio +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/audio 2008-11-07 16:44:13.000000000 +0100 -+++ file-5.03/magic/Magdir/audio 2009-05-31 03:53:54.000000000 +0200 -@@ -293,7 +293,6 @@ - >>5 byte &0x40 \b, extended header - >>5 byte &0x20 \b, experimental - >>5 byte &0x10 \b, footer present -->(6.I) indirect x \b, contains: - - # NSF (NES sound file) magic - 0 string NESM\x1a NES Sound File diff --git a/package/file/patches/patch-magic_Magdir_compress b/package/file/patches/patch-magic_Magdir_compress deleted file mode 100644 index cee99739b..000000000 --- a/package/file/patches/patch-magic_Magdir_compress +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/compress 2009-04-22 15:07:35.000000000 +0200 -+++ file-5.03/magic/Magdir/compress 2009-05-31 04:09:09.000000000 +0200 -@@ -9,11 +9,6 @@ - # because it tries to uncompress it to figure out what's inside. - - # standard unix compress --0 string \037\235 compress'd data --!:mime application/x-compress --!:apple LZIVZIVU -->2 byte&0x80 >0 block compressed -->2 byte&0x1f x %d bits - - # gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver) - # Edited by Chris Chittleborough <cchittleborough@yahoo.com.au>, March 2002 diff --git a/package/file/patches/patch-magic_Magdir_images b/package/file/patches/patch-magic_Magdir_images deleted file mode 100644 index f0fe16223..000000000 --- a/package/file/patches/patch-magic_Magdir_images +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/images 2009-02-02 16:55:49.000000000 +0100 -+++ file-5.03/magic/Magdir/images 2009-05-31 03:58:58.000000000 +0200 -@@ -110,7 +110,6 @@ - # GIF - 0 string GIF8 GIF image data - !:mime image/gif --!:apple 8BIMGIFf - >4 string 7a \b, version 8%s, - >4 string 9a \b, version 8%s, - >6 leshort >0 %hd x diff --git a/package/file/patches/patch-magic_Magdir_jpeg b/package/file/patches/patch-magic_Magdir_jpeg deleted file mode 100644 index 6f5ae068d..000000000 --- a/package/file/patches/patch-magic_Magdir_jpeg +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/jpeg 2008-10-20 19:20:03.000000000 +0200 -+++ file-5.03/magic/Magdir/jpeg 2009-05-31 04:10:19.000000000 +0200 -@@ -8,11 +8,6 @@ - # - # both of which turn into "JPEG image data" here. - # --0 beshort 0xffd8 JPEG image data --!:mime image/jpeg --!:apple 8BIMJPEG --!:strength +1 -->6 string JFIF \b, JFIF standard - # The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06 - # in a vain attempt to add image size reporting for JFIF. Note that these - # tests are not fool-proof since some perfectly valid JPEGs are currently diff --git a/package/file/patches/patch-magic_Magdir_macintosh b/package/file/patches/patch-magic_Magdir_macintosh deleted file mode 100644 index 9333a1643..000000000 --- a/package/file/patches/patch-magic_Magdir_macintosh +++ /dev/null @@ -1,27 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200 -+++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:08:05.000000000 +0200 -@@ -8,23 +8,6 @@ - !:mime application/mac-binhex40 - >41 string x \b, version %.3s - --# Stuffit archives are the de facto standard of compression for Macintosh --# files obtained from most archives. (franklsm@tuns.ca) --0 string SIT! StuffIt Archive (data) --!:mime application/x-stuffit --!:apple SIT!SIT! -->2 string x : %s --0 string SITD StuffIt Deluxe (data) -->2 string x : %s --0 string Seg StuffIt Deluxe Segment (data) -->2 string x : %s -- --# Newer StuffIt archives (grant@netbsd.org) --0 string StuffIt StuffIt Archive --!:mime application/x-stuffit --!:apple SIT!SIT! --#>162 string >0 : %s -- - # Macintosh Applications and Installation binaries (franklsm@tuns.ca) - # GRR: Too weak - #0 string APPL Macintosh Application (data) diff --git a/package/file/patches/patch-magic_Magdir_printer b/package/file/patches/patch-magic_Magdir_printer deleted file mode 100644 index a7db0e8e7..000000000 --- a/package/file/patches/patch-magic_Magdir_printer +++ /dev/null @@ -1,34 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- file-5.03.orig/magic/Magdir/printer 2008-10-20 19:20:03.000000000 +0200 -+++ file-5.03/magic/Magdir/printer 2009-05-31 04:05:40.000000000 +0200 -@@ -3,30 +3,6 @@ - # printer: file(1) magic for printer-formatted files - # - --# PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com) --0 string %! PostScript document text --!:mime application/postscript --!:apple ASPSTEXT -->2 string PS-Adobe- conforming -->>11 string >\0 DSC level %.3s -->>>15 string EPS \b, type %s -->>>15 string Query \b, type %s -->>>15 string ExitServer \b, type %s -->>>15 search/1000 %%LanguageLevel:\ -->>>>&0 string >\0 \b, Level %s --# Some PCs have the annoying habit of adding a ^D as a document separator --0 string \004%! PostScript document text --!:mime application/postscript --!:apple ASPSTEXT -->3 string PS-Adobe- conforming -->>12 string >\0 DSC level %.3s -->>>16 string EPS \b, type %s -->>>16 string Query \b, type %s -->>>16 string ExitServer \b, type %s -->>>16 search/1000 %%LanguageLevel:\ -->>>>&0 string >\0 \b, Level %s --0 string \033%-12345X%!PS PostScript document -- - # DOS EPS Binary File Header - # From: Ed Sznyter <ews@Black.Market.NET> - 0 belong 0xC5D0D3C6 DOS EPS Binary File diff --git a/package/file/patches/patch-magic_Makefile_in b/package/file/patches/patch-magic_Makefile_in new file mode 100644 index 000000000..82f15d16c --- /dev/null +++ b/package/file/patches/patch-magic_Makefile_in @@ -0,0 +1,11 @@ +--- file-5.04.orig/magic/Makefile.in 2010-01-22 22:44:34.000000000 +0100 ++++ file-5.04/magic/Makefile.in 2010-01-31 19:18:37.000000000 +0100 +@@ -394,7 +394,7 @@ CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_D + + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file +-@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file ++@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = ./file + @IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE) + @IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP = + all: all-am diff --git a/package/findutils/Makefile b/package/findutils/Makefile new file mode 100644 index 000000000..69f7f0e57 --- /dev/null +++ b/package/findutils/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= findutils +PKG_VERSION:= 4.4.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 351cc4adb07d54877fa15f75fb77d39f +PKG_DESCR:= GNU utilities for finding files +PKG_SECTION:= utils +PKG_DEPENDS:= libpthread +PKG_URL:= http://www.gnu.org/software/findutils/ +PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ + +# FIXME: test this port with some libc different from glibc + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +# the following prevents gnulib from defining it's own fseeko (which conflicts with the libc one) +CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/{s,}bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} $(IDIR_FINDUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/{bigram,code,frcode} $(IDIR_FINDUTILS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile new file mode 100644 index 000000000..013910dd5 --- /dev/null +++ b/package/font-adobe-100dpi/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-adobe-100dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 93bd04e2fb348a0c48e13ab3933f2381 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_DEPENDS:= font-util +PKG_BUILDDEP+= font-util +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile new file mode 100644 index 000000000..34ace47f1 --- /dev/null +++ b/package/font-adobe-75dpi/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-adobe-75dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d22283daba10129643800d73f5496aab +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_DEPENDS:= font-util +PKG_BUILDDEP+= font-util +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile new file mode 100644 index 000000000..7af15ff0c --- /dev/null +++ b/package/font-bh-100dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-100dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d9383b2ddda241a464343b7b4de370a9 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile new file mode 100644 index 000000000..48ae24be3 --- /dev/null +++ b/package/font-bh-75dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-75dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 200b38e879dcbf922ca2a9f71ad44657 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile new file mode 100644 index 000000000..1c99e99f1 --- /dev/null +++ b/package/font-bh-lucidatypewriter-100dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-lucidatypewriter-100dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8fa38b7845c10ff83d6077a1e238b15b +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile new file mode 100644 index 000000000..76e23c0e7 --- /dev/null +++ b/package/font-bh-lucidatypewriter-75dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-lucidatypewriter-75dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f36b68aabef2d57258131ce6136c6f50 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile new file mode 100644 index 000000000..944c400ad --- /dev/null +++ b/package/font-bh-ttf/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-ttf +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= baea1bb10808857e595f13c6be9cbfbe +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF + $(CP) ${WRKINST}/usr/share/fonts/X11/TTF/* \ + $(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile new file mode 100644 index 000000000..27885e75c --- /dev/null +++ b/package/font-bh-type1/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bh-type1 +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 000da66f92370ac59e3df1b6719fdd9a +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1 + $(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \ + $(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1 + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile new file mode 100644 index 000000000..05cff3d1a --- /dev/null +++ b/package/font-bitstream-100dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bitstream-100dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 823c3c2a1a2307bdca5961145e3db37d +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \ + $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile new file mode 100644 index 000000000..a58f28fef --- /dev/null +++ b/package/font-bitstream-75dpi/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bitstream-75dpi +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f8e982bcaaed199fdac03e9fc12b2952 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi + $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \ + $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile new file mode 100644 index 000000000..a32aa4bd0 --- /dev/null +++ b/package/font-bitstream-type1/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-bitstream-type1 +PKG_VERSION:= 1.0.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 08722299c09753a5540a0752ec5b5fc7 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1 + $(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \ + $(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1 + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile new file mode 100644 index 000000000..deba7e3f3 --- /dev/null +++ b/package/font-misc-misc/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-misc-misc +PKG_VERSION:= 1.1.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 047eae4d061f17d96213c4e78f7abccb +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_BUILDDEP+= font-util +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc + $(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \ + $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-util/Makefile b/package/font-util/Makefile new file mode 100644 index 000000000..eb89dd3e3 --- /dev/null +++ b/package/font-util/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= font-util +PKG_VERSION:= 1.1.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d +PKG_DESCR:= font util +PKG_SECTION:= libs +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util + ${CP} ${WRKINST}/usr/share/fonts/X11/util/* \ + ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile new file mode 100644 index 000000000..a2960a494 --- /dev/null +++ b/package/font-xfree86-type1/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= font-xfree86-type1 +PKG_VERSION:= 1.0.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 785f2b6e8d6d0dafec08b8d4c54ae2e3 +PKG_DESCR:= X fonts +PKG_SECTION:= x11 +PKG_URL:= http://www.x.org/ +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1 + $(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \ + $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1 + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gcc/Makefile b/package/gcc/Makefile index f2820d144..4e613efef 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -51,12 +51,6 @@ post-install: ${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/ cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp . ${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/ -ifeq ($(ADK_TARGET_LIB_UCLIBC),y) - ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib -else - ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib - ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GCC}/usr/lib -endif rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gdb/Makefile b/package/gdb/Makefile index c70345891..86152fced 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -6,8 +6,8 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= comp -PKG_DEPENDS:= libthread-db libncurses -PKG_BUILDDEP+= ncurses readline +PKG_DEPENDS:= libthread-db libncurses libiconv +PKG_BUILDDEP+= ncurses readline libiconv PKG_TARGET_DEPENDS:= !foxboard !ag241 include ${TOPDIR}/mk/package.mk diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 45145d230..27f5baafc 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -45,10 +45,13 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done - # create ld.so link for mips gcc linker option - cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1 glibc-dev-install: + ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib + # install linker script + -cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ diff --git a/package/glibc/files/libc.so.x86 b/package/glibc/files/libc.so.x86 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/glibc/files/libc.so.x86 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) diff --git a/package/glibc/files/libc.so.x86_64 b/package/glibc/files/libc.so.x86_64 new file mode 100644 index 000000000..a2e2de87f --- /dev/null +++ b/package/glibc/files/libc.so.x86_64 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + OUTPUT_FORMAT(elf64-x86-64) + GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-x86-64.so.2 ) ) diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 845bf06b6..6adea4d87 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -5,13 +5,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gpsd PKG_VERSION:= 2.39 -PKG_RELEASE:= 1 -PKG_BUILDDEP+= ncurses -PKG_CXX:= GPSD +PKG_RELEASE:= 2 PKG_MD5SUM:= 3db437196a6840c252fca99b6c19d4d0 PKG_DESCR:= An interface daemon for GPS receivers PKG_SECTION:= net PKG_DEPENDS:= libpthread +PKG_BUILDDEP+= ncurses +PKG_CXX:= GPSD PKG_SITES:= http://download.berlios.de/gpsd/ PKG_DESCR_1:= GPS client utilities diff --git a/package/gpsd/patches/patch-sirfflash_c b/package/gpsd/patches/patch-sirfflash_c new file mode 100644 index 000000000..979793a56 --- /dev/null +++ b/package/gpsd/patches/patch-sirfflash_c @@ -0,0 +1,11 @@ +--- gpsd-2.39.orig/sirfflash.c 2009-01-28 21:53:47.000000000 +0100 ++++ gpsd-2.39/sirfflash.c 2010-01-16 09:27:49.000000000 +0100 +@@ -193,7 +193,7 @@ sirfSetProto(int pfd, struct termios *te + + sirf[7] = sirf[6] = (unsigned char)proto; + /*@i@*/i = htonl(speed); /* borrow "i" to put speed into proper byte order */ +- /*@i@*/bcopy(&i, sirf+8, 4); ++ /*@i@*/memcpy(sirf+8, &i, 4); + + /* send at whatever baud we're currently using */ + (void)sirf_write(pfd, sirf); diff --git a/package/gsm/Makefile b/package/gsm/Makefile index dfa0cbb5c..308c174c9 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -12,6 +12,7 @@ PKG_SECTION:= libs PKG_URL:= http://www-rn.informatik.uni-bremen.de/software/gsm/ PKG_SITES:= http://www-rn.informatik.uni-bremen.de/software/gsm/ +PKG_NOPARALLEL:= 1 PKG_DESCR_1:= A GSM 06.10 full-rate speech transcoding implementation (utilities) PKG_DEPENDS_1:= libgsm diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index b1e102ae4..6a5ef3e18 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= libffi zlib PKG_URL:= http://jamvm.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=jamvm/} +PKG_TARGET_DEPENDS:= !foxboard + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile index ae021e974..208bf5256 100644 --- a/package/libXmu/Makefile +++ b/package/libXmu/Makefile @@ -23,5 +23,6 @@ INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib ${CP} ${WRKINST}/usr/lib/libXmu.so* ${IDIR_LIBXMU}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libXmuu.so* ${IDIR_LIBXMU}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libmad/patches/patch-configure b/package/libmad/patches/patch-configure new file mode 100644 index 000000000..79126f24a --- /dev/null +++ b/package/libmad/patches/patch-configure @@ -0,0 +1,10 @@ +--- libmad-0.15.1b.orig/configure 2004-02-05 10:34:07.000000000 +0100 ++++ libmad-0.15.1b/configure 2010-01-22 22:03:54.000000000 +0100 +@@ -19099,7 +19099,6 @@ then + case "$optimize" in + -O|"-O "*) + optimize="-O" +- optimize="$optimize -fforce-mem" + optimize="$optimize -fforce-addr" + : #x optimize="$optimize -finline-functions" + : #- optimize="$optimize -fstrength-reduce" diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile new file mode 100644 index 000000000..a5769a212 --- /dev/null +++ b/package/libnetfilter_queue/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libnetfilter_queue +PKG_VERSION:= 0.0.17 +PKG_RELEASE:= 1 +PKG_BUILDDEP+= libnfnetlink +PKG_MD5SUM:= 2cde35e678ead3a8f9eb896bf807a159 +PKG_DESCR:= API to packets that have been queued by the kernel packet filter +PKG_SECTION:= libs +PKG_DEPENDS:= libnfnetlink +PKG_URL:= http://www.netfilter.org/projects/libnetfilter_queue/ +PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_queue/files/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBNETFILTER_QUEUE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_LIBNETFILTER_QUEUE)/usr/lib + $(CP) $(WRKINST)/usr/lib/libnetfilter_queue*so* \ + $(IDIR_LIBNETFILTER_QUEUE)/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile new file mode 100644 index 000000000..e73fe97ba --- /dev/null +++ b/package/libnfnetlink/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= libnfnetlink +PKG_VERSION:= 0.0.41 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 5d844ea1f557bad0364d5b85cd10c796 +PKG_DESCR:= low-level library for netfilter related kernel/userspace communication +PKG_SECTION:= libs +PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/ +PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBNFNETLINK,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib + $(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 1d5a0812f..512593872 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtool -PKG_VERSION:= 1.5.22 +PKG_VERSION:= 2.2.6b PKG_RELEASE:= 1 -PKG_MD5SUM:= 8e0ac9797b62ba4dcc8a2fb7936412b0 +PKG_MD5SUM:= 07da460450490148c6d2df0f21481a25 PKG_DESCR:= a generic dynamic object loading library PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/libtool diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile index 1746159fe..7535732e9 100644 --- a/package/libvirt/Makefile +++ b/package/libvirt/Makefile @@ -15,6 +15,7 @@ PKG_URL:= http://www.libvirt.org/ PKG_SITES:= ftp://libvirt.org/libvirt/ PKG_HOST_DEPENDS:= !freebsd +PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/microperl/files/uconfig.h.cris b/package/microperl/files/uconfig.h.cris new file mode 100644 index 000000000..c5491c2b7 --- /dev/null +++ b/package/microperl/files/uconfig.h.cris @@ -0,0 +1,4462 @@ +/* + * This file was produced by running the config_h.SH script, which + * gets its values from config.sh, which is generally produced by + * running Configure. + * + * Feel free to modify any of this as the need arises. Note, however, + * that running config_h.SH again will wipe out any changes you've made. + * For a more permanent change edit config.sh and rerun config_h.SH. + * + * $Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $ + */ + +/* + * Package name : perl5 + * Source directory : . + * Configuration time: Mon Sep 14 22:24:11 CEST 2009 + * Configured by : OpenADK + * Target system : linux linux 2.6.30.5 #4 smp fri sep 11 13:47:48 cest 2009 x86_64 unknown + */ + +#ifndef _config_h_ +#define _config_h_ + +/* LOC_SED: + * This symbol holds the complete pathname to the sed program. + */ +#define LOC_SED "/bin/sed" /**/ + +/* HAS_ALARM: + * This symbol, if defined, indicates that the alarm routine is + * available. + */ +#define HAS_ALARM /**/ + +/* HAS_BCMP: + * This symbol is defined if the bcmp() routine is available to + * compare blocks of memory. + */ +/*#define HAS_BCMP / **/ + +/* HAS_BCOPY: + * This symbol is defined if the bcopy() routine is available to + * copy blocks of memory. + */ +/*#define HAS_BCOPY / **/ + +/* HAS_BZERO: + * This symbol is defined if the bzero() routine is available to + * set a memory block to 0. + */ +/*#define HAS_BZERO / **/ + +/* HAS_CHOWN: + * This symbol, if defined, indicates that the chown routine is + * available. + */ +#define HAS_CHOWN /**/ + +/* HAS_CHROOT: + * This symbol, if defined, indicates that the chroot routine is + * available. + */ +#define HAS_CHROOT /**/ + +/* HAS_CHSIZE: + * This symbol, if defined, indicates that the chsize routine is available + * to truncate files. You might need a -lx to get this routine. + */ +/*#define HAS_CHSIZE / **/ + +/* HAS_CTERMID: + * This symbol, if defined, indicates that the ctermid routine is + * available to generate filename for terminal. + */ +#define HAS_CTERMID /**/ + +/* HAS_CUSERID: + * This symbol, if defined, indicates that the cuserid routine is + * available to get character login names. + */ +#define HAS_CUSERID /**/ + +/* HAS_DBL_DIG: + * This symbol, if defined, indicates that this system's <float.h> + * or <limits.h> defines the symbol DBL_DIG, which is the number + * of significant digits in a double precision number. If this + * symbol is not defined, a guess of 15 is usually pretty good. + */ +#define HAS_DBL_DIG /* */ + +/* HAS_DIFFTIME: + * This symbol, if defined, indicates that the difftime routine is + * available. + */ +#define HAS_DIFFTIME /**/ + +/* HAS_DLERROR: + * This symbol, if defined, indicates that the dlerror routine is + * available to return a string describing the last error that + * occurred from a call to dlopen(), dlclose() or dlsym(). + */ +/*#define HAS_DLERROR / **/ + +/* HAS_DUP2: + * This symbol, if defined, indicates that the dup2 routine is + * available to duplicate file descriptors. + */ +#define HAS_DUP2 /**/ + +/* HAS_FCHMOD: + * This symbol, if defined, indicates that the fchmod routine is available + * to change mode of opened files. If unavailable, use chmod(). + */ +#define HAS_FCHMOD /**/ + +/* HAS_FCHOWN: + * This symbol, if defined, indicates that the fchown routine is available + * to change ownership of opened files. If unavailable, use chown(). + */ +#define HAS_FCHOWN /**/ + +/* HAS_FCNTL: + * This symbol, if defined, indicates to the C program that + * the fcntl() function exists. + */ +#define HAS_FCNTL /**/ + +/* HAS_FGETPOS: + * This symbol, if defined, indicates that the fgetpos routine is + * available to get the file position indicator, similar to ftell(). + */ +#define HAS_FGETPOS /**/ + +/* HAS_FLOCK: + * This symbol, if defined, indicates that the flock routine is + * available to do file locking. + */ +#define HAS_FLOCK /**/ + +/* HAS_FORK: + * This symbol, if defined, indicates that the fork routine is + * available. + */ +#define HAS_FORK /**/ + +/* HAS_FSETPOS: + * This symbol, if defined, indicates that the fsetpos routine is + * available to set the file position indicator, similar to fseek(). + */ +#define HAS_FSETPOS /**/ + +/* HAS_GETTIMEOFDAY: + * This symbol, if defined, indicates that the gettimeofday() system + * call is available for a sub-second accuracy clock. Usually, the file + * <sys/resource.h> needs to be included (see I_SYS_RESOURCE). + * The type "Timeval" should be used to refer to "struct timeval". + */ +#define HAS_GETTIMEOFDAY /**/ +#ifdef HAS_GETTIMEOFDAY +#define Timeval struct timeval /* Structure used by gettimeofday() */ +#endif + +/* HAS_GETGROUPS: + * This symbol, if defined, indicates that the getgroups() routine is + * available to get the list of process groups. If unavailable, multiple + * groups are probably not supported. + */ +#define HAS_GETGROUPS /**/ + +/* HAS_GETLOGIN: + * This symbol, if defined, indicates that the getlogin routine is + * available to get the login name. + */ +#define HAS_GETLOGIN /**/ + +/* HAS_GETPGID: + * This symbol, if defined, indicates to the C program that + * the getpgid(pid) function is available to get the + * process group id. + */ +#define HAS_GETPGID /**/ + +/* HAS_GETPGRP2: + * This symbol, if defined, indicates that the getpgrp2() (as in DG/UX) + * routine is available to get the current process group. + */ +/*#define HAS_GETPGRP2 / **/ + +/* HAS_GETPPID: + * This symbol, if defined, indicates that the getppid routine is + * available to get the parent process ID. + */ +#define HAS_GETPPID /**/ + +/* HAS_GETPRIORITY: + * This symbol, if defined, indicates that the getpriority routine is + * available to get a process's priority. + */ +#define HAS_GETPRIORITY /**/ + +/* HAS_INET_ATON: + * This symbol, if defined, indicates to the C program that the + * inet_aton() function is available to parse IP address "dotted-quad" + * strings. + */ +#define HAS_INET_ATON /**/ + +/* HAS_KILLPG: + * This symbol, if defined, indicates that the killpg routine is available + * to kill process groups. If unavailable, you probably should use kill + * with a negative process number. + */ +#define HAS_KILLPG /**/ + +/* HAS_LINK: + * This symbol, if defined, indicates that the link routine is + * available to create hard links. + */ +#define HAS_LINK /**/ + +/* HAS_LOCALECONV: + * This symbol, if defined, indicates that the localeconv routine is + * available for numeric and monetary formatting conventions. + */ +#define HAS_LOCALECONV /**/ + +/* HAS_LOCKF: + * This symbol, if defined, indicates that the lockf routine is + * available to do file locking. + */ +#define HAS_LOCKF /**/ + +/* HAS_LSTAT: + * This symbol, if defined, indicates that the lstat routine is + * available to do file stats on symbolic links. + */ +#define HAS_LSTAT /**/ + +/* HAS_MBLEN: + * This symbol, if defined, indicates that the mblen routine is available + * to find the number of bytes in a multibye character. + */ +#define HAS_MBLEN /**/ + +/* HAS_MBSTOWCS: + * This symbol, if defined, indicates that the mbstowcs routine is + * available to covert a multibyte string into a wide character string. + */ +#define HAS_MBSTOWCS /**/ + +/* HAS_MBTOWC: + * This symbol, if defined, indicates that the mbtowc routine is available + * to covert a multibyte to a wide character. + */ +#define HAS_MBTOWC /**/ + +/* HAS_MEMCMP: + * This symbol, if defined, indicates that the memcmp routine is available + * to compare blocks of memory. + */ +#define HAS_MEMCMP /**/ + +/* HAS_MEMCPY: + * This symbol, if defined, indicates that the memcpy routine is available + * to copy blocks of memory. + */ +#define HAS_MEMCPY /**/ + +/* HAS_MEMMOVE: + * This symbol, if defined, indicates that the memmove routine is available + * to copy potentially overlapping blocks of memory. This should be used + * only when HAS_SAFE_BCOPY is not defined. If neither is there, roll your + * own version. + */ +#define HAS_MEMMOVE /**/ + +/* HAS_MEMSET: + * This symbol, if defined, indicates that the memset routine is available + * to set blocks of memory. + */ +#define HAS_MEMSET /**/ + +/* HAS_MKDIR: + * This symbol, if defined, indicates that the mkdir routine is available + * to create directories. Otherwise you should fork off a new process to + * exec /bin/mkdir. + */ +#define HAS_MKDIR /**/ + +/* HAS_MKFIFO: + * This symbol, if defined, indicates that the mkfifo routine is + * available to create FIFOs. Otherwise, mknod should be able to + * do it for you. However, if mkfifo is there, mknod might require + * super-user privileges which mkfifo will not. + */ +#define HAS_MKFIFO /**/ + +/* HAS_MKTIME: + * This symbol, if defined, indicates that the mktime routine is + * available. + */ +#define HAS_MKTIME /**/ + +/* HAS_MSYNC: + * This symbol, if defined, indicates that the msync system call is + * available to synchronize a mapped file. + */ +#define HAS_MSYNC /**/ + +/* HAS_MUNMAP: + * This symbol, if defined, indicates that the munmap system call is + * available to unmap a region, usually mapped by mmap(). + */ +#define HAS_MUNMAP /**/ + +/* HAS_NICE: + * This symbol, if defined, indicates that the nice routine is + * available. + */ +#define HAS_NICE /**/ + +/* HAS_PATHCONF: + * This symbol, if defined, indicates that pathconf() is available + * to determine file-system related limits and options associated + * with a given filename. + */ +/* HAS_FPATHCONF: + * This symbol, if defined, indicates that pathconf() is available + * to determine file-system related limits and options associated + * with a given open file descriptor. + */ +#define HAS_PATHCONF /**/ +#define HAS_FPATHCONF /**/ + +/* HAS_PAUSE: + * This symbol, if defined, indicates that the pause routine is + * available to suspend a process until a signal is received. + */ +#define HAS_PAUSE /**/ + +/* HAS_PIPE: + * This symbol, if defined, indicates that the pipe routine is + * available to create an inter-process channel. + */ +#define HAS_PIPE /**/ + +/* HAS_READDIR: + * This symbol, if defined, indicates that the readdir routine is + * available to read directory entries. You may have to include + * <dirent.h>. See I_DIRENT. + */ +#define HAS_READDIR /**/ + +/* HAS_SEEKDIR: + * This symbol, if defined, indicates that the seekdir routine is + * available. You may have to include <dirent.h>. See I_DIRENT. + */ +#define HAS_SEEKDIR /**/ + +/* HAS_TELLDIR: + * This symbol, if defined, indicates that the telldir routine is + * available. You may have to include <dirent.h>. See I_DIRENT. + */ +#define HAS_TELLDIR /**/ + +/* HAS_REWINDDIR: + * This symbol, if defined, indicates that the rewinddir routine is + * available. You may have to include <dirent.h>. See I_DIRENT. + */ +#define HAS_REWINDDIR /**/ + +/* HAS_READLINK: + * This symbol, if defined, indicates that the readlink routine is + * available to read the value of a symbolic link. + */ +#define HAS_READLINK /**/ + +/* HAS_RENAME: + * This symbol, if defined, indicates that the rename routine is available + * to rename files. Otherwise you should do the unlink(), link(), unlink() + * trick. + */ +#define HAS_RENAME /**/ + +/* HAS_RMDIR: + * This symbol, if defined, indicates that the rmdir routine is + * available to remove directories. Otherwise you should fork off a + * new process to exec /bin/rmdir. + */ +#define HAS_RMDIR /**/ + +/* HAS_SELECT: + * This symbol, if defined, indicates that the select routine is + * available to select active file descriptors. If the timeout field + * is used, <sys/time.h> may need to be included. + */ +#define HAS_SELECT /**/ + +/* HAS_SETEGID: + * This symbol, if defined, indicates that the setegid routine is available + * to change the effective gid of the current program. + */ +#define HAS_SETEGID /**/ + +/* HAS_SETEUID: + * This symbol, if defined, indicates that the seteuid routine is available + * to change the effective uid of the current program. + */ +#define HAS_SETEUID /**/ + +/* HAS_SETLINEBUF: + * This symbol, if defined, indicates that the setlinebuf routine is + * available to change stderr or stdout from block-buffered or unbuffered + * to a line-buffered mode. + */ +#define HAS_SETLINEBUF /**/ + +/* HAS_SETLOCALE: + * This symbol, if defined, indicates that the setlocale routine is + * available to handle locale-specific ctype implementations. + */ +#define HAS_SETLOCALE /**/ + +/* HAS_SETPGID: + * This symbol, if defined, indicates that the setpgid(pid, gpid) + * routine is available to set process group ID. + */ +#define HAS_SETPGID /**/ + +/* HAS_SETPGRP2: + * This symbol, if defined, indicates that the setpgrp2() (as in DG/UX) + * routine is available to set the current process group. + */ +/*#define HAS_SETPGRP2 / **/ + +/* HAS_SETPRIORITY: + * This symbol, if defined, indicates that the setpriority routine is + * available to set a process's priority. + */ +#define HAS_SETPRIORITY /**/ + +/* HAS_SETREGID: + * This symbol, if defined, indicates that the setregid routine is + * available to change the real and effective gid of the current + * process. + */ +/* HAS_SETRESGID: + * This symbol, if defined, indicates that the setresgid routine is + * available to change the real, effective and saved gid of the current + * process. + */ +#define HAS_SETREGID /**/ +#define HAS_SETRESGID /**/ + +/* HAS_SETREUID: + * This symbol, if defined, indicates that the setreuid routine is + * available to change the real and effective uid of the current + * process. + */ +/* HAS_SETRESUID: + * This symbol, if defined, indicates that the setresuid routine is + * available to change the real, effective and saved uid of the current + * process. + */ +#define HAS_SETREUID /**/ +#define HAS_SETRESUID /**/ + +/* HAS_SETRGID: + * This symbol, if defined, indicates that the setrgid routine is available + * to change the real gid of the current program. + */ +/*#define HAS_SETRGID / **/ + +/* HAS_SETRUID: + * This symbol, if defined, indicates that the setruid routine is available + * to change the real uid of the current program. + */ +/*#define HAS_SETRUID / **/ + +/* HAS_SETSID: + * This symbol, if defined, indicates that the setsid routine is + * available to set the process group ID. + */ +#define HAS_SETSID /**/ + +/* HAS_STRCHR: + * This symbol is defined to indicate that the strchr()/strrchr() + * functions are available for string searching. If not, try the + * index()/rindex() pair. + */ +/* HAS_INDEX: + * This symbol is defined to indicate that the index()/rindex() + * functions are available for string searching. + */ +#define HAS_STRCHR /**/ +/*#define HAS_INDEX / **/ + +/* HAS_STRCOLL: + * This symbol, if defined, indicates that the strcoll routine is + * available to compare strings using collating information. + */ +#define HAS_STRCOLL /**/ + +/* HAS_STRTOD: + * This symbol, if defined, indicates that the strtod routine is + * available to provide better numeric string conversion than atof(). + */ +#define HAS_STRTOD /**/ + +/* HAS_STRTOL: + * This symbol, if defined, indicates that the strtol routine is available + * to provide better numeric string conversion than atoi() and friends. + */ +#define HAS_STRTOL /**/ + +/* HAS_STRXFRM: + * This symbol, if defined, indicates that the strxfrm() routine is + * available to transform strings. + */ +#define HAS_STRXFRM /**/ + +/* HAS_SYMLINK: + * This symbol, if defined, indicates that the symlink routine is available + * to create symbolic links. + */ +#define HAS_SYMLINK /**/ + +/* HAS_SYSCALL: + * This symbol, if defined, indicates that the syscall routine is + * available to call arbitrary system calls. If undefined, that's tough. + */ +#define HAS_SYSCALL /**/ + +/* HAS_SYSCONF: + * This symbol, if defined, indicates that sysconf() is available + * to determine system related limits and options. + */ +#define HAS_SYSCONF /**/ + +/* HAS_SYSTEM: + * This symbol, if defined, indicates that the system routine is + * available to issue a shell command. + */ +#define HAS_SYSTEM /**/ + +/* HAS_TCGETPGRP: + * This symbol, if defined, indicates that the tcgetpgrp routine is + * available to get foreground process group ID. + */ +#define HAS_TCGETPGRP /**/ + +/* HAS_TCSETPGRP: + * This symbol, if defined, indicates that the tcsetpgrp routine is + * available to set foreground process group ID. + */ +#define HAS_TCSETPGRP /**/ + +/* HAS_TRUNCATE: + * This symbol, if defined, indicates that the truncate routine is + * available to truncate files. + */ +#define HAS_TRUNCATE /**/ + +/* HAS_TZNAME: + * This symbol, if defined, indicates that the tzname[] array is + * available to access timezone names. + */ +#define HAS_TZNAME /**/ + +/* HAS_UMASK: + * This symbol, if defined, indicates that the umask routine is + * available to set and get the value of the file creation mask. + */ +#define HAS_UMASK /**/ + +/* HAS_USLEEP: + * This symbol, if defined, indicates that the usleep routine is + * available to let the process sleep on a sub-second accuracy. + */ +#define HAS_USLEEP /**/ + +/* HAS_WAIT4: + * This symbol, if defined, indicates that wait4() exists. + */ +#define HAS_WAIT4 /**/ + +/* HAS_WAITPID: + * This symbol, if defined, indicates that the waitpid routine is + * available to wait for child process. + */ +#define HAS_WAITPID /**/ + +/* HAS_WCSTOMBS: + * This symbol, if defined, indicates that the wcstombs routine is + * available to convert wide character strings to multibyte strings. + */ +#define HAS_WCSTOMBS /**/ + +/* HAS_WCTOMB: + * This symbol, if defined, indicates that the wctomb routine is available + * to covert a wide character to a multibyte. + */ +#define HAS_WCTOMB /**/ + +/* I_ARPA_INET: + * This symbol, if defined, indicates to the C program that it should + * include <arpa/inet.h> to get inet_addr and friends declarations. + */ +#define I_ARPA_INET /**/ + +/* I_DBM: + * This symbol, if defined, indicates that <dbm.h> exists and should + * be included. + */ +/* I_RPCSVC_DBM: + * This symbol, if defined, indicates that <rpcsvc/dbm.h> exists and + * should be included. + */ +/*#define I_DBM / **/ +/*#define I_RPCSVC_DBM / **/ + +/* I_DLFCN: + * This symbol, if defined, indicates that <dlfcn.h> exists and should + * be included. + */ +#define I_DLFCN /**/ + +/* I_FCNTL: + * This manifest constant tells the C program to include <fcntl.h>. + */ +/*#define I_FCNTL / **/ + +/* I_FLOAT: + * This symbol, if defined, indicates to the C program that it should + * include <float.h> to get definition of symbols like DBL_MAX or + * DBL_MIN, i.e. machine dependent floating point values. + */ +#define I_FLOAT /**/ + +/* I_GDBM: + * This symbol, if defined, indicates that <gdbm.h> exists and should + * be included. + */ +/*#define I_GDBM / **/ + +/* I_LIMITS: + * This symbol, if defined, indicates to the C program that it should + * include <limits.h> to get definition of symbols like WORD_BIT or + * LONG_MAX, i.e. machine dependant limitations. + */ +#define I_LIMITS /**/ + +/* I_LOCALE: + * This symbol, if defined, indicates to the C program that it should + * include <locale.h>. + */ +#define I_LOCALE /**/ + +/* I_MATH: + * This symbol, if defined, indicates to the C program that it should + * include <math.h>. + */ +#define I_MATH /**/ + +/* I_MEMORY: + * This symbol, if defined, indicates to the C program that it should + * include <memory.h>. + */ +/*#define I_MEMORY / **/ + +/* I_NET_ERRNO: + * This symbol, if defined, indicates that <net/errno.h> exists and + * should be included. + */ +/*#define I_NET_ERRNO / **/ + +/* I_NETINET_IN: + * This symbol, if defined, indicates to the C program that it should + * include <netinet/in.h>. Otherwise, you may try <sys/in.h>. + */ +#define I_NETINET_IN /**/ + +/* I_SFIO: + * This symbol, if defined, indicates to the C program that it should + * include <sfio.h>. + */ +/*#define I_SFIO / **/ + +/* I_STDDEF: + * This symbol, if defined, indicates that <stddef.h> exists and should + * be included. + */ +#define I_STDDEF /**/ + +/* I_STDLIB: + * This symbol, if defined, indicates that <stdlib.h> exists and should + * be included. + */ +#define I_STDLIB /**/ + +/* I_STRING: + * This symbol, if defined, indicates to the C program that it should + * include <string.h> (USG systems) instead of <strings.h> (BSD systems). + */ +#define I_STRING /**/ + +/* I_SYS_DIR: + * This symbol, if defined, indicates to the C program that it should + * include <sys/dir.h>. + */ +#define I_SYS_DIR /**/ + +/* I_SYS_FILE: + * This symbol, if defined, indicates to the C program that it should + * include <sys/file.h> to get definition of R_OK and friends. + */ +#define I_SYS_FILE /**/ + +/* I_SYS_IOCTL: + * This symbol, if defined, indicates that <sys/ioctl.h> exists and should + * be included. Otherwise, include <sgtty.h> or <termio.h>. + */ +/* I_SYS_SOCKIO: + * This symbol, if defined, indicates the <sys/sockio.h> should be included + * to get socket ioctl options, like SIOCATMARK. + */ +#define I_SYS_IOCTL /**/ +/*#define I_SYS_SOCKIO / **/ + +/* I_SYS_NDIR: + * This symbol, if defined, indicates to the C program that it should + * include <sys/ndir.h>. + */ +/*#define I_SYS_NDIR / **/ + +/* I_SYS_PARAM: + * This symbol, if defined, indicates to the C program that it should + * include <sys/param.h>. + */ +#define I_SYS_PARAM /**/ + +/* I_SYS_RESOURCE: + * This symbol, if defined, indicates to the C program that it should + * include <sys/resource.h>. + */ +#define I_SYS_RESOURCE /**/ + +/* I_SYS_SELECT: + * This symbol, if defined, indicates to the C program that it should + * include <sys/select.h> in order to get definition of struct timeval. + */ +#define I_SYS_SELECT /**/ + +/* I_SYS_STAT: + * This symbol, if defined, indicates to the C program that it should + * include <sys/stat.h>. + */ +#define I_SYS_STAT /**/ + +/* I_SYS_TIMES: + * This symbol, if defined, indicates to the C program that it should + * include <sys/times.h>. + */ +#define I_SYS_TIMES /**/ + +/* I_SYS_TYPES: + * This symbol, if defined, indicates to the C program that it should + * include <sys/types.h>. + */ +#define I_SYS_TYPES /**/ + +/* I_SYS_UN: + * This symbol, if defined, indicates to the C program that it should + * include <sys/un.h> to get UNIX domain socket definitions. + */ +#define I_SYS_UN /**/ + +/* I_SYS_WAIT: + * This symbol, if defined, indicates to the C program that it should + * include <sys/wait.h>. + */ +#define I_SYS_WAIT /**/ + +/* I_TERMIO: + * This symbol, if defined, indicates that the program should include + * <termio.h> rather than <sgtty.h>. There are also differences in + * the ioctl() calls that depend on the value of this symbol. + */ +/* I_TERMIOS: + * This symbol, if defined, indicates that the program should include + * the POSIX termios.h rather than sgtty.h or termio.h. + * There are also differences in the ioctl() calls that depend on the + * value of this symbol. + */ +/* I_SGTTY: + * This symbol, if defined, indicates that the program should include + * <sgtty.h> rather than <termio.h>. There are also differences in + * the ioctl() calls that depend on the value of this symbol. + */ +/*#define I_TERMIO / **/ +#define I_TERMIOS /**/ +/*#define I_SGTTY / **/ + +/* I_UNISTD: + * This symbol, if defined, indicates to the C program that it should + * include <unistd.h>. + */ +#define I_UNISTD /**/ + +/* I_UTIME: + * This symbol, if defined, indicates to the C program that it should + * include <utime.h>. + */ +#define I_UTIME /**/ + +/* I_VALUES: + * This symbol, if defined, indicates to the C program that it should + * include <values.h> to get definition of symbols like MINFLOAT or + * MAXLONG, i.e. machine dependant limitations. Probably, you + * should use <limits.h> instead, if it is available. + */ +#define I_VALUES /**/ + +/* I_VFORK: + * This symbol, if defined, indicates to the C program that it should + * include vfork.h. + */ +/*#define I_VFORK / **/ + +/* INTSIZE: + * This symbol contains the value of sizeof(int) so that the C + * preprocessor can make decisions based on it. + */ +/* LONGSIZE: + * This symbol contains the value of sizeof(long) so that the C + * preprocessor can make decisions based on it. + */ +/* SHORTSIZE: + * This symbol contains the value of sizeof(short) so that the C + * preprocessor can make decisions based on it. + */ +#define INTSIZE 4 /**/ +#define LONGSIZE 8 /**/ +#define SHORTSIZE 2 /**/ + +/* MULTIARCH: + * This symbol, if defined, signifies that the build + * process will produce some binary files that are going to be + * used in a cross-platform environment. This is the case for + * example with the NeXT "fat" binaries that contain executables + * for several CPUs. + */ +/*#define MULTIARCH / **/ + +/* HAS_QUAD: + * This symbol, if defined, tells that there's a 64-bit integer type, + * Quad_t, and its unsigned counterpar, Uquad_t. QUADKIND will be one + * of QUAD_IS_INT, QUAD_IS_LONG, QUAD_IS_LONG_LONG, or QUAD_IS_INT64_T. + */ +#define HAS_QUAD /**/ +#ifdef HAS_QUAD +# define Quad_t long /**/ +# define Uquad_t unsigned long /**/ +# define QUADKIND 2 /**/ +# define QUAD_IS_INT 1 +# define QUAD_IS_LONG 2 +# define QUAD_IS_LONG_LONG 3 +# define QUAD_IS_INT64_T 4 +#endif + +/* OSNAME: + * This symbol contains the name of the operating system, as determined + * by Configure. You shouldn't rely on it too much; the specific + * feature tests from Configure are generally more reliable. + */ +/* OSVERS: + * This symbol contains the version of the operating system, as determined + * by Configure. You shouldn't rely on it too much; the specific + * feature tests from Configure are generally more reliable. + */ +#define OSNAME "linux" /**/ +#define OSVERS "2.6.30.5" /**/ + +/* ARCHLIB: + * This variable, if defined, holds the name of the directory in + * which the user wants to put architecture-dependent public + * library files for perl5. It is most often a local directory + * such as /usr/local/lib. Programs using this variable must be + * prepared to deal with filename expansion. If ARCHLIB is the + * same as PRIVLIB, it is not defined, since presumably the + * program already searches PRIVLIB. + */ +/* ARCHLIB_EXP: + * This symbol contains the ~name expanded version of ARCHLIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define ARCHLIB "/usr/lib/perl5/5.10.0/x86_64-linux" /**/ +#define ARCHLIB_EXP "/usr/lib/perl5/5.10.0/x86_64-linux" /**/ + +/* ARCHNAME: + * This symbol holds a string representing the architecture name. + * It may be used to construct an architecture-dependant pathname + * where library files may be held under a private library, for + * instance. + */ +#define ARCHNAME "x86_64-linux" /**/ + +/* BIN: + * This symbol holds the path of the bin directory where the package will + * be installed. Program must be prepared to deal with ~name substitution. + */ +/* BIN_EXP: + * This symbol is the filename expanded version of the BIN symbol, for + * programs that do not want to deal with that at run-time. + */ +/* PERL_RELOCATABLE_INC: + * This symbol, if defined, indicates that we'd like to relocate entries + * in @INC at run time based on the location of the perl binary. + */ +#define BIN "/usr/bin" /**/ +#define BIN_EXP "/usr/bin" /**/ +#define PERL_RELOCATABLE_INC "undef" /**/ + +/* CAT2: + * This macro concatenates 2 tokens together. + */ +/* STRINGIFY: + * This macro surrounds its token with double quotes. + */ +#if 42 == 1 +#define CAT2(a,b) a/**/b +#define STRINGIFY(a) "a" + /* If you can get stringification with catify, tell me how! */ +#endif +#if 42 == 42 +#define PeRl_CaTiFy(a, b) a ## b +#define PeRl_StGiFy(a) #a +/* the additional level of indirection enables these macros to be + * used as arguments to other macros. See K&R 2nd ed., page 231. */ +#define CAT2(a,b) PeRl_CaTiFy(a,b) +#define StGiFy(a) PeRl_StGiFy(a) +#define STRINGIFY(a) PeRl_StGiFy(a) +#endif +#if 42 != 1 && 42 != 42 +# include "Bletch: How does this C preprocessor concatenate tokens?" +#endif + +/* CPPSTDIN: + * This symbol contains the first part of the string which will invoke + * the C preprocessor on the standard input and produce to standard + * output. Typical value of "cc -E" or "/lib/cpp", but it can also + * call a wrapper. See CPPRUN. + */ +/* CPPMINUS: + * This symbol contains the second part of the string which will invoke + * the C preprocessor on the standard input and produce to standard + * output. This symbol will have the value "-" if CPPSTDIN needs a minus + * to specify standard input, otherwise the value is "". + */ +/* CPPRUN: + * This symbol contains the string which will invoke a C preprocessor on + * the standard input and produce to standard output. It needs to end + * with CPPLAST, after all other preprocessor flags have been specified. + * The main difference with CPPSTDIN is that this program will never be a + * pointer to a shell wrapper, i.e. it will be empty if no preprocessor is + * available directly to the user. Note that it may well be different from + * the preprocessor used to compile the C program. + */ +/* CPPLAST: + * This symbol is intended to be used along with CPPRUN in the same manner + * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". + */ +#define CPPSTDIN "gcc -E" +#define CPPMINUS "-" +#define CPPRUN "gcc -E" +#define CPPLAST "-" + +/* HAS_ACCESS: + * This manifest constant lets the C program know that the access() + * system call is available to check for accessibility using real UID/GID. + * (always present on UNIX.) + */ +#define HAS_ACCESS /**/ + +/* HAS_ACCESSX: + * This symbol, if defined, indicates that the accessx routine is + * available to do extended access checks. + */ +/*#define HAS_ACCESSX / **/ + +/* HAS_ASCTIME_R: + * This symbol, if defined, indicates that the asctime_r routine + * is available to asctime re-entrantly. + */ +/* ASCTIME_R_PROTO: + * This symbol encodes the prototype of asctime_r. + * It is zero if d_asctime_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_asctime_r + * is defined. + */ +/*#define HAS_ASCTIME_R / **/ +#define ASCTIME_R_PROTO 0 /**/ + +/* HASATTRIBUTE_FORMAT: + * Can we handle GCC attribute for checking printf-style formats + */ +/* PRINTF_FORMAT_NULL_OK: + * Allows __printf__ format to be null when checking printf-style + */ +/* HASATTRIBUTE_MALLOC: + * Can we handle GCC attribute for malloc-style functions. + */ +/* HASATTRIBUTE_NONNULL: + * Can we handle GCC attribute for nonnull function parms. + */ +/* HASATTRIBUTE_NORETURN: + * Can we handle GCC attribute for functions that do not return + */ +/* HASATTRIBUTE_PURE: + * Can we handle GCC attribute for pure functions + */ +/* HASATTRIBUTE_UNUSED: + * Can we handle GCC attribute for unused variables and arguments + */ +/* HASATTRIBUTE_WARN_UNUSED_RESULT: + * Can we handle GCC attribute for warning on unused results + */ +#define HASATTRIBUTE_FORMAT /**/ +/*#define PRINTF_FORMAT_NULL_OK / **/ +#define HASATTRIBUTE_NORETURN /**/ +#define HASATTRIBUTE_MALLOC /**/ +#define HASATTRIBUTE_NONNULL /**/ +#define HASATTRIBUTE_PURE /**/ +#define HASATTRIBUTE_UNUSED /**/ +#define HASATTRIBUTE_WARN_UNUSED_RESULT /**/ + +/* HASCONST: + * This symbol, if defined, indicates that this C compiler knows about + * the const type. There is no need to actually test for that symbol + * within your programs. The mere use of the "const" keyword will + * trigger the necessary tests. + */ +#define HASCONST /**/ +#ifndef HASCONST +#define const +#endif + +/* HAS_CRYPT: + * This symbol, if defined, indicates that the crypt routine is available + * to encrypt passwords and the like. + */ +/*#define HAS_CRYPT / **/ + +/* HAS_CRYPT_R: + * This symbol, if defined, indicates that the crypt_r routine + * is available to crypt re-entrantly. + */ +/* CRYPT_R_PROTO: + * This symbol encodes the prototype of crypt_r. + * It is zero if d_crypt_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_crypt_r + * is defined. + */ +/*#define HAS_CRYPT_R / **/ +#define CRYPT_R_PROTO 0 /**/ + +/* HAS_CSH: + * This symbol, if defined, indicates that the C-shell exists. + */ +/* CSH: + * This symbol, if defined, contains the full pathname of csh. + */ +/*#define HAS_CSH / **/ +#ifdef HAS_CSH +#define CSH "csh" /**/ +#endif + +/* HAS_CTERMID_R: + * This symbol, if defined, indicates that the ctermid_r routine + * is available to ctermid re-entrantly. + */ +/* CTERMID_R_PROTO: + * This symbol encodes the prototype of ctermid_r. + * It is zero if d_ctermid_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctermid_r + * is defined. + */ +/*#define HAS_CTERMID_R / **/ +#define CTERMID_R_PROTO 0 /**/ + +/* HAS_CTIME_R: + * This symbol, if defined, indicates that the ctime_r routine + * is available to ctime re-entrantly. + */ +/* CTIME_R_PROTO: + * This symbol encodes the prototype of ctime_r. + * It is zero if d_ctime_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_ctime_r + * is defined. + */ +/*#define HAS_CTIME_R / **/ +#define CTIME_R_PROTO 0 /**/ + +/* SETUID_SCRIPTS_ARE_SECURE_NOW: + * This symbol, if defined, indicates that the bug that prevents + * setuid scripts from being secure is not present in this kernel. + */ +/* DOSUID: + * This symbol, if defined, indicates that the C program should + * check the script that it is executing for setuid/setgid bits, and + * attempt to emulate setuid/setgid on systems that have disabled + * setuid #! scripts because the kernel can't do it securely. + * It is up to the package designer to make sure that this emulation + * is done securely. Among other things, it should do an fstat on + * the script it just opened to make sure it really is a setuid/setgid + * script, it should make sure the arguments passed correspond exactly + * to the argument on the #! line, and it should not trust any + * subprocesses to which it must pass the filename rather than the + * file descriptor of the script to be executed. + */ +/*#define SETUID_SCRIPTS_ARE_SECURE_NOW / **/ +/*#define DOSUID / **/ + +/* HAS_DRAND48_R: + * This symbol, if defined, indicates that the drand48_r routine + * is available to drand48 re-entrantly. + */ +/* DRAND48_R_PROTO: + * This symbol encodes the prototype of drand48_r. + * It is zero if d_drand48_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_drand48_r + * is defined. + */ +/*#define HAS_DRAND48_R / **/ +#define DRAND48_R_PROTO 0 /**/ + +/* HAS_DRAND48_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the drand48() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern double drand48(void); + */ +#define HAS_DRAND48_PROTO /**/ + +/* HAS_EACCESS: + * This symbol, if defined, indicates that the eaccess routine is + * available to do extended access checks. + */ +/*#define HAS_EACCESS / **/ + +/* HAS_ENDGRENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for finalizing sequential access of the group database. + */ +#define HAS_ENDGRENT /**/ + +/* HAS_ENDGRENT_R: + * This symbol, if defined, indicates that the endgrent_r routine + * is available to endgrent re-entrantly. + */ +/* ENDGRENT_R_PROTO: + * This symbol encodes the prototype of endgrent_r. + * It is zero if d_endgrent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endgrent_r + * is defined. + */ +/*#define HAS_ENDGRENT_R / **/ +#define ENDGRENT_R_PROTO 0 /**/ + +/* HAS_ENDHOSTENT: + * This symbol, if defined, indicates that the endhostent() routine is + * available to close whatever was being used for host queries. + */ +#define HAS_ENDHOSTENT /**/ + +/* HAS_ENDHOSTENT_R: + * This symbol, if defined, indicates that the endhostent_r routine + * is available to endhostent re-entrantly. + */ +/* ENDHOSTENT_R_PROTO: + * This symbol encodes the prototype of endhostent_r. + * It is zero if d_endhostent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endhostent_r + * is defined. + */ +/*#define HAS_ENDHOSTENT_R / **/ +#define ENDHOSTENT_R_PROTO 0 /**/ + +/* HAS_ENDNETENT: + * This symbol, if defined, indicates that the endnetent() routine is + * available to close whatever was being used for network queries. + */ +#define HAS_ENDNETENT /**/ + +/* HAS_ENDNETENT_R: + * This symbol, if defined, indicates that the endnetent_r routine + * is available to endnetent re-entrantly. + */ +/* ENDNETENT_R_PROTO: + * This symbol encodes the prototype of endnetent_r. + * It is zero if d_endnetent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endnetent_r + * is defined. + */ +/*#define HAS_ENDNETENT_R / **/ +#define ENDNETENT_R_PROTO 0 /**/ + +/* HAS_ENDPROTOENT: + * This symbol, if defined, indicates that the endprotoent() routine is + * available to close whatever was being used for protocol queries. + */ +#define HAS_ENDPROTOENT /**/ + +/* HAS_ENDPROTOENT_R: + * This symbol, if defined, indicates that the endprotoent_r routine + * is available to endprotoent re-entrantly. + */ +/* ENDPROTOENT_R_PROTO: + * This symbol encodes the prototype of endprotoent_r. + * It is zero if d_endprotoent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endprotoent_r + * is defined. + */ +/*#define HAS_ENDPROTOENT_R / **/ +#define ENDPROTOENT_R_PROTO 0 /**/ + +/* HAS_ENDPWENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for finalizing sequential access of the passwd database. + */ +#define HAS_ENDPWENT /**/ + +/* HAS_ENDPWENT_R: + * This symbol, if defined, indicates that the endpwent_r routine + * is available to endpwent re-entrantly. + */ +/* ENDPWENT_R_PROTO: + * This symbol encodes the prototype of endpwent_r. + * It is zero if d_endpwent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endpwent_r + * is defined. + */ +/*#define HAS_ENDPWENT_R / **/ +#define ENDPWENT_R_PROTO 0 /**/ + +/* HAS_ENDSERVENT: + * This symbol, if defined, indicates that the endservent() routine is + * available to close whatever was being used for service queries. + */ +#define HAS_ENDSERVENT /**/ + +/* HAS_ENDSERVENT_R: + * This symbol, if defined, indicates that the endservent_r routine + * is available to endservent re-entrantly. + */ +/* ENDSERVENT_R_PROTO: + * This symbol encodes the prototype of endservent_r. + * It is zero if d_endservent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_endservent_r + * is defined. + */ +/*#define HAS_ENDSERVENT_R / **/ +#define ENDSERVENT_R_PROTO 0 /**/ + +/* FLEXFILENAMES: + * This symbol, if defined, indicates that the system supports filenames + * longer than 14 characters. + */ +#define FLEXFILENAMES /**/ + +/* HAS_GETGRENT: + * This symbol, if defined, indicates that the getgrent routine is + * available for sequential access of the group database. + */ +#define HAS_GETGRENT /**/ + +/* HAS_GETGRENT_R: + * This symbol, if defined, indicates that the getgrent_r routine + * is available to getgrent re-entrantly. + */ +/* GETGRENT_R_PROTO: + * This symbol encodes the prototype of getgrent_r. + * It is zero if d_getgrent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrent_r + * is defined. + */ +/*#define HAS_GETGRENT_R / **/ +#define GETGRENT_R_PROTO 0 /**/ + +/* HAS_GETGRGID_R: + * This symbol, if defined, indicates that the getgrgid_r routine + * is available to getgrgid re-entrantly. + */ +/* GETGRGID_R_PROTO: + * This symbol encodes the prototype of getgrgid_r. + * It is zero if d_getgrgid_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrgid_r + * is defined. + */ +/*#define HAS_GETGRGID_R / **/ +#define GETGRGID_R_PROTO 0 /**/ + +/* HAS_GETGRNAM_R: + * This symbol, if defined, indicates that the getgrnam_r routine + * is available to getgrnam re-entrantly. + */ +/* GETGRNAM_R_PROTO: + * This symbol encodes the prototype of getgrnam_r. + * It is zero if d_getgrnam_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getgrnam_r + * is defined. + */ +/*#define HAS_GETGRNAM_R / **/ +#define GETGRNAM_R_PROTO 0 /**/ + +/* HAS_GETHOSTBYADDR: + * This symbol, if defined, indicates that the gethostbyaddr() routine is + * available to look up hosts by their IP addresses. + */ +#define HAS_GETHOSTBYADDR /**/ + +/* HAS_GETHOSTBYNAME: + * This symbol, if defined, indicates that the gethostbyname() routine is + * available to look up host names in some data base or other. + */ +#define HAS_GETHOSTBYNAME /**/ + +/* HAS_GETHOSTENT: + * This symbol, if defined, indicates that the gethostent() routine is + * available to look up host names in some data base or another. + */ +#define HAS_GETHOSTENT /**/ + +/* HAS_GETHOSTNAME: + * This symbol, if defined, indicates that the C program may use the + * gethostname() routine to derive the host name. See also HAS_UNAME + * and PHOSTNAME. + */ +/* HAS_UNAME: + * This symbol, if defined, indicates that the C program may use the + * uname() routine to derive the host name. See also HAS_GETHOSTNAME + * and PHOSTNAME. + */ +/* PHOSTNAME: + * This symbol, if defined, indicates the command to feed to the + * popen() routine to derive the host name. See also HAS_GETHOSTNAME + * and HAS_UNAME. Note that the command uses a fully qualified path, + * so that it is safe even if used by a process with super-user + * privileges. + */ +/* HAS_PHOSTNAME: + * This symbol, if defined, indicates that the C program may use the + * contents of PHOSTNAME as a command to feed to the popen() routine + * to derive the host name. + */ +#define HAS_GETHOSTNAME /**/ +#define HAS_UNAME /**/ +/*#define HAS_PHOSTNAME / **/ +#ifdef HAS_PHOSTNAME +#define PHOSTNAME "/bin/hostname" /* How to get the host name */ +#endif + +/* HAS_GETHOSTBYADDR_R: + * This symbol, if defined, indicates that the gethostbyaddr_r routine + * is available to gethostbyaddr re-entrantly. + */ +/* GETHOSTBYADDR_R_PROTO: + * This symbol encodes the prototype of gethostbyaddr_r. + * It is zero if d_gethostbyaddr_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyaddr_r + * is defined. + */ +/*#define HAS_GETHOSTBYADDR_R / **/ +#define GETHOSTBYADDR_R_PROTO 0 /**/ + +/* HAS_GETHOSTBYNAME_R: + * This symbol, if defined, indicates that the gethostbyname_r routine + * is available to gethostbyname re-entrantly. + */ +/* GETHOSTBYNAME_R_PROTO: + * This symbol encodes the prototype of gethostbyname_r. + * It is zero if d_gethostbyname_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostbyname_r + * is defined. + */ +/*#define HAS_GETHOSTBYNAME_R / **/ +#define GETHOSTBYNAME_R_PROTO 0 /**/ + +/* HAS_GETHOSTENT_R: + * This symbol, if defined, indicates that the gethostent_r routine + * is available to gethostent re-entrantly. + */ +/* GETHOSTENT_R_PROTO: + * This symbol encodes the prototype of gethostent_r. + * It is zero if d_gethostent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_gethostent_r + * is defined. + */ +/*#define HAS_GETHOSTENT_R / **/ +#define GETHOSTENT_R_PROTO 0 /**/ + +/* HAS_GETHOST_PROTOS: + * This symbol, if defined, indicates that <netdb.h> includes + * prototypes for gethostent(), gethostbyname(), and + * gethostbyaddr(). Otherwise, it is up to the program to guess + * them. See netdbtype.U for probing for various Netdb_xxx_t types. + */ +#define HAS_GETHOST_PROTOS /**/ + +/* HAS_GETLOGIN_R: + * This symbol, if defined, indicates that the getlogin_r routine + * is available to getlogin re-entrantly. + */ +/* GETLOGIN_R_PROTO: + * This symbol encodes the prototype of getlogin_r. + * It is zero if d_getlogin_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getlogin_r + * is defined. + */ +/*#define HAS_GETLOGIN_R / **/ +#define GETLOGIN_R_PROTO 0 /**/ + +/* HAS_GETNETBYADDR: + * This symbol, if defined, indicates that the getnetbyaddr() routine is + * available to look up networks by their IP addresses. + */ +#define HAS_GETNETBYADDR /**/ + +/* HAS_GETNETBYNAME: + * This symbol, if defined, indicates that the getnetbyname() routine is + * available to look up networks by their names. + */ +#define HAS_GETNETBYNAME /**/ + +/* HAS_GETNETENT: + * This symbol, if defined, indicates that the getnetent() routine is + * available to look up network names in some data base or another. + */ +#define HAS_GETNETENT /**/ + +/* HAS_GETNETBYADDR_R: + * This symbol, if defined, indicates that the getnetbyaddr_r routine + * is available to getnetbyaddr re-entrantly. + */ +/* GETNETBYADDR_R_PROTO: + * This symbol encodes the prototype of getnetbyaddr_r. + * It is zero if d_getnetbyaddr_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyaddr_r + * is defined. + */ +/*#define HAS_GETNETBYADDR_R / **/ +#define GETNETBYADDR_R_PROTO 0 /**/ + +/* HAS_GETNETBYNAME_R: + * This symbol, if defined, indicates that the getnetbyname_r routine + * is available to getnetbyname re-entrantly. + */ +/* GETNETBYNAME_R_PROTO: + * This symbol encodes the prototype of getnetbyname_r. + * It is zero if d_getnetbyname_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetbyname_r + * is defined. + */ +/*#define HAS_GETNETBYNAME_R / **/ +#define GETNETBYNAME_R_PROTO 0 /**/ + +/* HAS_GETNETENT_R: + * This symbol, if defined, indicates that the getnetent_r routine + * is available to getnetent re-entrantly. + */ +/* GETNETENT_R_PROTO: + * This symbol encodes the prototype of getnetent_r. + * It is zero if d_getnetent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getnetent_r + * is defined. + */ +/*#define HAS_GETNETENT_R / **/ +#define GETNETENT_R_PROTO 0 /**/ + +/* HAS_GETNET_PROTOS: + * This symbol, if defined, indicates that <netdb.h> includes + * prototypes for getnetent(), getnetbyname(), and + * getnetbyaddr(). Otherwise, it is up to the program to guess + * them. See netdbtype.U for probing for various Netdb_xxx_t types. + */ +#define HAS_GETNET_PROTOS /**/ + +/* HAS_GETPROTOENT: + * This symbol, if defined, indicates that the getprotoent() routine is + * available to look up protocols in some data base or another. + */ +#define HAS_GETPROTOENT /**/ + +/* HAS_GETPGRP: + * This symbol, if defined, indicates that the getpgrp routine is + * available to get the current process group. + */ +/* USE_BSD_GETPGRP: + * This symbol, if defined, indicates that getpgrp needs one + * arguments whereas USG one needs none. + */ +#define HAS_GETPGRP /**/ +/*#define USE_BSD_GETPGRP / **/ + +/* HAS_GETPROTOBYNAME: + * This symbol, if defined, indicates that the getprotobyname() + * routine is available to look up protocols by their name. + */ +/* HAS_GETPROTOBYNUMBER: + * This symbol, if defined, indicates that the getprotobynumber() + * routine is available to look up protocols by their number. + */ +#define HAS_GETPROTOBYNAME /**/ +#define HAS_GETPROTOBYNUMBER /**/ + +/* HAS_GETPROTOBYNAME_R: + * This symbol, if defined, indicates that the getprotobyname_r routine + * is available to getprotobyname re-entrantly. + */ +/* GETPROTOBYNAME_R_PROTO: + * This symbol encodes the prototype of getprotobyname_r. + * It is zero if d_getprotobyname_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobyname_r + * is defined. + */ +/*#define HAS_GETPROTOBYNAME_R / **/ +#define GETPROTOBYNAME_R_PROTO 0 /**/ + +/* HAS_GETPROTOBYNUMBER_R: + * This symbol, if defined, indicates that the getprotobynumber_r routine + * is available to getprotobynumber re-entrantly. + */ +/* GETPROTOBYNUMBER_R_PROTO: + * This symbol encodes the prototype of getprotobynumber_r. + * It is zero if d_getprotobynumber_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotobynumber_r + * is defined. + */ +/*#define HAS_GETPROTOBYNUMBER_R / **/ +#define GETPROTOBYNUMBER_R_PROTO 0 /**/ + +/* HAS_GETPROTOENT_R: + * This symbol, if defined, indicates that the getprotoent_r routine + * is available to getprotoent re-entrantly. + */ +/* GETPROTOENT_R_PROTO: + * This symbol encodes the prototype of getprotoent_r. + * It is zero if d_getprotoent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getprotoent_r + * is defined. + */ +/*#define HAS_GETPROTOENT_R / **/ +#define GETPROTOENT_R_PROTO 0 /**/ + +/* HAS_GETPROTO_PROTOS: + * This symbol, if defined, indicates that <netdb.h> includes + * prototypes for getprotoent(), getprotobyname(), and + * getprotobyaddr(). Otherwise, it is up to the program to guess + * them. See netdbtype.U for probing for various Netdb_xxx_t types. + */ +#define HAS_GETPROTO_PROTOS /**/ + +/* HAS_GETPWENT: + * This symbol, if defined, indicates that the getpwent routine is + * available for sequential access of the passwd database. + * If this is not available, the older getpw() function may be available. + */ +#define HAS_GETPWENT /**/ + +/* HAS_GETPWENT_R: + * This symbol, if defined, indicates that the getpwent_r routine + * is available to getpwent re-entrantly. + */ +/* GETPWENT_R_PROTO: + * This symbol encodes the prototype of getpwent_r. + * It is zero if d_getpwent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwent_r + * is defined. + */ +/*#define HAS_GETPWENT_R / **/ +#define GETPWENT_R_PROTO 0 /**/ + +/* HAS_GETPWNAM_R: + * This symbol, if defined, indicates that the getpwnam_r routine + * is available to getpwnam re-entrantly. + */ +/* GETPWNAM_R_PROTO: + * This symbol encodes the prototype of getpwnam_r. + * It is zero if d_getpwnam_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwnam_r + * is defined. + */ +/*#define HAS_GETPWNAM_R / **/ +#define GETPWNAM_R_PROTO 0 /**/ + +/* HAS_GETPWUID_R: + * This symbol, if defined, indicates that the getpwuid_r routine + * is available to getpwuid re-entrantly. + */ +/* GETPWUID_R_PROTO: + * This symbol encodes the prototype of getpwuid_r. + * It is zero if d_getpwuid_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getpwuid_r + * is defined. + */ +/*#define HAS_GETPWUID_R / **/ +#define GETPWUID_R_PROTO 0 /**/ + +/* HAS_GETSERVENT: + * This symbol, if defined, indicates that the getservent() routine is + * available to look up network services in some data base or another. + */ +#define HAS_GETSERVENT /**/ + +/* HAS_GETSERVBYNAME_R: + * This symbol, if defined, indicates that the getservbyname_r routine + * is available to getservbyname re-entrantly. + */ +/* GETSERVBYNAME_R_PROTO: + * This symbol encodes the prototype of getservbyname_r. + * It is zero if d_getservbyname_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyname_r + * is defined. + */ +/*#define HAS_GETSERVBYNAME_R / **/ +#define GETSERVBYNAME_R_PROTO 0 /**/ + +/* HAS_GETSERVBYPORT_R: + * This symbol, if defined, indicates that the getservbyport_r routine + * is available to getservbyport re-entrantly. + */ +/* GETSERVBYPORT_R_PROTO: + * This symbol encodes the prototype of getservbyport_r. + * It is zero if d_getservbyport_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservbyport_r + * is defined. + */ +/*#define HAS_GETSERVBYPORT_R / **/ +#define GETSERVBYPORT_R_PROTO 0 /**/ + +/* HAS_GETSERVENT_R: + * This symbol, if defined, indicates that the getservent_r routine + * is available to getservent re-entrantly. + */ +/* GETSERVENT_R_PROTO: + * This symbol encodes the prototype of getservent_r. + * It is zero if d_getservent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getservent_r + * is defined. + */ +/*#define HAS_GETSERVENT_R / **/ +#define GETSERVENT_R_PROTO 0 /**/ + +/* HAS_GETSERV_PROTOS: + * This symbol, if defined, indicates that <netdb.h> includes + * prototypes for getservent(), getservbyname(), and + * getservbyaddr(). Otherwise, it is up to the program to guess + * them. See netdbtype.U for probing for various Netdb_xxx_t types. + */ +#define HAS_GETSERV_PROTOS /**/ + +/* HAS_GETSPNAM_R: + * This symbol, if defined, indicates that the getspnam_r routine + * is available to getspnam re-entrantly. + */ +/* GETSPNAM_R_PROTO: + * This symbol encodes the prototype of getspnam_r. + * It is zero if d_getspnam_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_getspnam_r + * is defined. + */ +/*#define HAS_GETSPNAM_R / **/ +#define GETSPNAM_R_PROTO 0 /**/ + +/* HAS_GETSERVBYNAME: + * This symbol, if defined, indicates that the getservbyname() + * routine is available to look up services by their name. + */ +/* HAS_GETSERVBYPORT: + * This symbol, if defined, indicates that the getservbyport() + * routine is available to look up services by their port. + */ +#define HAS_GETSERVBYNAME /**/ +#define HAS_GETSERVBYPORT /**/ + +/* HAS_GMTIME_R: + * This symbol, if defined, indicates that the gmtime_r routine + * is available to gmtime re-entrantly. + */ +/* GMTIME_R_PROTO: + * This symbol encodes the prototype of gmtime_r. + * It is zero if d_gmtime_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_gmtime_r + * is defined. + */ +/*#define HAS_GMTIME_R / **/ +#define GMTIME_R_PROTO 0 /**/ + +/* HAS_HTONL: + * This symbol, if defined, indicates that the htonl() routine (and + * friends htons() ntohl() ntohs()) are available to do network + * order byte swapping. + */ +/* HAS_HTONS: + * This symbol, if defined, indicates that the htons() routine (and + * friends htonl() ntohl() ntohs()) are available to do network + * order byte swapping. + */ +/* HAS_NTOHL: + * This symbol, if defined, indicates that the ntohl() routine (and + * friends htonl() htons() ntohs()) are available to do network + * order byte swapping. + */ +/* HAS_NTOHS: + * This symbol, if defined, indicates that the ntohs() routine (and + * friends htonl() htons() ntohl()) are available to do network + * order byte swapping. + */ +#define HAS_HTONL /**/ +#define HAS_HTONS /**/ +#define HAS_NTOHL /**/ +#define HAS_NTOHS /**/ + +/* HAS_LOCALTIME_R: + * This symbol, if defined, indicates that the localtime_r routine + * is available to localtime re-entrantly. + */ +/* LOCALTIME_R_NEEDS_TZSET: + * Many libc's localtime_r implementations do not call tzset, + * making them differ from localtime(), and making timezone + * changes using $ENV{TZ} without explicitly calling tzset + * impossible. This symbol makes us call tzset before localtime_r + */ +/*#define LOCALTIME_R_NEEDS_TZSET / **/ +#ifdef LOCALTIME_R_NEEDS_TZSET +#define L_R_TZSET tzset(), +#else +#define L_R_TZSET +#endif + +/* LOCALTIME_R_PROTO: + * This symbol encodes the prototype of localtime_r. + * It is zero if d_localtime_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_localtime_r + * is defined. + */ +/*#define HAS_LOCALTIME_R / **/ +#define LOCALTIME_R_PROTO 0 /**/ + +/* HAS_LONG_DOUBLE: + * This symbol will be defined if the C compiler supports long + * doubles. + */ +/* LONG_DOUBLESIZE: + * This symbol contains the size of a long double, so that the + * C preprocessor can make decisions based on it. It is only + * defined if the system supports long doubles. + */ +#define HAS_LONG_DOUBLE /**/ +#ifdef HAS_LONG_DOUBLE +#define LONG_DOUBLESIZE 16 /**/ +#endif + +/* HAS_LONG_LONG: + * This symbol will be defined if the C compiler supports long long. + */ +/* LONGLONGSIZE: + * This symbol contains the size of a long long, so that the + * C preprocessor can make decisions based on it. It is only + * defined if the system supports long long. + */ +#define HAS_LONG_LONG /**/ +#ifdef HAS_LONG_LONG +#define LONGLONGSIZE 8 /**/ +#endif + +/* HAS_LSEEK_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the lseek() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern off_t lseek(int, off_t, int); + */ +#define HAS_LSEEK_PROTO /**/ + +/* HAS_MEMCHR: + * This symbol, if defined, indicates that the memchr routine is available + * to locate characters within a C string. + */ +#define HAS_MEMCHR /**/ + +/* HAS_MKSTEMP: + * This symbol, if defined, indicates that the mkstemp routine is + * available to exclusively create and open a uniquely named + * temporary file. + */ +#define HAS_MKSTEMP /**/ + +/* HAS_MMAP: + * This symbol, if defined, indicates that the mmap system call is + * available to map a file into memory. + */ +/* Mmap_t: + * This symbol holds the return type of the mmap() system call + * (and simultaneously the type of the first argument). + * Usually set to 'void *' or 'caddr_t'. + */ +#define HAS_MMAP /**/ +#define Mmap_t void * /**/ + +/* HAS_MSG: + * This symbol, if defined, indicates that the entire msg*(2) library is + * supported (IPC mechanism based on message queues). + */ +#define HAS_MSG /**/ + +/* HAS_POLL: + * This symbol, if defined, indicates that the poll routine is + * available to poll active file descriptors. You may safely + * include <poll.h> when both this symbol *and* I_POLL are defined. + */ +#define HAS_POLL /**/ + +/* OLD_PTHREAD_CREATE_JOINABLE: + * This symbol, if defined, indicates how to create pthread + * in joinable (aka undetached) state. NOTE: not defined + * if pthread.h already has defined PTHREAD_CREATE_JOINABLE + * (the new version of the constant). + * If defined, known values are PTHREAD_CREATE_UNDETACHED + * and __UNDETACHED. + */ +/*#define OLD_PTHREAD_CREATE_JOINABLE / **/ + +/* HAS_PTHREAD_ATFORK: + * This symbol, if defined, indicates that the pthread_atfork routine + * is available to setup fork handlers. + */ +/*#define HAS_PTHREAD_ATFORK / **/ + +/* HAS_PTHREAD_YIELD: + * This symbol, if defined, indicates that the pthread_yield + * routine is available to yield the execution of the current + * thread. sched_yield is preferable to pthread_yield. + */ +/* SCHED_YIELD: + * This symbol defines the way to yield the execution of + * the current thread. Known ways are sched_yield, + * pthread_yield, and pthread_yield with NULL. + */ +/* HAS_SCHED_YIELD: + * This symbol, if defined, indicates that the sched_yield + * routine is available to yield the execution of the current + * thread. sched_yield is preferable to pthread_yield. + */ +/*#define HAS_PTHREAD_YIELD / **/ +#define SCHED_YIELD sched_yield() /**/ +#define HAS_SCHED_YIELD /**/ + +/* HAS_RANDOM_R: + * This symbol, if defined, indicates that the random_r routine + * is available to random re-entrantly. + */ +/* RANDOM_R_PROTO: + * This symbol encodes the prototype of random_r. + * It is zero if d_random_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_random_r + * is defined. + */ +/*#define HAS_RANDOM_R / **/ +#define RANDOM_R_PROTO 0 /**/ + +/* HAS_READDIR64_R: + * This symbol, if defined, indicates that the readdir64_r routine + * is available to readdir64 re-entrantly. + */ +/* READDIR64_R_PROTO: + * This symbol encodes the prototype of readdir64_r. + * It is zero if d_readdir64_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir64_r + * is defined. + */ +/*#define HAS_READDIR64_R / **/ +#define READDIR64_R_PROTO 0 /**/ + +/* HAS_READDIR_R: + * This symbol, if defined, indicates that the readdir_r routine + * is available to readdir re-entrantly. + */ +/* READDIR_R_PROTO: + * This symbol encodes the prototype of readdir_r. + * It is zero if d_readdir_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_readdir_r + * is defined. + */ +/*#define HAS_READDIR_R / **/ +#define READDIR_R_PROTO 0 /**/ + +/* HAS_SEM: + * This symbol, if defined, indicates that the entire sem*(2) library is + * supported. + */ +#define HAS_SEM /**/ + +/* HAS_SETGRENT: + * This symbol, if defined, indicates that the setgrent routine is + * available for initializing sequential access of the group database. + */ +#define HAS_SETGRENT /**/ + +/* HAS_SETGRENT_R: + * This symbol, if defined, indicates that the setgrent_r routine + * is available to setgrent re-entrantly. + */ +/* SETGRENT_R_PROTO: + * This symbol encodes the prototype of setgrent_r. + * It is zero if d_setgrent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setgrent_r + * is defined. + */ +/*#define HAS_SETGRENT_R / **/ +#define SETGRENT_R_PROTO 0 /**/ + +/* HAS_SETGROUPS: + * This symbol, if defined, indicates that the setgroups() routine is + * available to set the list of process groups. If unavailable, multiple + * groups are probably not supported. + */ +#define HAS_SETGROUPS /**/ + +/* HAS_SETHOSTENT: + * This symbol, if defined, indicates that the sethostent() routine is + * available. + */ +#define HAS_SETHOSTENT /**/ + +/* HAS_SETHOSTENT_R: + * This symbol, if defined, indicates that the sethostent_r routine + * is available to sethostent re-entrantly. + */ +/* SETHOSTENT_R_PROTO: + * This symbol encodes the prototype of sethostent_r. + * It is zero if d_sethostent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_sethostent_r + * is defined. + */ +/*#define HAS_SETHOSTENT_R / **/ +#define SETHOSTENT_R_PROTO 0 /**/ + +/* HAS_SETLOCALE_R: + * This symbol, if defined, indicates that the setlocale_r routine + * is available to setlocale re-entrantly. + */ +/* SETLOCALE_R_PROTO: + * This symbol encodes the prototype of setlocale_r. + * It is zero if d_setlocale_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setlocale_r + * is defined. + */ +/*#define HAS_SETLOCALE_R / **/ +#define SETLOCALE_R_PROTO 0 /**/ + +/* HAS_SETNETENT: + * This symbol, if defined, indicates that the setnetent() routine is + * available. + */ +#define HAS_SETNETENT /**/ + +/* HAS_SETNETENT_R: + * This symbol, if defined, indicates that the setnetent_r routine + * is available to setnetent re-entrantly. + */ +/* SETNETENT_R_PROTO: + * This symbol encodes the prototype of setnetent_r. + * It is zero if d_setnetent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setnetent_r + * is defined. + */ +/*#define HAS_SETNETENT_R / **/ +#define SETNETENT_R_PROTO 0 /**/ + +/* HAS_SETPROTOENT: + * This symbol, if defined, indicates that the setprotoent() routine is + * available. + */ +#define HAS_SETPROTOENT /**/ + +/* HAS_SETPGRP: + * This symbol, if defined, indicates that the setpgrp routine is + * available to set the current process group. + */ +/* USE_BSD_SETPGRP: + * This symbol, if defined, indicates that setpgrp needs two + * arguments whereas USG one needs none. See also HAS_SETPGID + * for a POSIX interface. + */ +#define HAS_SETPGRP /**/ +/*#define USE_BSD_SETPGRP / **/ + +/* HAS_SETPROTOENT_R: + * This symbol, if defined, indicates that the setprotoent_r routine + * is available to setprotoent re-entrantly. + */ +/* SETPROTOENT_R_PROTO: + * This symbol encodes the prototype of setprotoent_r. + * It is zero if d_setprotoent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setprotoent_r + * is defined. + */ +/*#define HAS_SETPROTOENT_R / **/ +#define SETPROTOENT_R_PROTO 0 /**/ + +/* HAS_SETPWENT: + * This symbol, if defined, indicates that the setpwent routine is + * available for initializing sequential access of the passwd database. + */ +#define HAS_SETPWENT /**/ + +/* HAS_SETPWENT_R: + * This symbol, if defined, indicates that the setpwent_r routine + * is available to setpwent re-entrantly. + */ +/* SETPWENT_R_PROTO: + * This symbol encodes the prototype of setpwent_r. + * It is zero if d_setpwent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setpwent_r + * is defined. + */ +/*#define HAS_SETPWENT_R / **/ +#define SETPWENT_R_PROTO 0 /**/ + +/* HAS_SETSERVENT: + * This symbol, if defined, indicates that the setservent() routine is + * available. + */ +#define HAS_SETSERVENT /**/ + +/* HAS_SETSERVENT_R: + * This symbol, if defined, indicates that the setservent_r routine + * is available to setservent re-entrantly. + */ +/* SETSERVENT_R_PROTO: + * This symbol encodes the prototype of setservent_r. + * It is zero if d_setservent_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_setservent_r + * is defined. + */ +/*#define HAS_SETSERVENT_R / **/ +#define SETSERVENT_R_PROTO 0 /**/ + +/* HAS_SETVBUF: + * This symbol, if defined, indicates that the setvbuf routine is + * available to change buffering on an open stdio stream. + * to a line-buffered mode. + */ +#define HAS_SETVBUF /**/ + +/* HAS_SHM: + * This symbol, if defined, indicates that the entire shm*(2) library is + * supported. + */ +#define HAS_SHM /**/ + +/* Shmat_t: + * This symbol holds the return type of the shmat() system call. + * Usually set to 'void *' or 'char *'. + */ +/* HAS_SHMAT_PROTOTYPE: + * This symbol, if defined, indicates that the sys/shm.h includes + * a prototype for shmat(). Otherwise, it is up to the program to + * guess one. Shmat_t shmat(int, Shmat_t, int) is a good guess, + * but not always right so it should be emitted by the program only + * when HAS_SHMAT_PROTOTYPE is not defined to avoid conflicting defs. + */ +#define Shmat_t void * /**/ +#define HAS_SHMAT_PROTOTYPE /**/ + +/* HAS_SOCKET: + * This symbol, if defined, indicates that the BSD socket interface is + * supported. + */ +/* HAS_SOCKETPAIR: + * This symbol, if defined, indicates that the BSD socketpair() call is + * supported. + */ +/* HAS_MSG_CTRUNC: + * This symbol, if defined, indicates that the MSG_CTRUNC is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +/* HAS_MSG_DONTROUTE: + * This symbol, if defined, indicates that the MSG_DONTROUTE is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +/* HAS_MSG_OOB: + * This symbol, if defined, indicates that the MSG_OOB is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +/* HAS_MSG_PEEK: + * This symbol, if defined, indicates that the MSG_PEEK is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +/* HAS_MSG_PROXY: + * This symbol, if defined, indicates that the MSG_PROXY is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +/* HAS_SCM_RIGHTS: + * This symbol, if defined, indicates that the SCM_RIGHTS is supported. + * Checking just with #ifdef might not be enough because this symbol + * has been known to be an enum. + */ +#define HAS_SOCKET /**/ +#define HAS_SOCKETPAIR /**/ +#define HAS_MSG_CTRUNC /**/ +#define HAS_MSG_DONTROUTE /**/ +#define HAS_MSG_OOB /**/ +#define HAS_MSG_PEEK /**/ +#define HAS_MSG_PROXY /**/ +#define HAS_SCM_RIGHTS /**/ + +/* HAS_SRAND48_R: + * This symbol, if defined, indicates that the srand48_r routine + * is available to srand48 re-entrantly. + */ +/* SRAND48_R_PROTO: + * This symbol encodes the prototype of srand48_r. + * It is zero if d_srand48_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_srand48_r + * is defined. + */ +/*#define HAS_SRAND48_R / **/ +#define SRAND48_R_PROTO 0 /**/ + +/* HAS_SRANDOM_R: + * This symbol, if defined, indicates that the srandom_r routine + * is available to srandom re-entrantly. + */ +/* SRANDOM_R_PROTO: + * This symbol encodes the prototype of srandom_r. + * It is zero if d_srandom_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_srandom_r + * is defined. + */ +/*#define HAS_SRANDOM_R / **/ +#define SRANDOM_R_PROTO 0 /**/ + +/* USE_STAT_BLOCKS: + * This symbol is defined if this system has a stat structure declaring + * st_blksize and st_blocks. + */ +#ifndef USE_STAT_BLOCKS +#define USE_STAT_BLOCKS /**/ +#endif + +/* USE_STRUCT_COPY: + * This symbol, if defined, indicates that this C compiler knows how + * to copy structures. If undefined, you'll need to use a block copy + * routine of some sort instead. + */ +#define USE_STRUCT_COPY /**/ + +/* HAS_STRERROR: + * This symbol, if defined, indicates that the strerror routine is + * available to translate error numbers to strings. See the writeup + * of Strerror() in this file before you try to define your own. + */ +/* HAS_SYS_ERRLIST: + * This symbol, if defined, indicates that the sys_errlist array is + * available to translate error numbers to strings. The extern int + * sys_nerr gives the size of that table. + */ +/* Strerror: + * This preprocessor symbol is defined as a macro if strerror() is + * not available to translate error numbers to strings but sys_errlist[] + * array is there. + */ +#define HAS_STRERROR /**/ +/*#define HAS_SYS_ERRLIST / **/ +#define Strerror(e) strerror(e) + +/* HAS_STRERROR_R: + * This symbol, if defined, indicates that the strerror_r routine + * is available to strerror re-entrantly. + */ +/* STRERROR_R_PROTO: + * This symbol encodes the prototype of strerror_r. + * It is zero if d_strerror_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_strerror_r + * is defined. + */ +/*#define HAS_STRERROR_R / **/ +#define STRERROR_R_PROTO 0 /**/ + +/* HAS_STRTOUL: + * This symbol, if defined, indicates that the strtoul routine is + * available to provide conversion of strings to unsigned long. + */ +#define HAS_STRTOUL /**/ + +/* HAS_TIME: + * This symbol, if defined, indicates that the time() routine exists. + */ +/* Time_t: + * This symbol holds the type returned by time(). It can be long, + * or time_t on BSD sites (in which case <sys/types.h> should be + * included). + */ +#define HAS_TIME /**/ +#define Time_t time_t /* Time type */ + +/* HAS_TIMES: + * This symbol, if defined, indicates that the times() routine exists. + * Note that this became obsolete on some systems (SUNOS), which now + * use getrusage(). It may be necessary to include <sys/times.h>. + */ +#define HAS_TIMES /**/ + +/* HAS_TMPNAM_R: + * This symbol, if defined, indicates that the tmpnam_r routine + * is available to tmpnam re-entrantly. + */ +/* TMPNAM_R_PROTO: + * This symbol encodes the prototype of tmpnam_r. + * It is zero if d_tmpnam_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_tmpnam_r + * is defined. + */ +/*#define HAS_TMPNAM_R / **/ +#define TMPNAM_R_PROTO 0 /**/ + +/* HAS_TTYNAME_R: + * This symbol, if defined, indicates that the ttyname_r routine + * is available to ttyname re-entrantly. + */ +/* TTYNAME_R_PROTO: + * This symbol encodes the prototype of ttyname_r. + * It is zero if d_ttyname_r is undef, and one of the + * REENTRANT_PROTO_T_ABC macros of reentr.h if d_ttyname_r + * is defined. + */ +/*#define HAS_TTYNAME_R / **/ +#define TTYNAME_R_PROTO 0 /**/ + +/* HAS_UNION_SEMUN: + * This symbol, if defined, indicates that the union semun is + * defined by including <sys/sem.h>. If not, the user code + * probably needs to define it as: + * union semun { + * int val; + * struct semid_ds *buf; + * unsigned short *array; + * } + */ +/* USE_SEMCTL_SEMUN: + * This symbol, if defined, indicates that union semun is + * used for semctl IPC_STAT. + */ +/* USE_SEMCTL_SEMID_DS: + * This symbol, if defined, indicates that struct semid_ds * is + * used for semctl IPC_STAT. + */ +/*#define HAS_UNION_SEMUN / **/ +#define USE_SEMCTL_SEMUN /**/ +#define USE_SEMCTL_SEMID_DS /**/ + +/* HAS_VFORK: + * This symbol, if defined, indicates that vfork() exists. + */ +/*#define HAS_VFORK / **/ + +/* HAS_PSEUDOFORK: + * This symbol, if defined, indicates that an emulation of the + * fork routine is available. + */ +/*#define HAS_PSEUDOFORK / **/ + +/* Signal_t: + * This symbol's value is either "void" or "int", corresponding to the + * appropriate return type of a signal handler. Thus, you can declare + * a signal handler using "Signal_t (*handler)()", and define the + * handler using "Signal_t handler(sig)". + */ +#define Signal_t void /* Signal handler's return type */ + +/* HASVOLATILE: + * This symbol, if defined, indicates that this C compiler knows about + * the volatile declaration. + */ +#define HASVOLATILE /**/ +#ifndef HASVOLATILE +#define volatile +#endif + +/* Fpos_t: + * This symbol holds the type used to declare file positions in libc. + * It can be fpos_t, long, uint, etc... It may be necessary to include + * <sys/types.h> to get any typedef'ed information. + */ +#define Fpos_t fpos_t /* File position type */ + +/* Gid_t_f: + * This symbol defines the format string used for printing a Gid_t. + */ +#define Gid_t_f "u" /**/ + +/* Gid_t_sign: + * This symbol holds the signedess of a Gid_t. + * 1 for unsigned, -1 for signed. + */ +#define Gid_t_sign 1 /* GID sign */ + +/* Gid_t_size: + * This symbol holds the size of a Gid_t in bytes. + */ +#define Gid_t_size 4 /* GID size */ + +/* Gid_t: + * This symbol holds the return type of getgid() and the type of + * argument to setrgid() and related functions. Typically, + * it is the type of group ids in the kernel. It can be int, ushort, + * gid_t, etc... It may be necessary to include <sys/types.h> to get + * any typedef'ed information. + */ +#define Gid_t gid_t /* Type for getgid(), etc... */ + +/* Groups_t: + * This symbol holds the type used for the second argument to + * getgroups() and setgroups(). Usually, this is the same as + * gidtype (gid_t) , but sometimes it isn't. + * It can be int, ushort, gid_t, etc... + * It may be necessary to include <sys/types.h> to get any + * typedef'ed information. This is only required if you have + * getgroups() or setgroups().. + */ +#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS) +#define Groups_t gid_t /* Type for 2nd arg to [sg]etgroups() */ +#endif + +/* I_DIRENT: + * This symbol, if defined, indicates to the C program that it should + * include <dirent.h>. Using this symbol also triggers the definition + * of the Direntry_t define which ends up being 'struct dirent' or + * 'struct direct' depending on the availability of <dirent.h>. + */ +/* DIRNAMLEN: + * This symbol, if defined, indicates to the C program that the length + * of directory entry names is provided by a d_namlen field. Otherwise + * you need to do strlen() on the d_name field. + */ +/* Direntry_t: + * This symbol is set to 'struct direct' or 'struct dirent' depending on + * whether dirent is available or not. You should use this pseudo type to + * portably declare your directory entries. + */ +#define I_DIRENT /**/ +/*#define DIRNAMLEN / **/ +#define Direntry_t struct dirent + +/* I_GRP: + * This symbol, if defined, indicates to the C program that it should + * include <grp.h>. + */ +/* GRPASSWD: + * This symbol, if defined, indicates to the C program that struct group + * in <grp.h> contains gr_passwd. + */ +#define I_GRP /**/ +#define GRPASSWD /**/ + +/* I_MACH_CTHREADS: + * This symbol, if defined, indicates to the C program that it should + * include <mach/cthreads.h>. + */ +/*#define I_MACH_CTHREADS / **/ + +/* I_NDBM: + * This symbol, if defined, indicates that <ndbm.h> exists and should + * be included. + */ +/*#define I_NDBM / **/ + +/* I_NETDB: + * This symbol, if defined, indicates that <netdb.h> exists and + * should be included. + */ +#define I_NETDB /**/ + +/* I_PTHREAD: + * This symbol, if defined, indicates to the C program that it should + * include <pthread.h>. + */ +#define I_PTHREAD /**/ + +/* I_PWD: + * This symbol, if defined, indicates to the C program that it should + * include <pwd.h>. + */ +/* PWQUOTA: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_quota. + */ +/* PWAGE: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_age. + */ +/* PWCHANGE: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_change. + */ +/* PWCLASS: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_class. + */ +/* PWEXPIRE: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_expire. + */ +/* PWCOMMENT: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_comment. + */ +/* PWGECOS: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_gecos. + */ +/* PWPASSWD: + * This symbol, if defined, indicates to the C program that struct passwd + * contains pw_passwd. + */ +#define I_PWD /**/ +/*#define PWQUOTA / **/ +/*#define PWAGE / **/ +/*#define PWCHANGE / **/ +/*#define PWCLASS / **/ +/*#define PWEXPIRE / **/ +/*#define PWCOMMENT / **/ +#define PWGECOS /**/ +#define PWPASSWD /**/ + +/* I_SYS_ACCESS: + * This symbol, if defined, indicates to the C program that it should + * include <sys/access.h>. + */ +/*#define I_SYS_ACCESS / **/ + +/* I_SYS_SECURITY: + * This symbol, if defined, indicates to the C program that it should + * include <sys/security.h>. + */ +/*#define I_SYS_SECURITY / **/ + +/* I_SYSUIO: + * This symbol, if defined, indicates that <sys/uio.h> exists and + * should be included. + */ +#define I_SYSUIO /**/ + +/* I_STDARG: + * This symbol, if defined, indicates that <stdarg.h> exists and should + * be included. + */ +/* I_VARARGS: + * This symbol, if defined, indicates to the C program that it should + * include <varargs.h>. + */ +#define I_STDARG /**/ +/*#define I_VARARGS / **/ + +/* PERL_INC_VERSION_LIST: + * This variable specifies the list of subdirectories in over + * which perl.c:incpush() and lib/lib.pm will automatically + * search when adding directories to @INC, in a format suitable + * for a C initialization string. See the inc_version_list entry + * in Porting/Glossary for more details. + */ +/*#define PERL_INC_VERSION_LIST 0 / **/ + +/* INSTALL_USR_BIN_PERL: + * This symbol, if defined, indicates that Perl is to be installed + * also as /usr/bin/perl. + */ +/*#define INSTALL_USR_BIN_PERL / **/ + +/* Off_t: + * This symbol holds the type used to declare offsets in the kernel. + * It can be int, long, off_t, etc... It may be necessary to include + * <sys/types.h> to get any typedef'ed information. + */ +/* LSEEKSIZE: + * This symbol holds the number of bytes used by the Off_t. + */ +/* Off_t_size: + * This symbol holds the number of bytes used by the Off_t. + */ +#define Off_t off_t /* <offset> type */ +#define LSEEKSIZE 8 /* <offset> size */ +#define Off_t_size 8 /* <offset> size */ + +/* Free_t: + * This variable contains the return type of free(). It is usually + * void, but occasionally int. + */ +/* Malloc_t: + * This symbol is the type of pointer returned by malloc and realloc. + */ +#define Malloc_t void * /**/ +#define Free_t void /**/ + +/* PERL_MALLOC_WRAP: + * This symbol, if defined, indicates that we'd like malloc wrap checks. + */ +/*#define PERL_MALLOC_WRAP / **/ + +/* MYMALLOC: + * This symbol, if defined, indicates that we're using our own malloc. + */ +/*#define MYMALLOC / **/ + +/* Mode_t: + * This symbol holds the type used to declare file modes + * for systems calls. It is usually mode_t, but may be + * int or unsigned short. It may be necessary to include <sys/types.h> + * to get any typedef'ed information. + */ +#define Mode_t mode_t /* file mode parameter for system calls */ + +/* Netdb_host_t: + * This symbol holds the type used for the 1st argument + * to gethostbyaddr(). + */ +/* Netdb_hlen_t: + * This symbol holds the type used for the 2nd argument + * to gethostbyaddr(). + */ +/* Netdb_name_t: + * This symbol holds the type used for the argument to + * gethostbyname(). + */ +/* Netdb_net_t: + * This symbol holds the type used for the 1st argument to + * getnetbyaddr(). + */ +#define Netdb_host_t char * /**/ +#define Netdb_hlen_t size_t /**/ +#define Netdb_name_t const char * /**/ +#define Netdb_net_t in_addr_t /**/ + +/* PERL_OTHERLIBDIRS: + * This variable contains a colon-separated set of paths for the perl + * binary to search for additional library files or modules. + * These directories will be tacked to the end of @INC. + * Perl will automatically search below each path for version- + * and architecture-specific directories. See PERL_INC_VERSION_LIST + * for more details. + */ +/*#define PERL_OTHERLIBDIRS " " / **/ + +/* Pid_t: + * This symbol holds the type used to declare process ids in the kernel. + * It can be int, uint, pid_t, etc... It may be necessary to include + * <sys/types.h> to get any typedef'ed information. + */ +#define Pid_t pid_t /* PID type */ + +/* PRIVLIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + */ +/* PRIVLIB_EXP: + * This symbol contains the ~name expanded version of PRIVLIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define PRIVLIB "/usr/lib/perl5/5.10.0" /**/ +#define PRIVLIB_EXP "/usr/lib/perl5/5.10.0" /**/ + +/* CAN_PROTOTYPE: + * If defined, this macro indicates that the C compiler can handle + * function prototypes. + */ +/* _: + * This macro is used to declare function parameters for folks who want + * to make declarations with prototypes using a different style than + * the above macros. Use double parentheses. For example: + * + * int main _((int argc, char *argv[])); + */ +#define CAN_PROTOTYPE /**/ +#ifdef CAN_PROTOTYPE +#define _(args) args +#else +#define _(args) () +#endif + +/* Select_fd_set_t: + * This symbol holds the type used for the 2nd, 3rd, and 4th + * arguments to select. Usually, this is 'fd_set *', if HAS_FD_SET + * is defined, and 'int *' otherwise. This is only useful if you + * have select(), of course. + */ +#define Select_fd_set_t fd_set * /**/ + +/* SH_PATH: + * This symbol contains the full pathname to the shell used on this + * on this system to execute Bourne shell scripts. Usually, this will be + * /bin/sh, though it's possible that some systems will have /bin/ksh, + * /bin/pdksh, /bin/ash, /bin/bash, or even something such as + * D:/bin/sh.exe. + */ +#define SH_PATH "/bin/sh" /**/ + +/* SIG_NAME: + * This symbol contains a list of signal names in order of + * signal number. This is intended + * to be used as a static array initialization, like this: + * char *sig_name[] = { SIG_NAME }; + * The signals in the list are separated with commas, and each signal + * is surrounded by double quotes. There is no leading SIG in the signal + * name, i.e. SIGQUIT is known as "QUIT". + * Gaps in the signal numbers (up to NSIG) are filled in with NUMnn, + * etc., where nn is the actual signal number (e.g. NUM37). + * The signal number for sig_name[i] is stored in sig_num[i]. + * The last element is 0 to terminate the list with a NULL. This + * corresponds to the 0 at the end of the sig_name_init list. + * Note that this variable is initialized from the sig_name_init, + * not from sig_name (which is unused). + */ +/* SIG_NUM: + * This symbol contains a list of signal numbers, in the same order as the + * SIG_NAME list. It is suitable for static array initialization, as in: + * int sig_num[] = { SIG_NUM }; + * The signals in the list are separated with commas, and the indices + * within that list and the SIG_NAME list match, so it's easy to compute + * the signal name from a number or vice versa at the price of a small + * dynamic linear lookup. + * Duplicates are allowed, but are moved to the end of the list. + * The signal number corresponding to sig_name[i] is sig_number[i]. + * if (i < NSIG) then sig_number[i] == i. + * The last element is 0, corresponding to the 0 at the end of + * the sig_name_init list. + * Note that this variable is initialized from the sig_num_init, + * not from sig_num (which is unused). + */ +/* SIG_SIZE: + * This variable contains the number of elements of the SIG_NAME + * and SIG_NUM arrays, excluding the final NULL entry. + */ +#define SIG_NAME "ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "RTMAX", "CLD", "IOT", "POLL", "UNUSED", 0 /**/ +#define SIG_NUM 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 17, 6, 29, 31, 0 /**/ +#define SIG_SIZE 69 /**/ + +/* SITEARCH: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + * The standard distribution will put nothing in this directory. + * After perl has been installed, users may install their own local + * architecture-dependent modules in this directory with + * MakeMaker Makefile.PL + * or equivalent. See INSTALL for details. + */ +/* SITEARCH_EXP: + * This symbol contains the ~name expanded version of SITEARCH, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +#define SITEARCH "/usr/lib/perl5/site_perl/5.10.0/x86_64-linux" /**/ +#define SITEARCH_EXP "/usr/lib/perl5/site_perl/5.10.0/x86_64-linux" /**/ + +/* SITELIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. The program + * should be prepared to do ~ expansion. + * The standard distribution will put nothing in this directory. + * After perl has been installed, users may install their own local + * architecture-independent modules in this directory with + * MakeMaker Makefile.PL + * or equivalent. See INSTALL for details. + */ +/* SITELIB_EXP: + * This symbol contains the ~name expanded version of SITELIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +/* SITELIB_STEM: + * This define is SITELIB_EXP with any trailing version-specific component + * removed. The elements in inc_version_list (inc_version_list.U) can + * be tacked onto this variable to generate a list of directories to search. + */ +#define SITELIB "/usr/lib/perl5/site_perl/5.10.0" /**/ +#define SITELIB_EXP "/usr/lib/perl5/site_perl/5.10.0" /**/ +#define SITELIB_STEM "/usr/lib/perl5/site_perl" /**/ + +/* Size_t_size: + * This symbol holds the size of a Size_t in bytes. + */ +#define Size_t_size 8 /* */ + +/* Size_t: + * This symbol holds the type used to declare length parameters + * for string functions. It is usually size_t, but may be + * unsigned long, int, etc. It may be necessary to include + * <sys/types.h> to get any typedef'ed information. + */ +#define Size_t size_t /* length paramater for string functions */ + +/* Sock_size_t: + * This symbol holds the type used for the size argument of + * various socket calls (just the base type, not the pointer-to). + */ +#define Sock_size_t socklen_t /**/ + +/* STDCHAR: + * This symbol is defined to be the type of char used in stdio.h. + * It has the values "unsigned char" or "char". + */ +#define STDCHAR char /**/ + +/* Uid_t_f: + * This symbol defines the format string used for printing a Uid_t. + */ +#define Uid_t_f "u" /**/ + +/* Uid_t_sign: + * This symbol holds the signedess of a Uid_t. + * 1 for unsigned, -1 for signed. + */ +#define Uid_t_sign 1 /* UID sign */ + +/* Uid_t_size: + * This symbol holds the size of a Uid_t in bytes. + */ +#define Uid_t_size 4 /* UID size */ + +/* Uid_t: + * This symbol holds the type used to declare user ids in the kernel. + * It can be int, ushort, uid_t, etc... It may be necessary to include + * <sys/types.h> to get any typedef'ed information. + */ +#define Uid_t uid_t /* UID type */ + +/* USE_ITHREADS: + * This symbol, if defined, indicates that Perl should be built to + * use the interpreter-based threading implementation. + */ +/* USE_5005THREADS: + * This symbol, if defined, indicates that Perl should be built to + * use the 5.005-based threading implementation. + * Only valid up to 5.8.x. + */ +/* OLD_PTHREADS_API: + * This symbol, if defined, indicates that Perl should + * be built to use the old draft POSIX threads API. + */ +/* USE_REENTRANT_API: + * This symbol, if defined, indicates that Perl should + * try to use the various _r versions of library functions. + * This is extremely experimental. + */ +/*#define USE_5005THREADS / **/ +/*#define USE_ITHREADS / **/ +#if defined(USE_5005THREADS) && !defined(USE_ITHREADS) +#define USE_THREADS /* until src is revised*/ +#endif +/*#define OLD_PTHREADS_API / **/ +/*#define USE_REENTRANT_API / **/ + +/* PERL_VENDORARCH: + * If defined, this symbol contains the name of a private library. + * The library is private in the sense that it needn't be in anyone's + * execution path, but it should be accessible by the world. + * It may have a ~ on the front. + * The standard distribution will put nothing in this directory. + * Vendors who distribute perl may wish to place their own + * architecture-dependent modules and extensions in this directory with + * MakeMaker Makefile.PL INSTALLDIRS=vendor + * or equivalent. See INSTALL for details. + */ +/* PERL_VENDORARCH_EXP: + * This symbol contains the ~name expanded version of PERL_VENDORARCH, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +/*#define PERL_VENDORARCH "" / **/ +/*#define PERL_VENDORARCH_EXP "" / **/ + +/* PERL_VENDORLIB_EXP: + * This symbol contains the ~name expanded version of VENDORLIB, to be used + * in programs that are not prepared to deal with ~ expansion at run-time. + */ +/* PERL_VENDORLIB_STEM: + * This define is PERL_VENDORLIB_EXP with any trailing version-specific component + * removed. The elements in inc_version_list (inc_version_list.U) can + * be tacked onto this variable to generate a list of directories to search. + */ +/*#define PERL_VENDORLIB_EXP "" / **/ +/*#define PERL_VENDORLIB_STEM "" / **/ + +/* VOIDFLAGS: + * This symbol indicates how much support of the void type is given by this + * compiler. What various bits mean: + * + * 1 = supports declaration of void + * 2 = supports arrays of pointers to functions returning void + * 4 = supports comparisons between pointers to void functions and + * addresses of void functions + * 8 = suports declaration of generic void pointers + * + * The package designer should define VOIDUSED to indicate the requirements + * of the package. This can be done either by #defining VOIDUSED before + * including config.h, or by defining defvoidused in Myinit.U. If the + * latter approach is taken, only those flags will be tested. If the + * level of void support necessary is not present, defines void to int. + */ +#ifndef VOIDUSED +#define VOIDUSED 15 +#endif +#define VOIDFLAGS 15 +#if (VOIDFLAGS & VOIDUSED) != VOIDUSED +#define void int /* is void to be avoided? */ +#define M_VOID /* Xenix strikes again */ +#endif + +/* USE_CROSS_COMPILE: + * This symbol, if defined, indicates that Perl is being cross-compiled. + */ +/* PERL_TARGETARCH: + * This symbol, if defined, indicates the target architecture + * Perl has been cross-compiled to. Undefined if not a cross-compile. + */ +#ifndef USE_CROSS_COMPILE +/*#define USE_CROSS_COMPILE / **/ +#define PERL_TARGETARCH "" /**/ +#endif + +/* MEM_ALIGNBYTES: + * This symbol contains the number of bytes required to align a + * double, or a long double when applicable. Usual values are 2, + * 4 and 8. The default is eight, for safety. + */ +#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH) +# define MEM_ALIGNBYTES 8 +#else +#define MEM_ALIGNBYTES 8 +#endif + +/* BYTEORDER: + * This symbol holds the hexadecimal constant defined in byteorder, + * in a UV, i.e. 0x1234 or 0x4321 or 0x12345678, etc... + * If the compiler supports cross-compiling or multiple-architecture + * binaries (eg. on NeXT systems), use compiler-defined macros to + * determine the byte order. + * On NeXT 3.2 (and greater), you can build "Fat" Multiple Architecture + * Binaries (MAB) on either big endian or little endian machines. + * The endian-ness is available at compile-time. This only matters + * for perl, where the config.h can be generated and installed on + * one system, and used by a different architecture to build an + * extension. Older versions of NeXT that might not have + * defined either *_ENDIAN__ were all on Motorola 680x0 series, + * so the default case (for NeXT) is big endian to catch them. + * This might matter for NeXT 3.0. + */ +#if defined(USE_CROSS_COMPILE) || defined(MULTIARCH) +# ifdef __LITTLE_ENDIAN__ +# if LONGSIZE == 4 +# define BYTEORDER 0x1234 +# else +# if LONGSIZE == 8 +# define BYTEORDER 0x12345678 +# endif +# endif +# else +# ifdef __BIG_ENDIAN__ +# if LONGSIZE == 4 +# define BYTEORDER 0x4321 +# else +# if LONGSIZE == 8 +# define BYTEORDER 0x87654321 +# endif +# endif +# endif +# endif +# if !defined(BYTEORDER) && (defined(NeXT) || defined(__NeXT__)) +# define BYTEORDER 0x4321 +# endif +#else +#define BYTEORDER 0x12345678 /* large digits for MSB */ +#endif /* NeXT */ + +/* CASTI32: + * This symbol is defined if the C compiler can cast negative + * or large floating point numbers to 32-bit ints. + */ +/*#define CASTI32 / **/ + +/* CASTNEGFLOAT: + * This symbol is defined if the C compiler can cast negative + * numbers to unsigned longs, ints and shorts. + */ +/* CASTFLAGS: + * This symbol contains flags that say what difficulties the compiler + * has casting odd floating values to unsigned long: + * 0 = ok + * 1 = couldn't cast < 0 + * 2 = couldn't cast >= 0x80000000 + * 4 = couldn't cast in argument expression list + */ +#define CASTNEGFLOAT /**/ +#define CASTFLAGS 0 /**/ + +/* VOID_CLOSEDIR: + * This symbol, if defined, indicates that the closedir() routine + * does not return a value. + */ +/*#define VOID_CLOSEDIR / **/ + +/* HAS_FD_SET: + * This symbol, when defined, indicates presence of the fd_set typedef + * in <sys/types.h> + */ +#define HAS_FD_SET /**/ + +/* Gconvert: + * This preprocessor macro is defined to convert a floating point + * number to a string without a trailing decimal point. This + * emulates the behavior of sprintf("%g"), but is sometimes much more + * efficient. If gconvert() is not available, but gcvt() drops the + * trailing decimal point, then gcvt() is used. If all else fails, + * a macro using sprintf("%g") is used. Arguments for the Gconvert + * macro are: value, number of digits, whether trailing zeros should + * be retained, and the output buffer. + * The usual values are: + * d_Gconvert='gconvert((x),(n),(t),(b))' + * d_Gconvert='gcvt((x),(n),(b))' + * d_Gconvert='sprintf((b),"%.*g",(n),(x))' + * The last two assume trailing zeros should not be kept. + */ +#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x)) + +/* HAS_GETPAGESIZE: + * This symbol, if defined, indicates that the getpagesize system call + * is available to get system page size, which is the granularity of + * many memory management calls. + */ +#define HAS_GETPAGESIZE /**/ + +/* HAS_GNULIBC: + * This symbol, if defined, indicates to the C program that + * the GNU C library is being used. A better check is to use + * the __GLIBC__ and __GLIBC_MINOR__ symbols supplied with glibc. + */ +/*#define HAS_GNULIBC / **/ +#if defined(HAS_GNULIBC) && !defined(_GNU_SOURCE) +# define _GNU_SOURCE +#endif +/* HAS_ISASCII: + * This manifest constant lets the C program know that isascii + * is available. + */ +#define HAS_ISASCII /**/ + +/* HAS_LCHOWN: + * This symbol, if defined, indicates that the lchown routine is + * available to operate on a symbolic link (instead of following the + * link). + */ +#define HAS_LCHOWN /**/ + +/* HAS_OPEN3: + * This manifest constant lets the C program know that the three + * argument form of open(2) is available. + */ +#define HAS_OPEN3 /**/ + +/* HAS_SAFE_BCOPY: + * This symbol, if defined, indicates that the bcopy routine is available + * to copy potentially overlapping memory blocks. Normally, you should + * probably use memmove() or memcpy(). If neither is defined, roll your + * own version. + */ +/*#define HAS_SAFE_BCOPY / **/ + +/* HAS_SAFE_MEMCPY: + * This symbol, if defined, indicates that the memcpy routine is available + * to copy potentially overlapping memory blocks. If you need to + * copy overlapping memory blocks, you should check HAS_MEMMOVE and + * use memmove() instead, if available. + */ +/*#define HAS_SAFE_MEMCPY / **/ + +/* HAS_SANE_MEMCMP: + * This symbol, if defined, indicates that the memcmp routine is available + * and can be used to compare relative magnitudes of chars with their high + * bits set. If it is not defined, roll your own version. + */ +#define HAS_SANE_MEMCMP /**/ + +/* HAS_SIGACTION: + * This symbol, if defined, indicates that Vr4's sigaction() routine + * is available. + */ +#define HAS_SIGACTION /**/ + +/* HAS_SIGSETJMP: + * This variable indicates to the C program that the sigsetjmp() + * routine is available to save the calling process's registers + * and stack environment for later use by siglongjmp(), and + * to optionally save the process's signal mask. See + * Sigjmp_buf, Sigsetjmp, and Siglongjmp. + */ +/* Sigjmp_buf: + * This is the buffer type to be used with Sigsetjmp and Siglongjmp. + */ +/* Sigsetjmp: + * This macro is used in the same way as sigsetjmp(), but will invoke + * traditional setjmp() if sigsetjmp isn't available. + * See HAS_SIGSETJMP. + */ +/* Siglongjmp: + * This macro is used in the same way as siglongjmp(), but will invoke + * traditional longjmp() if siglongjmp isn't available. + * See HAS_SIGSETJMP. + */ +#define HAS_SIGSETJMP /**/ +#ifdef HAS_SIGSETJMP +#define Sigjmp_buf sigjmp_buf +#define Sigsetjmp(buf,save_mask) sigsetjmp((buf),(save_mask)) +#define Siglongjmp(buf,retval) siglongjmp((buf),(retval)) +#else +#define Sigjmp_buf jmp_buf +#define Sigsetjmp(buf,save_mask) setjmp((buf)) +#define Siglongjmp(buf,retval) longjmp((buf),(retval)) +#endif + +/* USE_STDIO_PTR: + * This symbol is defined if the _ptr and _cnt fields (or similar) + * of the stdio FILE structure can be used to access the stdio buffer + * for a file handle. If this is defined, then the FILE_ptr(fp) + * and FILE_cnt(fp) macros will also be defined and should be used + * to access these fields. + */ +/* FILE_ptr: + * This macro is used to access the _ptr field (or equivalent) of the + * FILE structure pointed to by its argument. This macro will always be + * defined if USE_STDIO_PTR is defined. + */ +/* STDIO_PTR_LVALUE: + * This symbol is defined if the FILE_ptr macro can be used as an + * lvalue. + */ +/* FILE_cnt: + * This macro is used to access the _cnt field (or equivalent) of the + * FILE structure pointed to by its argument. This macro will always be + * defined if USE_STDIO_PTR is defined. + */ +/* STDIO_CNT_LVALUE: + * This symbol is defined if the FILE_cnt macro can be used as an + * lvalue. + */ +/* STDIO_PTR_LVAL_SETS_CNT: + * This symbol is defined if using the FILE_ptr macro as an lvalue + * to increase the pointer by n has the side effect of decreasing the + * value of File_cnt(fp) by n. + */ +/* STDIO_PTR_LVAL_NOCHANGE_CNT: + * This symbol is defined if using the FILE_ptr macro as an lvalue + * to increase the pointer by n leaves File_cnt(fp) unchanged. + */ +/*#define USE_STDIO_PTR / **/ +#ifdef USE_STDIO_PTR +#define FILE_ptr(fp) ((fp)->_ptr) +/*#define STDIO_PTR_LVALUE / **/ +#define FILE_cnt(fp) ((fp)->_cnt) +/*#define STDIO_CNT_LVALUE / **/ +/*#define STDIO_PTR_LVAL_SETS_CNT / **/ +/*#define STDIO_PTR_LVAL_NOCHANGE_CNT / **/ +#endif + +/* USE_STDIO_BASE: + * This symbol is defined if the _base field (or similar) of the + * stdio FILE structure can be used to access the stdio buffer for + * a file handle. If this is defined, then the FILE_base(fp) macro + * will also be defined and should be used to access this field. + * Also, the FILE_bufsiz(fp) macro will be defined and should be used + * to determine the number of bytes in the buffer. USE_STDIO_BASE + * will never be defined unless USE_STDIO_PTR is. + */ +/* FILE_base: + * This macro is used to access the _base field (or equivalent) of the + * FILE structure pointed to by its argument. This macro will always be + * defined if USE_STDIO_BASE is defined. + */ +/* FILE_bufsiz: + * This macro is used to determine the number of bytes in the I/O + * buffer pointed to by _base field (or equivalent) of the FILE + * structure pointed to its argument. This macro will always be defined + * if USE_STDIO_BASE is defined. + */ +/*#define USE_STDIO_BASE / **/ +#ifdef USE_STDIO_BASE +#define FILE_base(fp) ((fp)->_base) +#define FILE_bufsiz(fp) ((fp)->_cnt + (fp)->_ptr - (fp)->_base) +#endif + +/* HAS_VPRINTF: + * This symbol, if defined, indicates that the vprintf routine is available + * to printf with a pointer to an argument list. If unavailable, you + * may need to write your own, probably in terms of _doprnt(). + */ +/* USE_CHAR_VSPRINTF: + * This symbol is defined if this system has vsprintf() returning type + * (char*). The trend seems to be to declare it as "int vsprintf()". It + * is up to the package author to declare vsprintf correctly based on the + * symbol. + */ +#define HAS_VPRINTF /**/ +/*#define USE_CHAR_VSPRINTF / **/ + +/* DOUBLESIZE: + * This symbol contains the size of a double, so that the C preprocessor + * can make decisions based on it. + */ +#define DOUBLESIZE 8 /**/ + +/* I_TIME: + * This symbol, if defined, indicates to the C program that it should + * include <time.h>. + */ +/* I_SYS_TIME: + * This symbol, if defined, indicates to the C program that it should + * include <sys/time.h>. + */ +/* I_SYS_TIME_KERNEL: + * This symbol, if defined, indicates to the C program that it should + * include <sys/time.h> with KERNEL defined. + */ +/* HAS_TM_TM_ZONE: + * This symbol, if defined, indicates to the C program that + * the struct tm has a tm_zone field. + */ +/* HAS_TM_TM_GMTOFF: + * This symbol, if defined, indicates to the C program that + * the struct tm has a tm_gmtoff field. + */ +#define I_TIME /**/ +#define I_SYS_TIME /**/ +/*#define I_SYS_TIME_KERNEL / **/ +#define HAS_TM_TM_ZONE /**/ +#define HAS_TM_TM_GMTOFF /**/ + +/* VAL_O_NONBLOCK: + * This symbol is to be used during open() or fcntl(F_SETFL) to turn on + * non-blocking I/O for the file descriptor. Note that there is no way + * back, i.e. you cannot turn it blocking again this way. If you wish to + * alternatively switch between blocking and non-blocking, use the + * ioctl(FIOSNBIO) call instead, but that is not supported by all devices. + */ +/* VAL_EAGAIN: + * This symbol holds the errno error code set by read() when no data was + * present on the non-blocking file descriptor. + */ +/* RD_NODATA: + * This symbol holds the return code from read() when no data is present + * on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is + * not defined, then you can't distinguish between no data and EOF by + * issuing a read(). You'll have to find another way to tell for sure! + */ +/* EOF_NONBLOCK: + * This symbol, if defined, indicates to the C program that a read() on + * a non-blocking file descriptor will return 0 on EOF, and not the value + * held in RD_NODATA (-1 usually, in that case!). + */ +#define VAL_O_NONBLOCK O_NONBLOCK +#define VAL_EAGAIN EAGAIN +#define RD_NODATA -1 +#define EOF_NONBLOCK + +/* PTRSIZE: + * This symbol contains the size of a pointer, so that the C preprocessor + * can make decisions based on it. It will be sizeof(void *) if + * the compiler supports (void *); otherwise it will be + * sizeof(char *). + */ +#define PTRSIZE 8 /**/ + +/* Drand01: + * This macro is to be used to generate uniformly distributed + * random numbers over the range [0., 1.[. You may have to supply + * an 'extern double drand48();' in your program since SunOS 4.1.3 + * doesn't provide you with anything relevant in its headers. + * See HAS_DRAND48_PROTO. + */ +/* Rand_seed_t: + * This symbol defines the type of the argument of the + * random seed function. + */ +/* seedDrand01: + * This symbol defines the macro to be used in seeding the + * random number generator (see Drand01). + */ +/* RANDBITS: + * This symbol indicates how many bits are produced by the + * function used to generate normalized random numbers. + * Values include 15, 16, 31, and 48. + */ +#define Drand01() drand48() /**/ +#define Rand_seed_t long /**/ +#define seedDrand01(x) srand48((Rand_seed_t)x) /**/ +#define RANDBITS 48 /**/ + +/* SSize_t: + * This symbol holds the type used by functions that return + * a count of bytes or an error condition. It must be a signed type. + * It is usually ssize_t, but may be long or int, etc. + * It may be necessary to include <sys/types.h> or <unistd.h> + * to get any typedef'ed information. + * We will pick a type such that sizeof(SSize_t) == sizeof(Size_t). + */ +#define SSize_t ssize_t /* signed count of bytes */ + +/* EBCDIC: + * This symbol, if defined, indicates that this system uses + * EBCDIC encoding. + */ +/*#define EBCDIC / **/ + +/* HAS_ATOLF: + * This symbol, if defined, indicates that the atolf routine is + * available to convert strings into long doubles. + */ +/*#define HAS_ATOLF / **/ + +/* HAS_ATOLL: + * This symbol, if defined, indicates that the atoll routine is + * available to convert strings into long longs. + */ +#define HAS_ATOLL /**/ + +/* HAS__FWALK: + * This symbol, if defined, indicates that the _fwalk system call is + * available to apply a function to all the file handles. + */ +/*#define HAS__FWALK / **/ + +/* HAS_AINTL: + * This symbol, if defined, indicates that the aintl routine is + * available. If copysignl is also present we can emulate modfl. + */ +/*#define HAS_AINTL / **/ + +/* HAS_BUILTIN_CHOOSE_EXPR: + * Can we handle GCC builtin for compile-time ternary-like expressions + */ +/* HAS_BUILTIN_EXPECT: + * Can we handle GCC builtin for telling that certain values are more + * likely + */ +/*#define HAS_BUILTIN_EXPECT / **/ +#define HAS_BUILTIN_CHOOSE_EXPR /**/ + +/* HAS_C99_VARIADIC_MACROS: + * If defined, the compiler supports C99 variadic macros. + */ +#define HAS_C99_VARIADIC_MACROS /**/ + +/* HAS_CLASS: + * This symbol, if defined, indicates that the class routine is + * available to classify doubles. Available for example in AIX. + * The returned values are defined in <float.h> and are: + * + * FP_PLUS_NORM Positive normalized, nonzero + * FP_MINUS_NORM Negative normalized, nonzero + * FP_PLUS_DENORM Positive denormalized, nonzero + * FP_MINUS_DENORM Negative denormalized, nonzero + * FP_PLUS_ZERO +0.0 + * FP_MINUS_ZERO -0.0 + * FP_PLUS_INF +INF + * FP_MINUS_INF -INF + * FP_NANS Signaling Not a Number (NaNS) + * FP_NANQ Quiet Not a Number (NaNQ) + */ +/*#define HAS_CLASS / **/ + +/* HAS_CLEARENV: + * This symbol, if defined, indicates that the clearenv () routine is + * available for use. + */ +#define HAS_CLEARENV /**/ + +/* HAS_STRUCT_CMSGHDR: + * This symbol, if defined, indicates that the struct cmsghdr + * is supported. + */ +#define HAS_STRUCT_CMSGHDR /**/ + +/* HAS_COPYSIGNL: + * This symbol, if defined, indicates that the copysignl routine is + * available. If aintl is also present we can emulate modfl. + */ +/*#define HAS_COPYSIGNL / **/ + +/* USE_CPLUSPLUS: + * This symbol, if defined, indicates that a C++ compiler was + * used to compiled Perl and will be used to compile extensions. + */ +/*#define USE_CPLUSPLUS / **/ + +/* HAS_DBMINIT_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the dbminit() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern int dbminit(char *); + */ +/*#define HAS_DBMINIT_PROTO / **/ + +/* HAS_DIR_DD_FD: + * This symbol, if defined, indicates that the the DIR* dirstream + * structure contains a member variable named dd_fd. + */ +/*#define HAS_DIR_DD_FD / **/ + +/* HAS_DIRFD: + * This manifest constant lets the C program know that dirfd + * is available. + */ +#define HAS_DIRFD /**/ + +/* DLSYM_NEEDS_UNDERSCORE: + * This symbol, if defined, indicates that we need to prepend an + * underscore to the symbol name before calling dlsym(). This only + * makes sense if you *have* dlsym, which we will presume is the + * case if you're using dl_dlopen.xs. + */ +/*#define DLSYM_NEEDS_UNDERSCORE / **/ + +/* HAS_FAST_STDIO: + * This symbol, if defined, indicates that the "fast stdio" + * is available to manipulate the stdio buffers directly. + */ +/*#define HAS_FAST_STDIO / **/ + +/* HAS_FCHDIR: + * This symbol, if defined, indicates that the fchdir routine is + * available to change directory using a file descriptor. + */ +#define HAS_FCHDIR /**/ + +/* FCNTL_CAN_LOCK: + * This symbol, if defined, indicates that fcntl() can be used + * for file locking. Normally on Unix systems this is defined. + * It may be undefined on VMS. + */ +#define FCNTL_CAN_LOCK /**/ + +/* HAS_FINITE: + * This symbol, if defined, indicates that the finite routine is + * available to check whether a double is finite (non-infinity non-NaN). + */ +/*#define HAS_FINITE / **/ + +/* HAS_FINITEL: + * This symbol, if defined, indicates that the finitel routine is + * available to check whether a long double is finite + * (non-infinity non-NaN). + */ +/*#define HAS_FINITEL / **/ + +/* HAS_FLOCK_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the flock() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern int flock(int, int); + */ +#define HAS_FLOCK_PROTO /**/ + +/* HAS_FP_CLASS: + * This symbol, if defined, indicates that the fp_class routine is + * available to classify doubles. Available for example in Digital UNIX. + * The returned values are defined in <math.h> and are: + * + * FP_SNAN Signaling NaN (Not-a-Number) + * FP_QNAN Quiet NaN (Not-a-Number) + * FP_POS_INF +infinity + * FP_NEG_INF -infinity + * FP_POS_NORM Positive normalized + * FP_NEG_NORM Negative normalized + * FP_POS_DENORM Positive denormalized + * FP_NEG_DENORM Negative denormalized + * FP_POS_ZERO +0.0 (positive zero) + * FP_NEG_ZERO -0.0 (negative zero) + */ +/*#define HAS_FP_CLASS / **/ + +/* HAS_FPCLASS: + * This symbol, if defined, indicates that the fpclass routine is + * available to classify doubles. Available for example in Solaris/SVR4. + * The returned values are defined in <ieeefp.h> and are: + * + * FP_SNAN signaling NaN + * FP_QNAN quiet NaN + * FP_NINF negative infinity + * FP_PINF positive infinity + * FP_NDENORM negative denormalized non-zero + * FP_PDENORM positive denormalized non-zero + * FP_NZERO negative zero + * FP_PZERO positive zero + * FP_NNORM negative normalized non-zero + * FP_PNORM positive normalized non-zero + */ +/*#define HAS_FPCLASS / **/ + +/* HAS_FPCLASSIFY: + * This symbol, if defined, indicates that the fpclassify routine is + * available to classify doubles. Available for example in HP-UX. + * The returned values are defined in <math.h> and are + * + * FP_NORMAL Normalized + * FP_ZERO Zero + * FP_INFINITE Infinity + * FP_SUBNORMAL Denormalized + * FP_NAN NaN + * + */ +/*#define HAS_FPCLASSIFY / **/ + +/* HAS_FPCLASSL: + * This symbol, if defined, indicates that the fpclassl routine is + * available to classify long doubles. Available for example in IRIX. + * The returned values are defined in <ieeefp.h> and are: + * + * FP_SNAN signaling NaN + * FP_QNAN quiet NaN + * FP_NINF negative infinity + * FP_PINF positive infinity + * FP_NDENORM negative denormalized non-zero + * FP_PDENORM positive denormalized non-zero + * FP_NZERO negative zero + * FP_PZERO positive zero + * FP_NNORM negative normalized non-zero + * FP_PNORM positive normalized non-zero + */ +/*#define HAS_FPCLASSL / **/ + +/* HAS_FPOS64_T: + * This symbol will be defined if the C compiler supports fpos64_t. + */ +/*#define HAS_FPOS64_T / **/ + +/* HAS_FREXPL: + * This symbol, if defined, indicates that the frexpl routine is + * available to break a long double floating-point number into + * a normalized fraction and an integral power of 2. + */ +/*#define HAS_FREXPL / **/ + +/* HAS_STRUCT_FS_DATA: + * This symbol, if defined, indicates that the struct fs_data + * to do statfs() is supported. + */ +/*#define HAS_STRUCT_FS_DATA / **/ + +/* HAS_FSEEKO: + * This symbol, if defined, indicates that the fseeko routine is + * available to fseek beyond 32 bits (useful for ILP32 hosts). + */ +#define HAS_FSEEKO /**/ + +/* HAS_FSTATFS: + * This symbol, if defined, indicates that the fstatfs routine is + * available to stat filesystems by file descriptors. + */ +#define HAS_FSTATFS /**/ + +/* HAS_FSYNC: + * This symbol, if defined, indicates that the fsync routine is + * available to write a file's modified data and attributes to + * permanent storage. + */ +#define HAS_FSYNC /**/ + +/* HAS_FTELLO: + * This symbol, if defined, indicates that the ftello routine is + * available to ftell beyond 32 bits (useful for ILP32 hosts). + */ +#define HAS_FTELLO /**/ + +/* HAS_FUTIMES: + * This symbol, if defined, indicates that the futimes routine is + * available to change file descriptor time stamps with struct timevals. + */ +/*#define HAS_FUTIMES / **/ + +/* HAS_GETCWD: + * This symbol, if defined, indicates that the getcwd routine is + * available to get the current working directory. + */ +#define HAS_GETCWD /**/ + +/* HAS_GETESPWNAM: + * This symbol, if defined, indicates that the getespwnam system call is + * available to retrieve enchanced (shadow) password entries by name. + */ +/*#define HAS_GETESPWNAM / **/ + +/* HAS_GETFSSTAT: + * This symbol, if defined, indicates that the getfsstat routine is + * available to stat filesystems in bulk. + */ +/*#define HAS_GETFSSTAT / **/ + +/* HAS_GETITIMER: + * This symbol, if defined, indicates that the getitimer routine is + * available to return interval timers. + */ +#define HAS_GETITIMER /**/ + +/* HAS_GETMNT: + * This symbol, if defined, indicates that the getmnt routine is + * available to get filesystem mount info by filename. + */ +/*#define HAS_GETMNT / **/ + +/* HAS_GETMNTENT: + * This symbol, if defined, indicates that the getmntent routine is + * available to iterate through mounted file systems to get their info. + */ +#define HAS_GETMNTENT /**/ + +/* HAS_GETPRPWNAM: + * This symbol, if defined, indicates that the getprpwnam system call is + * available to retrieve protected (shadow) password entries by name. + */ +/*#define HAS_GETPRPWNAM / **/ + +/* HAS_GETSPNAM: + * This symbol, if defined, indicates that the getspnam system call is + * available to retrieve SysV shadow password entries by name. + */ +#define HAS_GETSPNAM /**/ + +/* HAS_HASMNTOPT: + * This symbol, if defined, indicates that the hasmntopt routine is + * available to query the mount options of file systems. + */ +#define HAS_HASMNTOPT /**/ + +/* HAS_ILOGBL: + * This symbol, if defined, indicates that the ilogbl routine is + * available. If scalbnl is also present we can emulate frexpl. + */ +/*#define HAS_ILOGBL / **/ + +/* HAS_INT64_T: + * This symbol will defined if the C compiler supports int64_t. + * Usually the <inttypes.h> needs to be included, but sometimes + * <sys/types.h> is enough. + */ +#define HAS_INT64_T /**/ + +/* HAS_ISFINITE: + * This symbol, if defined, indicates that the isfinite routine is + * available to check whether a double is finite (non-infinity non-NaN). + */ +/*#define HAS_ISFINITE / **/ + +/* HAS_ISINF: + * This symbol, if defined, indicates that the isinf routine is + * available to check whether a double is an infinity. + */ +/*#define HAS_ISINF / **/ + +/* HAS_ISNAN: + * This symbol, if defined, indicates that the isnan routine is + * available to check whether a double is a NaN. + */ +/*#define HAS_ISNAN / **/ + +/* HAS_ISNANL: + * This symbol, if defined, indicates that the isnanl routine is + * available to check whether a long double is a NaN. + */ +/*#define HAS_ISNANL / **/ + +/* HAS_LDBL_DIG: + * This symbol, if defined, indicates that this system's <float.h> + * or <limits.h> defines the symbol LDBL_DIG, which is the number + * of significant digits in a long double precision number. Unlike + * for DBL_DIG, there's no good guess for LDBL_DIG if it is undefined. + */ +#define HAS_LDBL_DIG /* */ + +/* LIBM_LIB_VERSION: + * This symbol, if defined, indicates that libm exports _LIB_VERSION + * and that math.h defines the enum to manipulate it. + */ +/*#define LIBM_LIB_VERSION / **/ + +/* HAS_MADVISE: + * This symbol, if defined, indicates that the madvise system call is + * available to map a file into memory. + */ +#define HAS_MADVISE /**/ + +/* HAS_MALLOC_SIZE: + * This symbol, if defined, indicates that the malloc_size + * routine is available for use. + */ +/*#define HAS_MALLOC_SIZE / **/ + +/* HAS_MALLOC_GOOD_SIZE: + * This symbol, if defined, indicates that the malloc_good_size + * routine is available for use. + */ +/*#define HAS_MALLOC_GOOD_SIZE / **/ + +/* HAS_MKDTEMP: + * This symbol, if defined, indicates that the mkdtemp routine is + * available to exclusively create a uniquely named temporary directory. + */ +#define HAS_MKDTEMP /**/ + +/* HAS_MKSTEMPS: + * This symbol, if defined, indicates that the mkstemps routine is + * available to excluslvely create and open a uniquely named + * (with a suffix) temporary file. + */ +/*#define HAS_MKSTEMPS / **/ + +/* HAS_MODFL: + * This symbol, if defined, indicates that the modfl routine is + * available to split a long double x into a fractional part f and + * an integer part i such that |f| < 1.0 and (f + i) = x. + */ +/* HAS_MODFL_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the modfl() function. Otherwise, it is up + * to the program to supply one. + */ +/* HAS_MODFL_POW32_BUG: + * This symbol, if defined, indicates that the modfl routine is + * broken for long doubles >= pow(2, 32). + * For example from 4294967303.150000 one would get 4294967302.000000 + * and 1.150000. The bug has been seen in certain versions of glibc, + * release 2.2.2 is known to be okay. + */ +/*#define HAS_MODFL / **/ +#define HAS_MODFL_PROTO /**/ +/*#define HAS_MODFL_POW32_BUG / **/ + +/* HAS_MPROTECT: + * This symbol, if defined, indicates that the mprotect system call is + * available to modify the access protection of a memory mapped file. + */ +#define HAS_MPROTECT /**/ + +/* HAS_STRUCT_MSGHDR: + * This symbol, if defined, indicates that the struct msghdr + * is supported. + */ +#define HAS_STRUCT_MSGHDR /**/ + +/* HAS_NL_LANGINFO: + * This symbol, if defined, indicates that the nl_langinfo routine is + * available to return local data. You will also need <langinfo.h> + * and therefore I_LANGINFO. + */ +#define HAS_NL_LANGINFO /**/ + +/* HAS_OFF64_T: + * This symbol will be defined if the C compiler supports off64_t. + */ +/*#define HAS_OFF64_T / **/ + +/* HAS_PROCSELFEXE: + * This symbol is defined if PROCSELFEXE_PATH is a symlink + * to the absolute pathname of the executing program. + */ +/* PROCSELFEXE_PATH: + * If HAS_PROCSELFEXE is defined this symbol is the filename + * of the symbolic link pointing to the absolute pathname of + * the executing program. + */ +/*#define HAS_PROCSELFEXE / **/ +#if defined(HAS_PROCSELFEXE) && !defined(PROCSELFEXE_PATH) +#define PROCSELFEXE_PATH /**/ +#endif + +/* HAS_PTHREAD_ATTR_SETSCOPE: + * This symbol, if defined, indicates that the pthread_attr_setscope + * system call is available to set the contention scope attribute of + * a thread attribute object. + */ +#define HAS_PTHREAD_ATTR_SETSCOPE /**/ + +/* HAS_READV: + * This symbol, if defined, indicates that the readv routine is + * available to do gather reads. You will also need <sys/uio.h> + * and there I_SYSUIO. + */ +#define HAS_READV /**/ + +/* HAS_RECVMSG: + * This symbol, if defined, indicates that the recvmsg routine is + * available to send structured socket messages. + */ +#define HAS_RECVMSG /**/ + +/* HAS_SBRK_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the sbrk() function. Otherwise, it is up + * to the program to supply one. Good guesses are + * extern void* sbrk(int); + * extern void* sbrk(size_t); + */ +#define HAS_SBRK_PROTO /**/ + +/* HAS_SCALBNL: + * This symbol, if defined, indicates that the scalbnl routine is + * available. If ilogbl is also present we can emulate frexpl. + */ +/*#define HAS_SCALBNL / **/ + +/* HAS_SENDMSG: + * This symbol, if defined, indicates that the sendmsg routine is + * available to send structured socket messages. + */ +#define HAS_SENDMSG /**/ + +/* HAS_SETITIMER: + * This symbol, if defined, indicates that the setitimer routine is + * available to set interval timers. + */ +#define HAS_SETITIMER /**/ + +/* HAS_SETPROCTITLE: + * This symbol, if defined, indicates that the setproctitle routine is + * available to set process title. + */ +/*#define HAS_SETPROCTITLE / **/ + +/* USE_SFIO: + * This symbol, if defined, indicates that sfio should + * be used. + */ +/*#define USE_SFIO / **/ + +/* HAS_SIGNBIT: + * This symbol, if defined, indicates that the signbit routine is + * available to check if the given number has the sign bit set. + * This should include correct testing of -0.0. This will only be set + * if the signbit() routine is safe to use with the NV type used internally + * in perl. Users should call Perl_signbit(), which will be #defined to + * the system's signbit() function or macro if this symbol is defined. + */ +#define HAS_SIGNBIT /**/ + +/* HAS_SIGPROCMASK: + * This symbol, if defined, indicates that the sigprocmask + * system call is available to examine or change the signal mask + * of the calling process. + */ +#define HAS_SIGPROCMASK /**/ + +/* USE_SITECUSTOMIZE: + * This symbol, if defined, indicates that sitecustomize should + * be used. + */ +#ifndef USE_SITECUSTOMIZE +/*#define USE_SITECUSTOMIZE / **/ +#endif + +/* HAS_SNPRINTF: + * This symbol, if defined, indicates that the snprintf () library + * function is available for use. + */ +/* HAS_VSNPRINTF: + * This symbol, if defined, indicates that the vsnprintf () library + * function is available for use. + */ +#define HAS_SNPRINTF /**/ +#define HAS_VSNPRINTF /**/ + +/* HAS_SOCKATMARK: + * This symbol, if defined, indicates that the sockatmark routine is + * available to test whether a socket is at the out-of-band mark. + */ +/*#define HAS_SOCKATMARK / **/ + +/* HAS_SOCKATMARK_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the sockatmark() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern int sockatmark(int); + */ +/*#define HAS_SOCKATMARK_PROTO / **/ + +/* HAS_SOCKS5_INIT: + * This symbol, if defined, indicates that the socks5_init routine is + * available to initialize SOCKS 5. + */ +/*#define HAS_SOCKS5_INIT / **/ + +/* SPRINTF_RETURNS_STRLEN: + * This variable defines whether sprintf returns the length of the string + * (as per the ANSI spec). Some C libraries retain compatibility with + * pre-ANSI C and return a pointer to the passed in buffer; for these + * this variable will be undef. + */ +#define SPRINTF_RETURNS_STRLEN /**/ + +/* HAS_SQRTL: + * This symbol, if defined, indicates that the sqrtl routine is + * available to do long double square roots. + */ +/*#define HAS_SQRTL / **/ + +/* HAS_SETRESGID_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the setresgid() function. Otherwise, it is up + * to the program to supply one. Good guesses are + * extern int setresgid(uid_t ruid, uid_t euid, uid_t suid); + */ +/*#define HAS_SETRESGID_PROTO / **/ + +/* HAS_SETRESUID_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the setresuid() function. Otherwise, it is up + * to the program to supply one. Good guesses are + * extern int setresuid(uid_t ruid, uid_t euid, uid_t suid); + */ +/*#define HAS_SETRESUID_PROTO / **/ + +/* HAS_STRUCT_STATFS_F_FLAGS: + * This symbol, if defined, indicates that the struct statfs + * does have the f_flags member containing the mount flags of + * the filesystem containing the file. + * This kind of struct statfs is coming from <sys/mount.h> (BSD 4.3), + * not from <sys/statfs.h> (SYSV). Older BSDs (like Ultrix) do not + * have statfs() and struct statfs, they have ustat() and getmnt() + * with struct ustat and struct fs_data. + */ +/*#define HAS_STRUCT_STATFS_F_FLAGS / **/ + +/* HAS_STRUCT_STATFS: + * This symbol, if defined, indicates that the struct statfs + * to do statfs() is supported. + */ +#define HAS_STRUCT_STATFS /**/ + +/* HAS_FSTATVFS: + * This symbol, if defined, indicates that the fstatvfs routine is + * available to stat filesystems by file descriptors. + */ +#define HAS_FSTATVFS /**/ + +/* HAS_STRFTIME: + * This symbol, if defined, indicates that the strftime routine is + * available to do time formatting. + */ +#define HAS_STRFTIME /**/ + +/* HAS_STRLCAT: + * This symbol, if defined, indicates that the strlcat () routine is + * available to do string concatenation. + */ +/*#define HAS_STRLCAT /* */ + +/* HAS_STRLCPY: + * This symbol, if defined, indicates that the strlcpy () routine is + * available to do string copying. + */ +/*#define HAS_STRLCPY /* */ + +/* HAS_STRTOLD: + * This symbol, if defined, indicates that the strtold routine is + * available to convert strings to long doubles. + */ +#define HAS_STRTOLD /**/ + +/* HAS_STRTOLL: + * This symbol, if defined, indicates that the strtoll routine is + * available to convert strings to long longs. + */ +#define HAS_STRTOLL /**/ + +/* HAS_STRTOQ: + * This symbol, if defined, indicates that the strtoq routine is + * available to convert strings to long longs (quads). + */ +/*#define HAS_STRTOQ / **/ + +/* HAS_STRTOULL: + * This symbol, if defined, indicates that the strtoull routine is + * available to convert strings to unsigned long longs. + */ +#define HAS_STRTOULL /**/ + +/* HAS_STRTOUQ: + * This symbol, if defined, indicates that the strtouq routine is + * available to convert strings to unsigned long longs (quads). + */ +/*#define HAS_STRTOUQ / **/ + +/* HAS_SYSCALL_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the syscall() function. Otherwise, it is up + * to the program to supply one. Good guesses are + * extern int syscall(int, ...); + * extern int syscall(long, ...); + */ +#define HAS_SYSCALL_PROTO /**/ + +/* HAS_TELLDIR_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the telldir() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern long telldir(DIR*); + */ +#define HAS_TELLDIR_PROTO /**/ + +/* U32_ALIGNMENT_REQUIRED: + * This symbol, if defined, indicates that you must access + * character data through U32-aligned pointers. + */ +#ifndef U32_ALIGNMENT_REQUIRED +#define U32_ALIGNMENT_REQUIRED /**/ +#endif + +/* HAS_UALARM: + * This symbol, if defined, indicates that the ualarm routine is + * available to do alarms with microsecond granularity. + */ +#define HAS_UALARM /**/ + +/* HAS_UNORDERED: + * This symbol, if defined, indicates that the unordered routine is + * available to check whether two doubles are unordered + * (effectively: whether either of them is NaN) + */ +/*#define HAS_UNORDERED / **/ + +/* HAS_UNSETENV: + * This symbol, if defined, indicates that the unsetenv () routine is + * available for use. + */ +#define HAS_UNSETENV /**/ + +/* HAS_USLEEP_PROTO: + * This symbol, if defined, indicates that the system provides + * a prototype for the usleep() function. Otherwise, it is up + * to the program to supply one. A good guess is + * extern int usleep(useconds_t); + */ +#define HAS_USLEEP_PROTO /**/ + +/* HAS_USTAT: + * This symbol, if defined, indicates that the ustat system call is + * available to query file system statistics by dev_t. + */ +/*#define HAS_USTAT / **/ + +/* HAS_WRITEV: + * This symbol, if defined, indicates that the writev routine is + * available to do scatter writes. + */ +#define HAS_WRITEV /**/ + +/* USE_DYNAMIC_LOADING: + * This symbol, if defined, indicates that dynamic loading of + * some sort is available. + */ +/*#define USE_DYNAMIC_LOADING / **/ + +/* FFLUSH_NULL: + * This symbol, if defined, tells that fflush(NULL) does flush + * all pending stdio output. + */ +/* FFLUSH_ALL: + * This symbol, if defined, tells that to flush + * all pending stdio output one must loop through all + * the stdio file handles stored in an array and fflush them. + * Note that if fflushNULL is defined, fflushall will not + * even be probed for and will be left undefined. + */ +/*#define FFLUSH_NULL / **/ +/*#define FFLUSH_ALL / **/ + +/* I_CRYPT: + * This symbol, if defined, indicates that <crypt.h> exists and + * should be included. + */ +#define I_CRYPT /**/ + +/* DB_Prefix_t: + * This symbol contains the type of the prefix structure element + * in the <db.h> header file. In older versions of DB, it was + * int, while in newer ones it is u_int32_t. + */ +/* DB_Hash_t: + * This symbol contains the type of the prefix structure element + * in the <db.h> header file. In older versions of DB, it was + * int, while in newer ones it is size_t. + */ +/* DB_VERSION_MAJOR_CFG: + * This symbol, if defined, defines the major version number of + * Berkeley DB found in the <db.h> header when Perl was configured. + */ +/* DB_VERSION_MINOR_CFG: + * This symbol, if defined, defines the minor version number of + * Berkeley DB found in the <db.h> header when Perl was configured. + * For DB version 1 this is always 0. + */ +/* DB_VERSION_PATCH_CFG: + * This symbol, if defined, defines the patch version number of + * Berkeley DB found in the <db.h> header when Perl was configured. + * For DB version 1 this is always 0. + */ +#define DB_Hash_t u_int32_t /**/ +#define DB_Prefix_t size_t /**/ +#define DB_VERSION_MAJOR_CFG /**/ +#define DB_VERSION_MINOR_CFG /**/ +#define DB_VERSION_PATCH_CFG /**/ + +/* I_FP: + * This symbol, if defined, indicates that <fp.h> exists and + * should be included. + */ +/*#define I_FP / **/ + +/* I_FP_CLASS: + * This symbol, if defined, indicates that <fp_class.h> exists and + * should be included. + */ +/*#define I_FP_CLASS / **/ + +/* I_IEEEFP: + * This symbol, if defined, indicates that <ieeefp.h> exists and + * should be included. + */ +/*#define I_IEEEFP / **/ + +/* I_INTTYPES: + * This symbol, if defined, indicates to the C program that it should + * include <inttypes.h>. + */ +#define I_INTTYPES /**/ + +/* I_LANGINFO: + * This symbol, if defined, indicates that <langinfo.h> exists and + * should be included. + */ +#define I_LANGINFO /**/ + +/* I_LIBUTIL: + * This symbol, if defined, indicates that <libutil.h> exists and + * should be included. + */ +/*#define I_LIBUTIL / **/ + +/* I_MNTENT: + * This symbol, if defined, indicates that <mntent.h> exists and + * should be included. + */ +#define I_MNTENT /**/ + +/* I_NETINET_TCP: + * This symbol, if defined, indicates to the C program that it should + * include <netinet/tcp.h>. + */ +#define I_NETINET_TCP /**/ + +/* I_POLL: + * This symbol, if defined, indicates that <poll.h> exists and + * should be included. (see also HAS_POLL) + */ +#define I_POLL /**/ + +/* I_PROT: + * This symbol, if defined, indicates that <prot.h> exists and + * should be included. + */ +/*#define I_PROT / **/ + +/* I_SHADOW: + * This symbol, if defined, indicates that <shadow.h> exists and + * should be included. + */ +#define I_SHADOW /**/ + +/* I_SOCKS: + * This symbol, if defined, indicates that <socks.h> exists and + * should be included. + */ +/*#define I_SOCKS / **/ + +/* I_SUNMATH: + * This symbol, if defined, indicates that <sunmath.h> exists and + * should be included. + */ +/*#define I_SUNMATH / **/ + +/* I_SYSLOG: + * This symbol, if defined, indicates that <syslog.h> exists and + * should be included. + */ +#define I_SYSLOG /**/ + +/* I_SYSMODE: + * This symbol, if defined, indicates that <sys/mode.h> exists and + * should be included. + */ +/*#define I_SYSMODE / **/ + +/* I_SYS_MOUNT: + * This symbol, if defined, indicates that <sys/mount.h> exists and + * should be included. + */ +#define I_SYS_MOUNT /**/ + +/* I_SYS_STATFS: + * This symbol, if defined, indicates that <sys/statfs.h> exists. + */ +#define I_SYS_STATFS /**/ + +/* I_SYS_STATVFS: + * This symbol, if defined, indicates that <sys/statvfs.h> exists and + * should be included. + */ +#define I_SYS_STATVFS /**/ + +/* I_SYSUTSNAME: + * This symbol, if defined, indicates that <sys/utsname.h> exists and + * should be included. + */ +#define I_SYSUTSNAME /**/ + +/* I_SYS_VFS: + * This symbol, if defined, indicates that <sys/vfs.h> exists and + * should be included. + */ +#define I_SYS_VFS /**/ + +/* I_USTAT: + * This symbol, if defined, indicates that <ustat.h> exists and + * should be included. + */ +/*#define I_USTAT / **/ + +/* PERL_PRIfldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'f') for output. + */ +/* PERL_PRIgldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'g') for output. + */ +/* PERL_PRIeldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'e') for output. + */ +/* PERL_SCNfldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'f') for input. + */ +#define PERL_PRIfldbl "Lf" /**/ +#define PERL_PRIgldbl "Lg" /**/ +#define PERL_PRIeldbl "Le" /**/ +#define PERL_SCNfldbl "Lf" /**/ + +/* PERL_MAD: + * This symbol, if defined, indicates that the Misc Attribution + * Declaration code should be conditionally compiled. + */ +/*#define PERL_MAD / **/ + +/* NEED_VA_COPY: + * This symbol, if defined, indicates that the system stores + * the variable argument list datatype, va_list, in a format + * that cannot be copied by simple assignment, so that some + * other means must be used when copying is required. + * As such systems vary in their provision (or non-provision) + * of copying mechanisms, handy.h defines a platform- + * independent macro, Perl_va_copy(src, dst), to do the job. + */ +#define NEED_VA_COPY /**/ + +/* IVTYPE: + * This symbol defines the C type used for Perl's IV. + */ +/* UVTYPE: + * This symbol defines the C type used for Perl's UV. + */ +/* I8TYPE: + * This symbol defines the C type used for Perl's I8. + */ +/* U8TYPE: + * This symbol defines the C type used for Perl's U8. + */ +/* I16TYPE: + * This symbol defines the C type used for Perl's I16. + */ +/* U16TYPE: + * This symbol defines the C type used for Perl's U16. + */ +/* I32TYPE: + * This symbol defines the C type used for Perl's I32. + */ +/* U32TYPE: + * This symbol defines the C type used for Perl's U32. + */ +/* I64TYPE: + * This symbol defines the C type used for Perl's I64. + */ +/* U64TYPE: + * This symbol defines the C type used for Perl's U64. + */ +/* NVTYPE: + * This symbol defines the C type used for Perl's NV. + */ +/* IVSIZE: + * This symbol contains the sizeof(IV). + */ +/* UVSIZE: + * This symbol contains the sizeof(UV). + */ +/* I8SIZE: + * This symbol contains the sizeof(I8). + */ +/* U8SIZE: + * This symbol contains the sizeof(U8). + */ +/* I16SIZE: + * This symbol contains the sizeof(I16). + */ +/* U16SIZE: + * This symbol contains the sizeof(U16). + */ +/* I32SIZE: + * This symbol contains the sizeof(I32). + */ +/* U32SIZE: + * This symbol contains the sizeof(U32). + */ +/* I64SIZE: + * This symbol contains the sizeof(I64). + */ +/* U64SIZE: + * This symbol contains the sizeof(U64). + */ +/* NVSIZE: + * This symbol contains the sizeof(NV). + */ +/* NV_PRESERVES_UV: + * This symbol, if defined, indicates that a variable of type NVTYPE + * can preserve all the bits of a variable of type UVTYPE. + */ +/* NV_PRESERVES_UV_BITS: + * This symbol contains the number of bits a variable of type NVTYPE + * can preserve of a variable of type UVTYPE. + */ +/* NV_ZERO_IS_ALLBITS_ZERO: + * This symbol, if defined, indicates that a variable of type NVTYPE + * stores 0.0 in memory as all bits zero. + */ +#define IVTYPE long /**/ +#define UVTYPE unsigned long /**/ +#define I8TYPE char /**/ +#define U8TYPE unsigned char /**/ +#define I16TYPE short /**/ +#define U16TYPE unsigned short /**/ +#define I32TYPE int /**/ +#define U32TYPE unsigned int /**/ +#ifdef HAS_QUAD +#define I64TYPE long /**/ +#define U64TYPE unsigned long /**/ +#endif +#define NVTYPE double /**/ +#define IVSIZE 8 /**/ +#define UVSIZE 8 /**/ +#define I8SIZE 1 /**/ +#define U8SIZE 1 /**/ +#define I16SIZE 2 /**/ +#define U16SIZE 2 /**/ +#define I32SIZE 4 /**/ +#define U32SIZE 4 /**/ +#ifdef HAS_QUAD +#define I64SIZE 8 /**/ +#define U64SIZE 8 /**/ +#endif +#define NVSIZE 8 /**/ +#undef NV_PRESERVES_UV +#define NV_PRESERVES_UV_BITS 53 +#define NV_ZERO_IS_ALLBITS_ZERO +#if UVSIZE == 8 +# ifdef BYTEORDER +# if BYTEORDER == 0x1234 +# undef BYTEORDER +# define BYTEORDER 0x12345678 +# else +# if BYTEORDER == 0x4321 +# undef BYTEORDER +# define BYTEORDER 0x87654321 +# endif +# endif +# endif +#endif + +/* IVdf: + * This symbol defines the format string used for printing a Perl IV + * as a signed decimal integer. + */ +/* UVuf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned decimal integer. + */ +/* UVof: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned octal integer. + */ +/* UVxf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in lowercase abcdef. + */ +/* UVXf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in uppercase ABCDEF. + */ +/* NVef: + * This symbol defines the format string used for printing a Perl NV + * using %e-ish floating point format. + */ +/* NVff: + * This symbol defines the format string used for printing a Perl NV + * using %f-ish floating point format. + */ +/* NVgf: + * This symbol defines the format string used for printing a Perl NV + * using %g-ish floating point format. + */ +#define IVdf "ld" /**/ +#define UVuf "lu" /**/ +#define UVof "lo" /**/ +#define UVxf "lx" /**/ +#define UVXf "lX" /**/ +#define NVef "e" /**/ +#define NVff "f" /**/ +#define NVgf "g" /**/ + +/* SELECT_MIN_BITS: + * This symbol holds the minimum number of bits operated by select. + * That is, if you do select(n, ...), how many bits at least will be + * cleared in the masks if some activity is detected. Usually this + * is either n or 32*ceil(n/32), especially many little-endians do + * the latter. This is only useful if you have select(), naturally. + */ +#define SELECT_MIN_BITS 64 /**/ + +/* STARTPERL: + * This variable contains the string to put in front of a perl + * script to make sure (one hopes) that it runs with perl and not + * some shell. + */ +#define STARTPERL "#!/usr/bin/perl" /**/ + +/* HAS_STDIO_STREAM_ARRAY: + * This symbol, if defined, tells that there is an array + * holding the stdio streams. + */ +/* STDIO_STREAM_ARRAY: + * This symbol tells the name of the array holding the stdio streams. + * Usual values include _iob, __iob, and __sF. + */ +/*#define HAS_STDIO_STREAM_ARRAY / **/ +#define STDIO_STREAM_ARRAY + +/* USE_64_BIT_INT: + * This symbol, if defined, indicates that 64-bit integers should + * be used when available. If not defined, the native integers + * will be employed (be they 32 or 64 bits). The minimal possible + * 64-bitness is used, just enough to get 64-bit integers into Perl. + * This may mean using for example "long longs", while your memory + * may still be limited to 2 gigabytes. + */ +/* USE_64_BIT_ALL: + * This symbol, if defined, indicates that 64-bit integers should + * be used when available. If not defined, the native integers + * will be used (be they 32 or 64 bits). The maximal possible + * 64-bitness is employed: LP64 or ILP64, meaning that you will + * be able to use more than 2 gigabytes of memory. This mode is + * even more binary incompatible than USE_64_BIT_INT. You may not + * be able to run the resulting executable in a 32-bit CPU at all or + * you may need at least to reboot your OS to 64-bit mode. + */ +#ifndef USE_64_BIT_INT +#define USE_64_BIT_INT /**/ +#endif + +#ifndef USE_64_BIT_ALL +#define USE_64_BIT_ALL /**/ +#endif + +/* USE_FAST_STDIO: + * This symbol, if defined, indicates that Perl should + * be built to use 'fast stdio'. + * Defaults to define in Perls 5.8 and earlier, to undef later. + */ +#ifndef USE_FAST_STDIO +/*#define USE_FAST_STDIO / **/ +#endif + +/* USE_LARGE_FILES: + * This symbol, if defined, indicates that large file support + * should be used when available. + */ +#ifndef USE_LARGE_FILES +#define USE_LARGE_FILES /**/ +#endif + +/* USE_LONG_DOUBLE: + * This symbol, if defined, indicates that long doubles should + * be used when available. + */ +#ifndef USE_LONG_DOUBLE +/*#define USE_LONG_DOUBLE / **/ +#endif + +/* USE_MORE_BITS: + * This symbol, if defined, indicates that 64-bit interfaces and + * long doubles should be used when available. + */ +#ifndef USE_MORE_BITS +/*#define USE_MORE_BITS / **/ +#endif + +/* MULTIPLICITY: + * This symbol, if defined, indicates that Perl should + * be built to use multiplicity. + */ +#ifndef MULTIPLICITY +/*#define MULTIPLICITY / **/ +#endif + +/* USE_PERLIO: + * This symbol, if defined, indicates that the PerlIO abstraction should + * be used throughout. If not defined, stdio should be + * used in a fully backward compatible manner. + */ +#ifndef USE_PERLIO +/*#define USE_PERLIO / **/ +#endif + +/* USE_SOCKS: + * This symbol, if defined, indicates that Perl should + * be built to use socks. + */ +#ifndef USE_SOCKS +/*#define USE_SOCKS / **/ +#endif + +#endif diff --git a/package/mutt/Makefile b/package/mutt/Makefile index cf698f6d3..89d85d7c6 100644 --- a/package/mutt/Makefile +++ b/package/mutt/Makefile @@ -21,6 +21,7 @@ $(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_ CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --includedir=${WRKBUILD}/. \ --oldincludedir=${WRKBUILD}/. \ + --with-homespool="~/Maildir" \ --enable-pop \ --enable-imap \ --with-ssl diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 76c7e66cc..bb36d9a2b 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,32 +5,38 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net -PKG_DEPENDS:= portmap libtirpc -PKG_BUILDDEP+= libtirpc +PKG_DEPENDS:= kmod-nfsd + ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y) +PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss endif + +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y) +PKG_DEPENDS+= libtirpc rpcbind +PKG_BUILDDEP+= libtirpc rpcbind +else +PKG_DEPENDS:= portmap +endif + PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_FLAVOURS:= WITH_KERBEROS +PKG_FLAVOURS:= WITH_KERBEROS WITH_TIRPC PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) +PKGFD_WITH_TIRPC:= enable Transport Independent RPC include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) -PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue -endif - $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TCPPFLAGS+= -I${LINUX_DIR}/include +#TCPPFLAGS+= -I${LINUX_DIR}/include ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) CONFIGURE_ARGS+= --enable-nfsv4 \ @@ -42,11 +48,16 @@ CONFIGURE_ARGS+= --disable-nfsv4 \ --disable-gss endif +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y) +CONFIGURE_ARGS+= --enable-tirpc \ + --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc +else +CONFIGURE_ARGS+= --disable-tirpc +endif + CONFIGURE_ENV+= knfsd_cv_bsd_signals=no \ ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ARGS+= --without-tcp-wrappers \ - --enable-tirpc \ - --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \ --disable-uuid CONFIGURE_STYLE:= gnu @@ -54,20 +65,23 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc + ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc ${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc - ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \ + ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports - ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \ + ${IDIR_NFS_UTILS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \ + ${IDIR_NFS_UTILS}/usr/sbin/ ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc - ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/ - ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd ${IDIR_NFS_UTILS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \ + ${IDIR_NFS_UTILS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \ + ${IDIR_NFS_UTILS}/usr/sbin/ + ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \ + ${IDIR_NFS_UTILS}/usr/sbin/ endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst index bfb7481d0..131ed1608 100644 --- a/package/nfs-utils/files/nfs-utils.postinst +++ b/package/nfs-utils/files/nfs-utils.postinst @@ -2,7 +2,7 @@ . $IPKG_INSTROOT/etc/functions.sh add_rcconf "kernel nfs server" nfs_server NO add_rcconf "kernel nfs server version" nfs_server_version 3 -add_service nfs 2049/tdp +add_service nfs 2049/tcp add_service nfs 2049/udp gid=$(get_next_gid) add_group nfs $gid diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init index 9379d6a39..8d438e219 100644 --- a/package/nfs-utils/files/nfsd.init +++ b/package/nfs-utils/files/nfsd.init @@ -21,7 +21,6 @@ start) /usr/sbin/exportfs -r /usr/sbin/mountd /usr/sbin/nfsd - /usr/sbin/statd if [ ${nfs_server_version} -eq 4 ];then mkdir -p /var/lib/nfs/rpc_pipefs mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs @@ -32,7 +31,6 @@ start) stop) pkill nfsd pkill mountd - pkill statd if [ ${nfs_server_version} -eq 4 ];then pkill idmapd pkill svcgssd diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in new file mode 100644 index 000000000..16af3373b --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in @@ -0,0 +1,66 @@ +--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in 2009-11-04 12:15:52.000000000 +0100 ++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in 2010-01-16 11:01:44.015625000 +0100 +@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$ + rpcgen_OBJECTS = $(am_rpcgen_OBJECTS) + rpcgen_LDADD = $(LDADD) + rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \ +- $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(rpcgen_CFLAGS) \ ++ $(rpcgen_LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CFLAGS) $(HOSTCFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \ ++ -o $@ + SOURCES = $(rpcgen_SOURCES) + DIST_SOURCES = $(rpcgen_SOURCES) + ETAGS = etags +@@ -100,10 +100,10 @@ AWK = @AWK@ + CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ + CC_FOR_BUILD = @CC_FOR_BUILD@ +-CFLAGS = @CFLAGS@ ++CFLAGS = + CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = + CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ +@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P + K5VERS = @K5VERS@ + KRBCFLAGS = @KRBCFLAGS@ + KRBDIR = @KRBDIR@ +-KRBLDFLAGS = @KRBLDFLAGS@ ++KRBLDFLAGS = + KRBLIBS = @KRBLIBS@ + LD = @LD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = + LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ + LIBBLKID = @LIBBLKID@ + LIBBSD = @LIBBSD@ +@@ -299,7 +299,7 @@ clean-noinstPROGRAMS: + rm -f $$list + rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) + @rm -f rpcgen$(EXEEXT) +- $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) ++ $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c new file mode 100644 index 000000000..5bc54e758 --- /dev/null +++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c @@ -0,0 +1,12 @@ +--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c 2010-01-16 11:22:02.359375000 +0100 +@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in + f_print(fout, "#include <sys/types.h>\n"); + + f_print(fout, "#include <memory.h>\n"); +-#ifndef linux +- f_print(fout, "#include <stropts.h>\n"); +-#endif + if (inetdflag || !tirpcflag ) { + f_print(fout, "#include <sys/socket.h>\n"); + f_print(fout, "#include <netinet/in.h>\n"); diff --git a/package/nspr/Makefile b/package/nspr/Makefile index c4d45dcec..f06b9564a 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= libs PKG_URL:= http://www.mozilla.org/projects/nspr/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PKG_VERSION}/src/ +PKG_TARGET_DEPENDS:= !foxboard + WRKSRC= ${WRKDIST}/mozilla/nsprpub include $(TOPDIR)/mk/package.mk diff --git a/package/nss/Makefile b/package/nss/Makefile index 19f53ea3a..f84afc8ab 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -14,6 +14,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ +PKG_TARGET_DEPENDS:= !foxboard + WRKSRC= ${WRKDIST}/mozilla/security/nss include $(TOPDIR)/mk/package.mk diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 6aa819a3d..3b724edbc 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -12,11 +12,11 @@ PKG_SECTION:= net PKG_DEPENDS:= zlib libopenssl PKG_BUILDDEP+= zlib openssl ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y) -PKG_DEPENDS+= krb5-libs +PKG_DEPENDS+= krb5-libs libcom-err PKG_BUILDDEP+= krb5 endif ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y) -PKG_DEPENDS+= heimdal-libs +PKG_DEPENDS+= heimdal-libs libcom-err PKG_BUILDDEP+= heimdal endif PKG_URL:= http://www.openssh.com diff --git a/package/openssh/files/sshd.init b/package/openssh/files/sshd.init index 149da9dc4..1a2db6ada 100644 --- a/package/openssh/files/sshd.init +++ b/package/openssh/files/sshd.init @@ -8,7 +8,7 @@ case $1 in autostop) ;; autostart) [[ $openssh = NO ]] && exit 0 - grep dropbear /etc/rc.conf >/dev/null 2>&1 || dropbear=NO + grep "^dropbear" /etc/rc.conf >/dev/null 2>&1 || dropbear=NO if [[ $openssh = AUTO && $dropbear != NO ]]; then echo openssh not starting: set to AUTO and dropbear is enabled exit 0 diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c index 0c616e07c..0da5f9ad1 100644 --- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c +++ b/package/openswan/patches/patch-lib_libopenswan_alg_info_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openswan-2.6.18.orig/lib/libopenswan/alg_info.c 2008-10-06 18:52:49.000000000 +0200 -+++ openswan-2.6.18/lib/libopenswan/alg_info.c 2008-10-14 13:08:49.000000000 +0200 -@@ -749,7 +749,7 @@ alg_info_discover_pfsgroup_hack(struct a +--- openswan-2.6.24.orig/lib/libopenswan/alg_info.c 2010-01-10 02:34:38.000000000 +0100 ++++ openswan-2.6.24/lib/libopenswan/alg_info.c 2010-01-19 23:28:18.000000000 +0100 +@@ -765,7 +765,7 @@ alg_info_discover_pfsgroup_hack(struct a static char err_buf[256]; int ret; diff --git a/package/parted/Makefile b/package/parted/Makefile index f845eb866..6323c875c 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 -PKG_BUILDDEP+= e2fsprogs lvm readline PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted -PKG_DEPENDS:= libuuid libreadline device-mapper PKG_SECTION:= admin +PKG_DEPENDS:= libuuid libreadline device-mapper libpthread +PKG_BUILDDEP+= e2fsprogs lvm readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile new file mode 100644 index 000000000..aea5877f9 --- /dev/null +++ b/package/pdnsd/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= pdnsd +PKG_VERSION:= 1.2.7 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 114b3b21b09b43cbfcccdde726b84c12 +PKG_DESCR:= Proxy DNS server with permanent caching +PKG_SECTION:= net +PKG_DEPENDS:= libpthread +PKG_URL:= http://www.phys.uu.nl/~rombouts/pdnsd.html +PKG_SITES:= http://www.phys.uu.nl/~rombouts/pdnsd/releases/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-par.tar.gz + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PDNSD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_PDNSD)/etc + ${INSTALL_DATA} ./files/pdnsd.conf ${IDIR_PDNSD}/etc/ + $(INSTALL_DIR) $(IDIR_PDNSD)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/pdnsd{,-ctl} $(IDIR_PDNSD)/usr/sbin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/pdnsd/files/pdnsd.conf b/package/pdnsd/files/pdnsd.conf new file mode 100644 index 000000000..00b548117 --- /dev/null +++ b/package/pdnsd/files/pdnsd.conf @@ -0,0 +1,30 @@ +global { + perm_cache=1024; + cache_dir="/var/cache/pdnsd"; # do not change this! + run_as="nobody"; + server_ip = 127.0.0.1; # Use eth0 here if you want to allow other + # machines on your network to query pdnsd. + status_ctl = on; +# paranoid=on; # This option reduces the chance of cache poisoning + # but may make pdnsd less efficient, unfortunately. + query_method=udp_tcp; + min_ttl=15m; # Retain cached entries at least 15 minutes. + max_ttl=1w; # One week. + timeout=10; # Global timeout option (10 seconds). +} + +server { + label= "myisp"; + ip = 192.168.0.1; # Put your ISP's DNS-server address(es) here. +# proxy_only=on; # Do not query any name servers beside your ISP's. + # This may be necessary if you are behind some + # kind of firewall and cannot receive replies + # from outside name servers. + timeout=4; # Server timeout; this may be much shorter + # that the global timeout option. + uptest=if; # Test if the network interface is active. + interface=eth0; # The name of the interface to check. + interval=10m; # Check every 10 minutes. + purge_cache=off; # Keep stale cache entries in case the ISP's + # DNS servers go offline. +} diff --git a/package/pdnsd/files/pdnsd.conffiles b/package/pdnsd/files/pdnsd.conffiles new file mode 100644 index 000000000..c2ae46acb --- /dev/null +++ b/package/pdnsd/files/pdnsd.conffiles @@ -0,0 +1 @@ +/etc/pdnsd.conf diff --git a/package/pdnsd/files/pdnsd.init b/package/pdnsd/files/pdnsd.init new file mode 100644 index 000000000..0da77186d --- /dev/null +++ b/package/pdnsd/files/pdnsd.init @@ -0,0 +1,31 @@ +#!/bin/sh +#PKG pdnsd +#INIT 60 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${pdnsd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + [ -f /etc/pdnsd.conf ] || exit + mkdir -p /var/cache/pdnsd + pdnsd -s -t -d + ;; +stop) + pkill pdnsd + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/pdnsd/files/pdnsd.postinst b/package/pdnsd/files/pdnsd.postinst new file mode 100644 index 000000000..4d63fd712 --- /dev/null +++ b/package/pdnsd/files/pdnsd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf pdnsd pdnsd NO diff --git a/package/pkgmaker b/package/pkgmaker index 4a6ed12a0..7b50517f2 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -261,5 +261,5 @@ EOF ) 4>Config.in 5>Config.in.lib cd .. done -pbar=done -print -u2 "$pbar" +#pbar=done +#print -u2 "$pbar" diff --git a/package/portmap/files/portmap.init b/package/portmap/files/portmap.init index a42c2e2e0..ad0c2b075 100644 --- a/package/portmap/files/portmap.init +++ b/package/portmap/files/portmap.init @@ -15,7 +15,7 @@ start) portmap -t /tmp/.portmap ;; stop) - kill $(pidof portmap|cut -d ' ' -f 3) + pkill portmap ;; restart) sh $0 stop diff --git a/package/portmap/files/portmap.postinst b/package/portmap/files/portmap.postinst index 1017d2251..b8b30f45b 100644 --- a/package/portmap/files/portmap.postinst +++ b/package/portmap/files/portmap.postinst @@ -3,3 +3,6 @@ add_rcconf portmap add_group portmap 20 add_user portmap 20 20 /tmp/.portmap +add_service sunrpc 111/tcp +add_service sunrpc 111/udp + diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile new file mode 100644 index 000000000..4dcd04eca --- /dev/null +++ b/package/proftpd/Makefile @@ -0,0 +1,35 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= proftpd +PKG_VERSION:= 1.3.2b +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4918908fcae9e591ba84c66edff73410 +PKG_DESCR:= An advanced and very configurable FTP server +PKG_SECTION:= utils +PKG_URL:= http://www.proftpd.org/ +PKG_SITES:= ftp://ftp.proftpd.org/distrib/source/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --disable-cap +CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ + ac_cv_func_setgrent_void=yes +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_PROFTPD)/etc + $(INSTALL_DATA) ./files/proftpd.conf $(IDIR_PROFTPD)/etc/ + $(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} \ + $(IDIR_PROFTPD)/usr/bin/ + $(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \ + $(IDIR_PROFTPD)/usr/sbin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/proftpd/files/proftpd.conf b/package/proftpd/files/proftpd.conf new file mode 100644 index 000000000..8d4f7f2fa --- /dev/null +++ b/package/proftpd/files/proftpd.conf @@ -0,0 +1,60 @@ +ServerName "ProFTPD Default Installation" +ServerType standalone +DefaultServer on + +# Port 21 is the standard FTP port. +Port 21 + +# Don't use IPv6 support by default. +UseIPv6 off + +# Umask 022 is a good standard umask to prevent new dirs and files +# from being group and world writable. +Umask 022 + +# To prevent DoS attacks, set the maximum number of child processes +# to 30. If you need to allow more than 30 concurrent connections +# at once, simply increase this value. Note that this ONLY works +# in standalone mode, in inetd mode you should use an inetd server +# that allows you to limit maximum number of processes per service +# (such as xinetd). +MaxInstances 30 + +# Set the user and group under which the server will run. +User nobody +Group nogroup + +# To cause every FTP user to be "jailed" (chrooted) into their home +# directory, uncomment this line. +#DefaultRoot ~ + +# Normally, we want files to be overwriteable. +AllowOverwrite on + +# Bar use of SITE CHMOD by default +<Limit SITE_CHMOD> + DenyAll +</Limit> + +# A basic anonymous configuration, no upload directories. If you do not +# want anonymous users, simply delete this entire <Anonymous> section. +<Anonymous ~ftp> + User ftp + Group ftp + + # We want clients to be able to login with "anonymous" as well as "ftp" + UserAlias anonymous ftp + + # Limit the maximum number of anonymous logins + MaxClients 10 + + # We want 'welcome.msg' displayed at login, and '.message' displayed + # in each newly chdired directory. + DisplayLogin welcome.msg + DisplayChdir .message + + # Limit WRITE everywhere in the anonymous chroot + <Limit WRITE> + DenyAll + </Limit> +</Anonymous> diff --git a/package/proftpd/files/proftpd.conffiles b/package/proftpd/files/proftpd.conffiles new file mode 100644 index 000000000..9796c366f --- /dev/null +++ b/package/proftpd/files/proftpd.conffiles @@ -0,0 +1 @@ +/etc/proftpd.conf diff --git a/package/proftpd/files/proftpd.init b/package/proftpd/files/proftpd.init new file mode 100644 index 000000000..bf3dc0efe --- /dev/null +++ b/package/proftpd/files/proftpd.init @@ -0,0 +1,30 @@ +#!/bin/sh +#PKG proftpd +#INIT 60 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${proftpd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + [ -f /etc/proftpd.conf ] || exit + proftpd + ;; +stop) + pkill proftpd + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/proftpd/files/proftpd.postinst b/package/proftpd/files/proftpd.postinst new file mode 100644 index 000000000..0b3fa08aa --- /dev/null +++ b/package/proftpd/files/proftpd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf proftpd proftpd NO diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in new file mode 100644 index 000000000..6f12634fa --- /dev/null +++ b/package/proftpd/patches/patch-Make_rules_in @@ -0,0 +1,16 @@ + do not try to set user or group id when installing +--- proftpd-1.3.2b.orig/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 ++++ proftpd-1.3.2b/Make.rules.in 2010-01-27 23:00:19.000000000 +0100 +@@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ + INSTALL=@INSTALL@ + INSTALL_USER=@install_user@ + INSTALL_GROUP=@install_group@ +-INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 ++INSTALL_BIN=$(INSTALL) -m 0755 ++INSTALL_SBIN=$(INSTALL) -m 0755 ++INSTALL_MAN=$(INSTALL) -m 0644 + + RM=rm -f + SHELL=/bin/sh diff --git a/package/proftpd/patches/patch-Makefile_in b/package/proftpd/patches/patch-Makefile_in new file mode 100644 index 000000000..338a3b691 --- /dev/null +++ b/package/proftpd/patches/patch-Makefile_in @@ -0,0 +1,33 @@ + hiding it won't help, we install as non-root so no chown possible +--- proftpd-1.3.2b.orig/Makefile.in 2008-11-19 04:51:38.000000000 +0100 ++++ proftpd-1.3.2b/Makefile.in 2010-01-20 18:03:40.552178286 +0100 +@@ -76,7 +76,6 @@ check: proftpd$(EXEEXT) + $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc + rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ + fi + ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd +- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd + + install-libs: $(DESTDIR)$(libdir)/proftpd + cd lib/ && $(MAKE) install +@@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE + $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs ++ $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs + + install-conf: $(DESTDIR)$(sysconfdir) + if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ ++ $(INSTALL) -m 0644 \ + $(top_srcdir)/sample-configurations/basic.conf \ + $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ + fi diff --git a/package/proftpd/patches/patch-locale_Makefile_in b/package/proftpd/patches/patch-locale_Makefile_in new file mode 100644 index 000000000..91f274ebd --- /dev/null +++ b/package/proftpd/patches/patch-locale_Makefile_in @@ -0,0 +1,11 @@ + drop anything that has to do with owner/group changing *grrr* +--- proftpd-1.3.2b.orig/locale/Makefile.in 2009-04-29 00:50:22.000000000 +0200 ++++ proftpd-1.3.2b/locale/Makefile.in 2010-01-20 18:03:53.909480484 +0100 +@@ -51,7 +51,6 @@ install: $(LANGS) + if [ -f $$lang.mo ]; then \ + if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \ + mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + fi; \ + $(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ diff --git a/package/quagga/Makefile b/package/quagga/Makefile index b5985255d..0f57fb919 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -41,6 +41,7 @@ CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --enable-vtysh \ --enable-user=quagga \ --enable-group=quagga \ + --disable-pie \ --enable-multipath=8 BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile new file mode 100644 index 000000000..6e0769681 --- /dev/null +++ b/package/rng-tools/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= rng-tools +PKG_VERSION:= 2 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 63d503191eabed630324c104cc024475 +PKG_DESCR:= Daemon to use hardware random number generators. +PKG_SECTION:= utils +PKG_URL:= http://gkernel.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=gkernel/} + +CFLINE_RNG_TOOLS:= depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RNG_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_RNG_TOOLS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/rngd $(IDIR_RNG_TOOLS)/usr/sbin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rng-tools/files/rng-tools.postinst b/package/rng-tools/files/rng-tools.postinst new file mode 100644 index 000000000..4e769fe4b --- /dev/null +++ b/package/rng-tools/files/rng-tools.postinst @@ -0,0 +1,2 @@ +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf rngd rngd NO diff --git a/package/rng-tools/files/rngd.init b/package/rng-tools/files/rngd.init new file mode 100644 index 000000000..1464209c0 --- /dev/null +++ b/package/rng-tools/files/rngd.init @@ -0,0 +1,40 @@ +#!/bin/sh +#PKG rng-tools +#INIT 60 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${rngd:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + devnode="" + for node in hw_random hwrandom i810_rng hwrng; do + if [ -e /dev/$node ]; then + devnode=/dev/$node + break + fi + done + if [ -z "$devnode" ]; then + echo "no hardware RNG found, falling back to /dev/urandom" + devnode=/dev/urandom + fi + rngd -b -r $devnode + ;; +stop) + pkill rngd + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/rng-tools/patches/rngd_tpm_support.patch b/package/rng-tools/patches/rngd_tpm_support.patch new file mode 100644 index 000000000..0edc47109 --- /dev/null +++ b/package/rng-tools/patches/rngd_tpm_support.patch @@ -0,0 +1,288 @@ +Patch taken from http://sourceforge.net/tracker/?func=detail&aid=2261574&group_id=3242&atid=353242 + +diff -uNr rng-tools-2-orig/rngd.c rng-tools-2/rngd.c +--- rng-tools-2-orig/rngd.c 2004-08-24 23:30:00.000000000 +0530 ++++ rng-tools-2/rngd.c 2008-11-11 15:39:31.000000000 +0530 +@@ -91,6 +91,8 @@ + + { "timeout", 't', "nnn", 0, + "Interval written to random-device when the entropy pool is full, in seconds (default: 60)" }, ++ { "no-tpm", 'n', "1|0", 0, ++ "do not use tpm as a source of random number input (default: 0)" }, + + { 0 }, + }; +@@ -102,6 +104,7 @@ + .random_step = 64, + .fill_watermark = 2048, + .daemon = 1, ++ .no_tpm =0, + }; + struct arguments *arguments = &default_arguments; + +@@ -147,6 +150,15 @@ + arguments->fill_watermark = n; + break; + } ++ case 'n': { ++ int n; ++ if ((sscanf(arg,"%i", &n) == 0) || ((n | 1)!=1)) ++ argp_usage(state); ++ else ++ arguments->no_tpm=0; ++ break; ++ ++ } + + default: + return ARGP_ERR_UNKNOWN; +@@ -162,26 +174,41 @@ + double poll_timeout) + { + unsigned char buf[FIPS_RNG_BUFFER_SIZE]; +- unsigned char *p; +- int fips; ++ int fips,retval; + + for (;;) { +- xread(buf, sizeof buf); ++ if (arguments->no_tpm == 0) { ++ retval=xread_tpm(buf, sizeof buf); ++ if (retval < 0) ++ sleep(1); ++ else ++ update_kernel_random(random_step, ++ poll_timeout, buf, &tpm_fipsctx); ++ } ++ retval=xread(buf, sizeof buf); ++ if (retval > 0) ++ update_kernel_random(random_step, ++ poll_timeout, buf, &fipsctx); ++ } ++} + +- fips = fips_run_rng_test(&fipsctx, buf); ++int update_kernel_random(int random_step, double poll_timeout, ++ unsigned char *buf, fips_ctx_t *fipsctx) { + +- if (fips) { +- message(LOG_DAEMON|LOG_ERR, "failed fips test\n"); +- sleep(1); +- continue; +- } ++ int fips; ++ unsigned char *p; ++ fips = fips_run_rng_test(fipsctx, buf); ++ if (fips) { ++ message(LOG_DAEMON|LOG_ERR, "failed fips test\n"); ++ return 1; ++ } + +- for (p = buf; p + random_step <= &buf[sizeof buf]; +- p += random_step) { +- random_add_entropy(p, random_step); +- random_sleep(poll_timeout); +- } ++ for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE]; ++ p += random_step) { ++ random_add_entropy(p, random_step); ++ random_sleep(poll_timeout); + } ++ return 0; + } + + +diff -uNr rng-tools-2-orig/rngd_entsource.c rng-tools-2/rngd_entsource.c +--- rng-tools-2-orig/rngd_entsource.c 2004-04-15 10:36:17.000000000 +0530 ++++ rng-tools-2/rngd_entsource.c 2008-11-11 15:39:31.000000000 +0530 +@@ -35,6 +35,7 @@ + #include <errno.h> + #include <syslog.h> + #include <string.h> ++#include <signal.h> + + #include "rngd.h" + #include "fips.h" +@@ -42,17 +43,27 @@ + #include "rngd_entsource.h" + + +-/* Logic and contexts */ +-static int rng_fd; /* rng data source */ +-fips_ctx_t fipsctx; /* Context for the FIPS tests */ ++/* The overhead incured when tpm returns the random nos as per TCG spec ++ * it is 14 bytes.*/ ++#define TPM_GET_RNG_OVERHEAD 14 + ++static const char *rng_device="/dev/tpm0"; ++/* Logic and contexts */ ++static int rng_fd; /* rng data source */ ++fips_ctx_t fipsctx; /* Context for the FIPS tests */ ++fips_ctx_t tpm_fipsctx; /* Context for the tpm FIPS tests */ + + /* Read data from the entropy source */ +-void xread(void *buf, size_t size) ++int xread(void *buf, size_t size) + { + size_t off = 0; + ssize_t r; + ++ /* Do nothing if we have no hw rng, maybe we have tpm */ ++ if (rng_fd < 0) { ++ message(LOG_DAEMON|LOG_ERR, "Invalid file handle\n"); ++ return -1; ++ } + while (size > 0) { + do { + r = read(rng_fd, buf + off, size); +@@ -65,8 +76,85 @@ + + if (size) { + message(LOG_DAEMON|LOG_ERR, "read error\n"); +- exit(1); ++ return -1; ++ } ++ return 0; ++} ++ ++alarm_handler(int i) { ++ ; ++} ++/* tpm rng read call to kernel has 13 bytes of overhead ++ * the logic to process this involves reading to a temporary_buf ++ * and copying the no generated to buf*/ ++int xread_tpm(void *buf, size_t size) ++{ ++ size_t bytes_read = 0; ++ ssize_t r; ++ int retval,rngtpm_fd; ++ unsigned char *temp_buf=NULL; ++ unsigned char rng_cmd[] = { ++ 0, 193, /* TPM_TAG_RQU_COMMAND */ ++ 0, 0, 0, 14, /* length */ ++ 0, 0, 0, 70, /* TPM_ORD_GetRandom */ ++ 0, 0, 0, 0, /* number of bytes to return */ ++ }; ++ char *offset; ++ ++ rngtpm_fd=open(rng_device, O_RDWR); ++ if (rngtpm_fd < 0) { ++ message(LOG_ERR|LOG_INFO, ++ "Unable to open %s: %s\n",rng_device,strerror(errno)); ++ return -1; ++ } ++ ++ temp_buf= (unsigned char *) malloc(size + TPM_GET_RNG_OVERHEAD); ++ memset(temp_buf,0,(size+TPM_GET_RNG_OVERHEAD)); ++ if (temp_buf == NULL) { ++ message(LOG_ERR|LOG_INFO,"No memory"); ++ return -1; ++ } ++ /* 32 bits has been reserved for random byte size */ ++ rng_cmd[13]=(unsigned char)(size & 0xFF); ++ rng_cmd[12]=(unsigned char)((size >> 8) & 0xFF); ++ rng_cmd[11]=(unsigned char)((size >> 16) & 0xFF); ++ rng_cmd[10]=(unsigned char)((size >> 24) & 0xFF); ++ offset=buf; ++ while (bytes_read < size) { ++ r=0; ++ while (r < sizeof(rng_cmd)) { ++ retval=write(rngtpm_fd,rng_cmd + r,sizeof(rng_cmd)-r); ++ if (retval < 0) { ++ message(LOG_ERR|LOG_INFO, ++ "Error writing %s\n",rng_device); ++ retval=-1; ++ goto error_out; ++ } ++ r+=retval; ++ } ++ if (r < sizeof(rng_cmd)) { ++ message(LOG_ERR|LOG_INFO, ++ "Error writing %s\n",rng_device); ++ retval=-1; ++ goto error_out; ++ } ++ r=read(rngtpm_fd,temp_buf,size); ++ r=(r - TPM_GET_RNG_OVERHEAD); ++ bytes_read=bytes_read + r; ++ if (bytes_read > size) { ++ memcpy(offset,temp_buf + TPM_GET_RNG_OVERHEAD, ++ r - (bytes_read - size)); ++ break; ++ } ++ memcpy(offset, temp_buf + TPM_GET_RNG_OVERHEAD, ++ r); ++ offset=offset+r; + } ++ retval=0; ++error_out: ++ free(temp_buf); ++ close(rngtpm_fd); ++ return retval; + } + + /* Initialize entropy source */ +@@ -93,14 +181,31 @@ + */ + void init_entropy_source(const char* sourcedev) + { ++ /* We cannot keep the tpm device open always. ++ * We need to open get random data and close ++ * to allow tpm-tools and other utilities ++ * access to /dev/tpm */ ++ int tpm_fd; + rng_fd = open(sourcedev, O_RDONLY); + if (rng_fd == -1) { + message(LOG_DAEMON|LOG_ERR, "can't open %s: %s", + sourcedev, strerror(errno)); +- exit(EXIT_FAIL); ++ /* Try to open tpm this is just a test, no point in proceeding further ++ * if no source of entropy is present ++ */ ++ tpm_fd = open(rng_device, O_RDONLY); ++ if (tpm_fd < 0 ) { ++ message(LOG_DAEMON|LOG_ERR, ++ "can't open entropy source(tpm or intel/amd rng) %s", ++ strerror(errno)); ++ message(LOG_DAEMON|LOG_ERR,"Maybe RNG device modules are not loaded\n"); ++ exit(1); ++ } ++ close(tpm_fd); + } + + /* Bootstrap FIPS tests */ + fips_init(&fipsctx, discard_initial_data()); ++ fips_init(&tpm_fipsctx, 0); + } + +diff -uNr rng-tools-2-orig/rngd_entsource.h rng-tools-2/rngd_entsource.h +--- rng-tools-2-orig/rngd_entsource.h 2004-04-15 10:34:45.000000000 +0530 ++++ rng-tools-2/rngd_entsource.h 2008-11-11 15:39:31.000000000 +0530 +@@ -28,7 +28,7 @@ + + /* Logic and contexts */ + extern fips_ctx_t fipsctx; /* Context for the FIPS tests */ +- ++extern fips_ctx_t tpm_fipsctx; /* Context for the tpm FIPS tests */ + /* + * Initialize entropy source and entropy conditioning + * +@@ -37,6 +37,6 @@ + extern void init_entropy_source(const char* sourcedev); + + /* Read data from the entropy source */ +-void xread(void *buf, size_t size); ++int xread(void *buf, size_t size); + + #endif /* RNGD_ENTSOURCE__H */ +diff -uNr rng-tools-2-orig/rngd.h rng-tools-2/rngd.h +--- rng-tools-2-orig/rngd.h 2004-08-24 23:23:04.000000000 +0530 ++++ rng-tools-2/rngd.h 2008-11-11 15:39:31.000000000 +0530 +@@ -42,6 +42,7 @@ + double poll_timeout; + + int daemon; ++ int no_tpm; + }; + extern struct arguments *arguments; + diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile new file mode 100644 index 000000000..6afd4b8bd --- /dev/null +++ b/package/rpcbind/Makefile @@ -0,0 +1,36 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= rpcbind +PKG_VERSION:= 0.2.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316 +PKG_DESCR:= converts RPC program numbers into universal addresses +PKG_SECTION:= net +PKG_DEPENDS:= libtirpc +PKG_BUILDDEP+= libtirpc +PKG_URL:= http://sourceforge.net/projects/rpcbind/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rpcbind/} + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +TCFLAGS+= -I${STAGING_DIR}/usr/include/tirpc +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --disable-libwrap +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcbind \ + $(IDIR_RPCBIND)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcinfo \ + $(IDIR_RPCBIND)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init new file mode 100644 index 000000000..d11f01100 --- /dev/null +++ b/package/rpcbind/files/rpcbind.init @@ -0,0 +1,28 @@ +#!/bin/sh +#PKG rpcbind +#INIT 60 + +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${rpcbind:-NO}" = x"NO" && exit 0 + exec sh $0 start + ;; +start) + rpcbind + ;; +stop) + pkill rpcbind + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/rpcbind/files/rpcbind.postinst b/package/rpcbind/files/rpcbind.postinst new file mode 100644 index 000000000..7d26be995 --- /dev/null +++ b/package/rpcbind/files/rpcbind.postinst @@ -0,0 +1,5 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf rpcbind +add_service rpcbind 111/tcp +add_service rpcbind 111/udp diff --git a/package/rpcbind/patches/patch-src_Makefile_in b/package/rpcbind/patches/patch-src_Makefile_in new file mode 100644 index 000000000..037bff1b3 --- /dev/null +++ b/package/rpcbind/patches/patch-src_Makefile_in @@ -0,0 +1,11 @@ +--- rpcbind-0.2.0.orig/src/Makefile.in 2009-05-29 18:37:50.000000000 +0200 ++++ rpcbind-0.2.0/src/Makefile.in 2010-01-31 17:27:20.000000000 +0100 +@@ -207,7 +207,7 @@ rpcinfo_LDFLAGS = -lpthread -ltirpc + rpcinfo_LDADD = $(LIB_TIRPC) + rpcbind_LDFLAGS = -lpthread -ltirpc + rpcbind_LDADD = $(LIB_TIRPC) +-AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \ ++AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \ + -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO + + all: config.h diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 89b50a647..49c7f8339 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -6,13 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm PKG_VERSION:= 4.7.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= nss libdb PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 PKG_DESCR:= Package Manager PKG_SECTION:= base +PKG_BUILDDEP+= nss libdb PKG_URL:= http://www.rpm.org PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile new file mode 100644 index 000000000..e6ac62eb3 --- /dev/null +++ b/package/rxvt-unicode/Makefile @@ -0,0 +1,34 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= rxvt-unicode +PKG_VERSION:= 9.07 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 49bb52c99e002bf85eb41d8385d903b5 +PKG_DESCR:= x-term with unicode support +PKG_SECTION:= x11 +PKG_DEPENDS:= libx11 +PKG_BUILDDEP+= libX11 +PKG_URL:= http://software.schmorp.de/pkg/rxvt-unicode.html +PKG_SITES:= http://dist.schmorp.de/rxvt-unicode/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RXVT_UNICODE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ARGS+= --disable-perl \ + --disable-utmp +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_RXVT_UNICODE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/urxvt \ + $(IDIR_RXVT_UNICODE)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/screen/Makefile b/package/screen/Makefile index 424c3de5f..01451b900 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= screen PKG_VERSION:= 4.0.3 -PKG_RELEASE:= 1 -PKG_BUILDDEP+= ncurses +PKG_RELEASE:= 2 PKG_MD5SUM:= 8506fd205028a96c741e4037de6e3c42 PKG_DESCR:= A window manager for the terminal session PKG_SECTION:= misc PKG_DEPENDS:= libncurses +PKG_BUILDDEP+= ncurses PKG_URL:= http://www.gnu.org/software/screen PKG_SITES:= ${MASTER_SITE_GNU:=screen/} diff --git a/package/screen/patches/patch-Makefile b/package/screen/patches/patch-Makefile deleted file mode 100644 index 852a91342..000000000 --- a/package/screen/patches/patch-Makefile +++ /dev/null @@ -1,336 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/Makefile 2006-10-23 15:06:32.000000000 +0200 -+++ screen-4.0.3/Makefile 2008-12-08 04:54:09.000000000 +0100 -@@ -1,3 +1,331 @@ --install all Makefiles and config: -+# -+# Makefile template for screen -+# -+# See machine dependant config.h for more configuration options. -+# -+ -+srcdir = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3 -+VPATH = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3 -+ -+DESTDIR = -+ -+# Where to install screen. -+ -+prefix = /usr -+exec_prefix = ${prefix} -+ -+# don't forget to change mandir and infodir in doc/Makefile. -+bindir = $(exec_prefix)/bin -+ -+VERSION = 4.0.3 -+SCREEN = screen-$(VERSION) -+ -+ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'` -+SCREENENCODINGS = `sed < config.h -n -e '/define SCREENENCODINGS/s/^.*"\([^"]*\)"/\1/p'` -+ -+CC = /home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc -+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=i586 -+CPPFLAGS = -isystem /home/wbx/openadk/cross_x86/target/include -isystem /home/wbx/openadk/cross_x86/target/usr/include -DNDEBUG -+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_x86/target/usr/lib -L/home/wbx/openadk/cross_x86/target/lib -L/home/wbx/openadk/cross_x86/target/usr/lib -+LIBS = -lcurses -lutil -lcrypt -+ -+CPP=/home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc -E -+CPP_DEPEND=$(CC) -MM -+ -+INSTALL = /usr/bin/install -c -+INSTALL_PROGRAM = ${INSTALL} -+INSTALL_DATA = ${INSTALL} -m 644 -+ -+AWK = gawk -+ -+### Chose some debug configuration options: -+# -DDEBUG -+# Turn on really heavy debug output. This is written to -+# /tmp/debug/{SCREEN,screen}.<pid>. Look at these files and quote -+# questionable sections when sending bug-reports to the author. -+# -DDUMPSHADOW -+# With shadow-pw screen would never dump core. Use this option if -+# you still want to have a core. Use only for debugging. -+OPTIONS= -+#OPTIONS= -DDEBUG -+ -+SHELL=/bin/sh -+ -+CFILES= screen.c ansi.c fileio.c mark.c misc.c resize.c socket.c \ -+ search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \ -+ termcap.c input.c attacher.c pty.c process.c display.c comm.c \ -+ kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \ -+ sched.c teln.c nethack.c encoding.c -+OFILES= screen.o ansi.o fileio.o mark.o misc.o resize.o socket.o \ -+ search.o tty.o term.o window.o utmp.o loadav.o putenv.o help.o \ -+ termcap.o input.o attacher.o pty.o process.o display.o comm.o \ -+ kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \ -+ sched.o teln.o nethack.o encoding.o -+ -+all: screen -+ -+screen: $(OFILES) -+ $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) -+ -+.c.o: -+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< -+ -+install_bin: .version screen -+ -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -+ then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi -+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+# This doesn't work if $(bindir)/screen is a symlink -+ -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi -+ rm -f $(DESTDIR)$(bindir)/screen -+ (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen) -+ cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -+ -+############################################################################### -+install: installdirs install_bin -+ cd doc ; $(MAKE) install -+ -if [ -d /usr/lib/terminfo ]; then \ -+ PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ -+ chmod 644 /usr/lib/terminfo/s/screen*; \ -+ fi -+# Better do this by hand. E.g. under RCS... -+# cat ${srcdir}/terminfo/screencap >> /etc/termcap -+ @echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually." -+ @echo "You may also want to install $(srcdir)/etc/etcscreenrc in" $(ETCSCREENRC) -+ -+installdirs: -+# Path leading to ETCSCREENRC and Socketdirectory not checked. -+ $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS) -+ cd doc ; $(MAKE) installdirs -+ -+uninstall: .version -+ rm -f $(DESTDIR)$(bindir)/$(SCREEN) -+ rm -f $(DESTDIR)$(bindir)/screen -+ -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen -+ rm -f $(DESTDIR)$(ETCSCREENRC) -+ cd doc; $(MAKE) uninstall -+ -+shadow: -+ mkdir shadow; -+ cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc . -+ rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h -+ echo "install all Makefiles and config:" > shadow/Makefile -+ echo " rm -f config.cache" >> shadow/Makefile -+ echo " sh ./configure" >> shadow/Makefile -+ -+term.h: term.c term.sh -+ AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh -+ -+kmapdef.c: term.h -+ -+tty.c: tty.sh -+ sh $(srcdir)/tty.sh tty.c -+ -+comm.h: comm.c comm.sh config.h -+ AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh -+ -+osdef.h: osdef.sh config.h osdef.h.in -+ CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh -+ -+docs: -+ cd doc; $(MAKE) dvi screen.info -+ -+dvi info screen.info: -+ -cd doc; $(MAKE) $@ -+ -+mostlyclean: -+ rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed -+ -+clean celan: mostlyclean -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c core -+ -+# Delete all files from the current directory that are created by -+# configuring or building the program. -+# building of term.h/comm.h requires awk. Keep it in the distribution -+# we keep config.h, as this file knows where 'make dist' finds the ETCSCREENRC. -+#distclean: mostlyclean -+# rm -f $(SCREEN).tar $(SCREEN).tar.gz -+# rm -f config.status Makefile -+# rm -f osdef.h doc/Makefile -+ -+maintainer-clean: -+ @echo "This command is not even intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# Delete everything from the current directory that can be -+# reconstructed with this Makefile. -+realclean: .version mostlyclean -+ rm -f $(SCREEN).tar $(SCREEN).tar.gz -+ rm -f config.status Makefile doc/Makefile -+ rm -f tty.c term.h comm.h osdef.h kmapdef.c -+ rm -f config.h -+ echo "install all Makefiles and config:" > Makefile -+ echo " sh ./configure" >> Makefile -+ -+tags TAGS: $(CFILES) -+ -ctags *.sh $(CFILES) *.h -+ -ctags -e *.sh $(CFILES) *.h -+ -+dist: .version $(SCREEN).tar.gz -+ -+$(SCREEN).tar: .version term.h comm.h tty.c kmapdef.c -+ -rm -rf dist -+ mkdir dist -+ mkdir dist/$(SCREEN) -+ ln acls.h ansi.h display.h extern.h logfile.h mark.h os.h \ -+ layer.h patchlevel.h screen.h window.h image.h \ -+ osdef.h.in term.sh tty.sh comm.sh osdef.sh braille.h \ -+ sched.h \ -+ $(CFILES) \ -+ ChangeLog COPYING INSTALL NEWS* TODO install.sh \ -+ dist/$(SCREEN) -+ cd dist/$(SCREEN); mv tty.c tty.c.dist -+ cd dist/$(SCREEN); mv kmapdef.c kmapdef.c.dist -+ ln configure.in configure dist/$(SCREEN) -+ sed -e 's@"/local/screens@"/tmp/screens@' -e 's@"/local@"/usr/local@g' < config.h.in > dist/$(SCREEN)/config.h.in -+ sed -e 's@[ ]/local@ /usr/local@g' -e 's/^CFLAGS = -g/CFLAGS = -O/' < Makefile.in > dist/$(SCREEN)/Makefile.in -+ ln term.h dist/$(SCREEN)/term.h.dist -+ ln comm.h dist/$(SCREEN)/comm.h.dist -+ ln README dist/$(SCREEN)/README -+ mkdir dist/$(SCREEN)/terminfo -+ cd terminfo; ln 8bits README checktc.c screencap \ -+ screeninfo.src test.txt tetris.c \ -+ ../dist/$(SCREEN)/terminfo -+ mkdir dist/$(SCREEN)/etc -+ cd etc; ln * ../dist/$(SCREEN)/etc -+ mkdir dist/$(SCREEN)/utf8encodings -+ cd utf8encodings; ln * ../dist/$(SCREEN)/utf8encodings -+ # sed -e 's/^startup/#startup/' -e 's/^autodetach/#autodetach/' < $(ETCSCREENRC) > dist/$(SCREEN)/etc/etcscreenrc -+ cp $(HOME)/.screenrc dist/$(SCREEN)/etc/screenrc -+ mkdir dist/$(SCREEN)/doc -+ sed -e 's@/local/emacs@/usr/local@g' < doc/Makefile.in > dist/$(SCREEN)/doc/Makefile.in -+ cd doc; ln FAQ README.DOTSCREEN screen.1 screen.texinfo fdpat.ps make.help window_to_display.ps \ -+ ../dist/$(SCREEN)/doc -+ cd doc; if test -f screen.info; then ln screen.info* \ -+ ../dist/$(SCREEN)/doc; fi -+ cd dist/$(SCREEN)/doc; ln -s ../install.sh . -+ cd dist/$(SCREEN); ln -s doc/FAQ . -+ echo "install all Makefiles and config:" > dist/$(SCREEN)/Makefile -+ echo " rm -f config.cache" >> dist/$(SCREEN)/Makefile -+ echo " sh ./configure" >> dist/$(SCREEN)/Makefile -+ cd dist; tar cf ../$(SCREEN).tar $(SCREEN) -+ rm -rf dist -+ -+$(SCREEN).tar.gz: $(SCREEN).tar -+ gzip -nf $(SCREEN).tar || gzip -f $(SCREEN).tar -+ -+# Perform self-tests (if any). -+check: -+ -+lint: -+ lint -I. $(CFILES) -+ -+saber: -+ #load $(CFLAGS) screen.c ansi.c $(LIBS) -+ -+config: - rm -f config.cache - sh ./configure -+ -+ -+############################################################################### -+ -+.version: -+ @rev=`sed < $(srcdir)/patchlevel.h -n -e '/#define REV/s/#define REV *//p'`; \ -+ vers=`sed < $(srcdir)/patchlevel.h -n -e '/#define VERS/s/#define VERS *//p'`; \ -+ pat=`sed < $(srcdir)/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVEL *//p'`; \ -+ if [ "$${rev}.$${vers}.$${pat}" != "$(VERSION)" ]; then \ -+ echo "This distribution is screen-$${rev}.$${vers}.$${pat}, but"; \ -+ echo "the Makefile is from $(VERSION). Please update!"; exit 1; fi -+ -+############################################################################### -+ -+mdepend: $(CFILES) term.h -+ @rm -f DEPEND ; \ -+ for i in ${CFILES} ; do \ -+ echo "$$i" ; \ -+ echo `echo "$$i" | sed -e 's/.c$$/.o/'`": $$i" `\ -+ cc -E $$i |\ -+ grep '^# .*"\./.*\.h"' |\ -+ (sort -t'"' -u -k 2,2 2>/dev/null || sort -t'"' -u +1 -2) |\ -+ sed -e 's/.*"\.\/\(.*\)".*/\1/'\ -+ ` >> DEPEND ; \ -+ done -+ -+ -+depend: depend.in -+ ./config.status || ./configure -+ -+depend.in: $(CFILES) term.h -+ cp Makefile.in Makefile.in~ -+ sed -e '/\#\#\# Dependencies/q' < Makefile.in > tmp_make -+ for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done -+ mv tmp_make Makefile.in -+ -+############################################################################### -+ -+### Dependencies: -+screen.o: screen.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h \ -+ patchlevel.h logfile.h extern.h -+ansi.o: ansi.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h braille.h extern.h \ -+ logfile.h -+fileio.o: fileio.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+mark.o: mark.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+misc.o: misc.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+resize.o: resize.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+socket.o: socket.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+search.o: search.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h -+tty.o: tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+term.o: term.c term.h -+window.o: window.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+utmp.o: utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+loadav.o: loadav.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+putenv.o: putenv.c config.h -+help.o: help.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+termcap.o: termcap.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+input.o: input.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+attacher.o: attacher.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h -+pty.o: pty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+process.o: process.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+display.o: display.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+comm.o: comm.c config.h acls.h comm.h -+kmapdef.o: kmapdef.c config.h -+acls.o: acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ -+ layer.h term.h image.h display.h window.h extern.h -+braille.o: braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h -+braille_tsi.o: braille_tsi.c config.h screen.h os.h osdef.h ansi.h \ -+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h \ -+ braille.h -+logfile.o: logfile.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+layer.o: layer.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+sched.o: sched.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h -+teln.o: teln.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+nethack.o: nethack.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h -+encoding.o: encoding.c config.h screen.h os.h osdef.h ansi.h acls.h \ -+ comm.h layer.h term.h image.h display.h window.h extern.h diff --git a/package/screen/patches/patch-ansi_c b/package/screen/patches/patch-ansi_c deleted file mode 100644 index f6da58abe..000000000 --- a/package/screen/patches/patch-ansi_c +++ /dev/null @@ -1,32 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/ansi.c 2003-12-05 14:57:05.000000000 +0100 -+++ screen-4.0.3/ansi.c 2008-12-08 04:59:17.000000000 +0100 -@@ -1462,7 +1462,7 @@ StringEnd() - switch (curr->w_StringType) - { - case OSC: /* special xterm compatibility hack */ -- if (curr->w_string[0] == ';' || (p = index(curr->w_string, ';')) == 0) -+ if (curr->w_string[0] == ';' || (p = strchr(curr->w_string, ';')) == 0) - break; - typ = atoi(curr->w_string); - p++; -@@ -2803,15 +2803,15 @@ int ys, ye; - debug2("MFindUsedLine: %d %d\n", ye, ys); - for (y = ye; y >= ys; y--, ml--) - { -- if (bcmp((char*)ml->image, blank, p->w_width)) -+ if (memcmp((char*)ml->image, blank, p->w_width)) - break; -- if (ml->attr != null && bcmp((char*)ml->attr, null, p->w_width)) -+ if (ml->attr != null && memcmp((char*)ml->attr, null, p->w_width)) - break; - #ifdef COLOR -- if (ml->color != null && bcmp((char*)ml->color, null, p->w_width)) -+ if (ml->color != null && memcmp((char*)ml->color, null, p->w_width)) - break; - # ifdef COLORS256 -- if (ml->colorx != null && bcmp((char*)ml->colorx, null, p->w_width)) -+ if (ml->colorx != null && memcmp((char*)ml->colorx, null, p->w_width)) - break; - # endif - #endif diff --git a/package/screen/patches/patch-attacher_c b/package/screen/patches/patch-attacher_c deleted file mode 100644 index 34e9a0deb..000000000 --- a/package/screen/patches/patch-attacher_c +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/attacher.c 2003-09-08 16:24:48.000000000 +0200 -+++ screen-4.0.3/attacher.c 2008-10-08 14:09:31.000000000 +0200 -@@ -849,9 +849,9 @@ screen_builtin_lck() - strncpy(fullname, ppp->pw_gecos, sizeof(fullname) - 9); - fullname[sizeof(fullname) - 9] = 0; - -- if ((cp1 = index(fullname, ',')) != NULL) -+ if ((cp1 = strchr(fullname, ',')) != NULL) - *cp1 = '\0'; -- if ((cp1 = index(fullname, '&')) != NULL) -+ if ((cp1 = strchr(fullname, '&')) != NULL) - { - strncpy(cp1, ppp->pw_name, 8); - cp1[8] = 0; diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure index 21ae13053..91f90dc4c 100644 --- a/package/screen/patches/patch-configure +++ b/package/screen/patches/patch-configure @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- screen-4.0.3.orig/configure 2003-12-05 14:46:53.000000000 +0100 -+++ screen-4.0.3/configure 2008-10-08 13:33:43.000000000 +0200 ++++ screen-4.0.3/configure 2010-01-23 10:18:22.000000000 +0100 @@ -124,7 +124,7 @@ done fi if test ! -f "$as_myself"; then @@ -227,7 +226,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" -@@ -4149,7 +4149,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -3335,6 +3335,11 @@ _ACEOF + fi + rm -f conftest.$ac_objext conftest.$ac_ext + ++# always SYSV ++cat >>confdefs.h <<\_ACEOF ++#define SYSV 1 ++_ACEOF ++ + { echo "$as_me:$LINENO: checking for sequent/ptx..." >&5 + echo "$as_me: checking for sequent/ptx..." >&6;} + cat >conftest.$ac_ext <<_ACEOF +@@ -4149,7 +4154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5 echo "$as_me: error: !!! no select - no screen" >&2;} @@ -236,7 +247,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -@@ -4163,7 +4163,7 @@ if test "$cross_compiling" = yes; then +@@ -4163,7 +4168,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -245,7 +256,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -4272,7 +4272,7 @@ if test "$cross_compiling" = yes; then +@@ -4272,7 +4277,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -254,7 +265,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -4365,7 +4365,7 @@ if test "$cross_compiling" = yes; then +@@ -4365,7 +4370,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -263,7 +274,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -4460,7 +4460,7 @@ if test "$cross_compiling" = yes; then +@@ -4460,7 +4465,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -272,7 +283,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -4562,7 +4562,7 @@ elif test -n "$sock"; then +@@ -4562,7 +4567,7 @@ elif test -n "$sock"; then else { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5 echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;} @@ -281,7 +292,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi -@@ -4573,7 +4573,7 @@ if test "$cross_compiling" = yes; then +@@ -4573,7 +4578,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -290,7 +301,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -4898,7 +4898,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -4898,7 +4903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5 echo "$as_me: error: !!! no tgetent - no screen" >&2;} @@ -299,7 +310,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -@@ -4915,7 +4915,7 @@ if test "$cross_compiling" = yes; then +@@ -4915,7 +4920,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -308,7 +319,58 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -5359,7 +5359,7 @@ if test "$cross_compiling" = yes; then +@@ -5008,50 +5013,6 @@ _ACEOF + + fi + +-{ echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5 +-echo "$as_me: checking for SVR4 ptys..." >&6;} +-sysvr4ptys= +-if test -c /dev/ptmx ; then +-cat >conftest.$ac_ext <<_ACEOF +-#line $LINENO "configure" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +-ptsname(0);grantpt(0);unlockpt(0); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- cat >>confdefs.h <<\_ACEOF +-#define HAVE_SVR4_PTYS 1 +-_ACEOF +- +-sysvr4ptys=1 +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-fi +-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +-fi + + + for ac_func in getpt +@@ -5359,7 +5320,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -317,7 +379,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -6206,7 +6206,7 @@ echo "$as_me: checking for avenrun symbo +@@ -6206,7 +6167,7 @@ echo "$as_me: checking for avenrun symbo See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -326,7 +388,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -6482,7 +6482,7 @@ if test "$cross_compiling" = yes; then +@@ -6482,7 +6443,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -335,7 +397,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -6598,8 +6598,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -6598,8 +6559,6 @@ sed 's/^/| /' conftest.$ac_ext >&5 LIBS="$oldlibs" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -344,7 +406,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ oldlibs="$LIBS" LIBS="$LIBS -lsun" { echo "$as_me:$LINENO: checking IRIX sun library..." >&5 -@@ -7004,7 +7002,7 @@ if test "$cross_compiling" = yes; then +@@ -7004,7 +6963,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -353,7 +415,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -7056,7 +7054,7 @@ if test "$cross_compiling" = yes; then +@@ -7056,7 +7015,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -362,7 +424,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -7110,7 +7108,7 @@ if test "$cross_compiling" = yes; then +@@ -7110,7 +7069,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -371,7 +433,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -7951,7 +7949,7 @@ if test "$cross_compiling" = yes; then +@@ -7158,6 +7117,11 @@ fi + rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + ++# always use memcpy ++cat >>confdefs.h <<\_ACEOF ++#define USEMEMCPY 1 ++_ACEOF ++ + echo "$as_me:$LINENO: checking long file names" >&5 + echo $ECHO_N "checking long file names... $ECHO_C" >&6 + (echo 1 > /tmp/conftest9012345) 2>/dev/null +@@ -7951,7 +7915,7 @@ if test "$cross_compiling" = yes; then See \`config.log' for more details." >&5 echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;} @@ -380,7 +454,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" -@@ -7982,7 +7980,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -7982,7 +7946,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5 echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;} @@ -389,7 +463,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -@@ -8251,7 +8249,7 @@ done +@@ -8251,7 +8215,7 @@ done if test ! -f "$as_myself"; then { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} @@ -398,7 +472,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi case $CONFIG_SHELL in '') -@@ -8302,7 +8300,7 @@ done +@@ -8302,7 +8266,7 @@ done chmod +x $as_me.lineno || { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} @@ -407,7 +481,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the -@@ -8494,7 +8492,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF +@@ -8494,7 +8458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -416,7 +490,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --help | --hel | -h ) echo "$ac_cs_usage"; exit 0 ;; --debug | --d* | -d ) -@@ -8516,7 +8514,7 @@ Try \`$0 --help' for more information." +@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -425,7 +499,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ *) ac_config_targets="$ac_config_targets $1" ;; -@@ -8555,7 +8553,7 @@ do +@@ -8555,7 +8519,7 @@ do "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -434,7 +508,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ esac done -@@ -8750,7 +8748,7 @@ echo X"$as_dir" | +@@ -8750,7 +8714,7 @@ echo X"$as_dir" | test ! -n "$as_dirs" || mkdir $as_dirs fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} @@ -443,7 +517,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ac_builddir=. -@@ -8816,7 +8814,7 @@ echo "$as_me: creating $ac_file" >&6;} +@@ -8816,7 +8780,7 @@ echo "$as_me: creating $ac_file" >&6;} # Absolute (can't be DOS-style, as IFS=:) test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} @@ -452,7 +526,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ echo $f;; *) # Relative if test -f "$f"; then -@@ -8829,7 +8827,7 @@ echo "$as_me: error: cannot find input f +@@ -8829,7 +8793,7 @@ echo "$as_me: error: cannot find input f # /dev/null tree { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} @@ -461,7 +535,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi;; esac done` || { (exit 1); exit 1; } -@@ -8907,7 +8905,7 @@ echo "$as_me: creating $ac_file" >&6;} +@@ -8907,7 +8871,7 @@ echo "$as_me: creating $ac_file" >&6;} # Absolute (can't be DOS-style, as IFS=:) test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} @@ -470,7 +544,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ echo $f;; *) # Relative if test -f "$f"; then -@@ -8920,7 +8918,7 @@ echo "$as_me: error: cannot find input f +@@ -8920,7 +8884,7 @@ echo "$as_me: error: cannot find input f # /dev/null tree { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} @@ -479,7 +553,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ fi;; esac done` || { (exit 1); exit 1; } -@@ -9073,7 +9071,7 @@ echo X"$as_dir" | +@@ -9073,7 +9037,7 @@ echo X"$as_dir" | test ! -n "$as_dirs" || mkdir $as_dirs fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} diff --git a/package/screen/patches/patch-fileio_c b/package/screen/patches/patch-fileio_c deleted file mode 100644 index c86914c10..000000000 --- a/package/screen/patches/patch-fileio_c +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/fileio.c 2003-09-08 16:25:28.000000000 +0200 -+++ screen-4.0.3/fileio.c 2008-10-08 14:07:52.000000000 +0200 -@@ -96,7 +96,7 @@ char *rcfile; - - if (rcfile) - { -- char *rcend = rindex(rc_name, '/'); -+ char *rcend = strrchr(rc_name, '/'); - if (*rcfile != '/' && rcend && (rcend - rc_name) + strlen(rcfile) + 2 < sizeof(buf)) - { - strncpy(buf, rc_name, rcend - rc_name + 1); -@@ -169,7 +169,7 @@ char *rcfilename; - } - while (fgets(buf, sizeof buf, fp) != NULL) - { -- if ((p = rindex(buf, '\n')) != NULL) -+ if ((p = strrchr(buf, '\n')) != NULL) - *p = '\0'; - if ((argc = Parse(buf, sizeof buf, args, argl)) == 0) - continue; -@@ -216,7 +216,7 @@ char *rcfilename; - } - for (p = args[1]; p && *p; p = cp) - { -- if ((cp = index(p, '|')) != 0) -+ if ((cp = strchr(p, '|')) != 0) - *cp++ = '\0'; - len = strlen(p); - if (p[len - 1] == '*') -@@ -501,7 +501,7 @@ int dump; - } - break; - case DUMP_TERMCAP: -- if ((p = index(MakeTermcap(fore->w_aflag), '=')) != NULL) -+ if ((p = strchr(MakeTermcap(fore->w_aflag), '=')) != NULL) - { - fputs(++p, f); - putc('\n', f); diff --git a/package/screen/patches/patch-help_c b/package/screen/patches/patch-help_c deleted file mode 100644 index 8b997c7de..000000000 --- a/package/screen/patches/patch-help_c +++ /dev/null @@ -1,15 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/help.c 2003-09-08 16:25:33.000000000 +0200 -+++ screen-4.0.3/help.c 2008-10-08 14:08:53.000000000 +0200 -@@ -386,9 +386,9 @@ int x, y; - del = 0; - bp = buf; - ll = *lp++; -- if (!ll || (index(cp, ' ') != NULL)) -+ if (!ll || (strchr(cp, ' ') != NULL)) - { -- if (index(cp, '\'') != NULL) -+ if (strchr(cp, '\'') != NULL) - *bp++ = del = '"'; - else - *bp++ = del = '\''; diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c deleted file mode 100644 index 0260ead1f..000000000 --- a/package/screen/patches/patch-process_c +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/process.c 2003-09-18 14:53:54.000000000 +0200 -+++ screen-4.0.3/process.c 2008-12-08 04:59:51.000000000 +0100 -@@ -728,7 +728,7 @@ int ilen; - if (D_seqp[l] != l) - { - q = D_seqp + 1 + l; -- if (D_kmaps + D_nseqs > q && q[2] > l && !bcmp(D_seqp - l, q + 3, l)) -+ if (D_kmaps + D_nseqs > q && q[2] > l && !memcmp(D_seqp - l, q + 3, l)) - { - debug1("have another mapping (%s), delay execution\n", q + 3); - D_seqh = D_seqp - 3 - l; -@@ -2867,7 +2867,7 @@ int key; - s = 0; - if (ParseSaveStr(act, &s)) - break; -- if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || index(s, '/')) -+ if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || strchr(s, '/')) - { - Msg(0, "%s: bad session name '%s'\n", rc_name, s); - free(s); -@@ -3109,7 +3109,7 @@ int key; - break; - } - else -- if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && bcmp(kme->str, *args, *argl) == 0) -+ if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && memcmp(kme->str, *args, *argl) == 0) - break; - if (i == kmap_extn) - { -@@ -4387,7 +4387,7 @@ int base, psize; - char *s, *p; - { - char *q; -- if ((q = rindex(s, ':')) != 0) -+ if ((q = strrchr(s, ':')) != 0) - { - strncpy(p, q + 1, psize - 1); - p[psize - 1] = '\0'; diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c deleted file mode 100644 index 038b4b283..000000000 --- a/package/screen/patches/patch-pty_c +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/pty.c 2003-09-08 16:26:18.000000000 +0200 -+++ screen-4.0.3/pty.c 2008-10-08 13:33:43.000000000 +0200 -@@ -34,9 +34,9 @@ - #endif - - /* for solaris 2.1, Unixware (SVR4.2) and possibly others */ --#ifdef HAVE_SVR4_PTYS --# include <sys/stropts.h> --#endif -+//#ifdef HAVE_SVR4_PTYS -+//# include <sys/stropts.h> -+//#endif - - #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL) - # include <sys/ttold.h> diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h index 2c632d6ca..17e9cf010 100644 --- a/package/screen/patches/patch-sched_h +++ b/package/screen/patches/patch-sched_h @@ -1,4 +1,3 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- screen-4.0.3.orig/sched.h 2002-01-08 16:42:43.000000000 +0100 +++ screen-4.0.3/sched.h 2008-10-08 13:33:43.000000000 +0200 @@ -22,6 +22,11 @@ diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c deleted file mode 100644 index c9a3da349..000000000 --- a/package/screen/patches/patch-screen_c +++ /dev/null @@ -1,30 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/screen.c 2003-09-08 16:26:41.000000000 +0200 -+++ screen-4.0.3/screen.c 2008-10-08 14:06:53.000000000 +0200 -@@ -819,7 +819,7 @@ char **av; - - #ifdef MULTIUSER - own_uid = multi_uid = real_uid; -- if (SockMatch && (sockp = index(SockMatch, '/'))) -+ if (SockMatch && (sockp = strchr(SockMatch, '/'))) - { - if (eff_uid) - Panic(0, "Must run suid root for multiuser support."); -@@ -1025,7 +1025,7 @@ char **av; - } - if ((st.st_mode & 0777) != 0700) - Panic(0, "Directory %s must have mode 700.", SockPath); -- if (SockMatch && index(SockMatch, '/')) -+ if (SockMatch && strchr(SockMatch, '/')) - Panic(0, "Bad session name '%s'", SockMatch); - SockName = SockPath + strlen(SockPath) + 1; - *SockName = 0; -@@ -1041,7 +1041,7 @@ char **av; - (void) gethostname(HostName, MAXSTR); - HostName[MAXSTR - 1] = '\0'; - #endif -- if ((ap = index(HostName, '.')) != NULL) -+ if ((ap = strchr(HostName, '.')) != NULL) - *ap = '\0'; - - if (lsflag) diff --git a/package/screen/patches/patch-termcap_c b/package/screen/patches/patch-termcap_c deleted file mode 100644 index 3dc7d60bf..000000000 --- a/package/screen/patches/patch-termcap_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/termcap.c 2003-09-08 16:45:36.000000000 +0200 -+++ screen-4.0.3/termcap.c 2008-10-08 14:09:15.000000000 +0200 -@@ -940,7 +940,7 @@ int aflag; - debug1("MakeTermcap decided '%s'\n", p); - if (extra_outcap && *extra_outcap) - { -- for (cp = extra_outcap; (p = index(cp, ':')); cp = p) -+ for (cp = extra_outcap; (p = strchr(cp, ':')); cp = p) - { - ch = *++p; - *p = '\0'; diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh deleted file mode 100644 index b14b2f9ac..000000000 --- a/package/screen/patches/patch-tty_sh +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/tty.sh 2003-09-08 16:24:25.000000000 +0200 -+++ screen-4.0.3/tty.sh 2008-10-08 14:13:39.000000000 +0200 -@@ -659,7 +659,7 @@ char *opt; - - while (*opt) - { -- while (index(sep, *opt)) opt++; -+ while (strchr(sep, *opt)) opt++; - if (*opt >= '0' && *opt <= '9') - { - if (SetBaud(m, atoi(opt), atoi(opt))) -@@ -745,7 +745,7 @@ char *opt; - } - else - return -1; -- while (*opt && !index(sep, *opt)) opt++; -+ while (*opt && !strchr(sep, *opt)) opt++; - } - return 0; - } diff --git a/package/screen/patches/patch-utmp_c b/package/screen/patches/patch-utmp_c deleted file mode 100644 index 4beebc274..000000000 --- a/package/screen/patches/patch-utmp_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/utmp.c 2003-09-08 16:27:17.000000000 +0200 -+++ screen-4.0.3/utmp.c 2008-12-08 04:59:38.000000000 +0100 -@@ -422,7 +422,7 @@ struct win *wi; - debug2("SetUtmp %d will get slot %d...\n", wi->w_number, (int)slot); - - bzero((char *)&u, sizeof(u)); -- if ((saved_ut = bcmp((char *) &wi->w_savut, (char *)&u, sizeof(u)))) -+ if ((saved_ut = memcmp((char *) &wi->w_savut, (char *)&u, sizeof(u)))) - /* restore original, of which we will adopt all fields but ut_host */ - bcopy((char *)&wi->w_savut, (char *) &u, sizeof(u)); - diff --git a/package/screen/patches/patch-window_c b/package/screen/patches/patch-window_c deleted file mode 100644 index daad39ee3..000000000 --- a/package/screen/patches/patch-window_c +++ /dev/null @@ -1,33 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- screen-4.0.3.orig/window.c 2003-12-05 14:45:41.000000000 +0100 -+++ screen-4.0.3/window.c 2008-10-08 14:08:40.000000000 +0200 -@@ -643,7 +643,7 @@ struct NewWindow *newwin; - if (!nwin.aka) - nwin.aka = Filename(nwin.args[0]); - strncpy(p->w_akabuf, nwin.aka, sizeof(p->w_akabuf) - 1); -- if ((nwin.aka = rindex(p->w_akabuf, '|')) != NULL) -+ if ((nwin.aka = strrchr(p->w_akabuf, '|')) != NULL) - { - p->w_autoaka = 0; - *nwin.aka++ = 0; -@@ -1356,9 +1356,9 @@ char **args, *ttyn; - debug2("Makewindow %d with %s\n", win->w_number, tebuf); - tl = strlen(win->w_term); - NewEnv[1] = tebuf; -- if ((s1 = index(NewEnv[2], '|'))) -+ if ((s1 = strchr(NewEnv[2], '|'))) - { -- if ((s2 = index(++s1, '|'))) -+ if ((s2 = strchr(++s1, '|'))) - { - if (strlen(NewEnv[2]) - (s2 - s1) + tl < 1024) - { -@@ -1396,7 +1396,7 @@ char *prog, **args, **env; - char *shargs[MAXARGS + 1]; - register int i, eaccess = 0; - -- if (rindex(prog, '/')) -+ if (strrchr(prog, '/')) - path = ""; - if (!path && !(path = getenv("PATH"))) - path = DefaultPath; diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index da8872763..d7cd7a2e7 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs -PKG_DEPENDS:= libpng libtiff libjpeg -PKG_BUILDDEP:= libpng libtiff jpeg +PKG_DEPENDS:= libpng libtiff libjpeg libsdl +PKG_BUILDDEP:= libpng libtiff jpeg sdl PKG_URL:= http://www.libsdl.org PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ @@ -20,6 +20,11 @@ WRKDIST= ${WRKDIR}/SDL_image-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL_IMAGE,libsdl-image,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBSDL_IMAGE_DEV,libsdl-image-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl-image,${PKG_DESCR},${PKG_SECTION})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+= libsdl-image-dev-install CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-png \ @@ -29,8 +34,13 @@ CONFIGURE_ARGS+= --enable-png \ BUILD_STYLE:= auto INSTALL_STYLE:= auto -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib +libsdl-image-dev-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL + $(CP) ${WRKINST}/usr/include/SDL/*.h \ + $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 0f244569d..f5f9ff6aa 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -20,6 +20,11 @@ WRKDIST= ${WRKDIR}/SDL-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKG_DESCR},${PKG_SECTION})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+= libsdl-dev-install CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-esd \ @@ -29,12 +34,16 @@ CONFIGURE_ARGS+= --disable-esd \ --disable-video-directfb \ --disable-video-opengl \ --enable-input-tslib \ - --without-x + --with-x BUILD_STYLE:= auto INSTALL_STYLE:= auto -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib +libsdl-dev-install: + $(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL + $(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tptest/Makefile b/package/tptest/Makefile new file mode 100644 index 000000000..3f6c0fc3c --- /dev/null +++ b/package/tptest/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= tptest +PKG_VERSION:= 3.1.7 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 46f941bdab738a2a11ecc2a5f757ec77 +PKG_DESCR:= Internet bandwidth tester +PKG_SECTION:= utils +PKG_URL:= http://tptest.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tptest/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +do-build: + (cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}") + (cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}") + +do-install: + $(INSTALL_DIR) $(IDIR_TPTEST)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} \ + $(IDIR_TPTEST)/usr/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile new file mode 100644 index 000000000..4043f3ec2 --- /dev/null +++ b/package/tptest/patches/patch-apps_unix_client_Makefile @@ -0,0 +1,34 @@ + - assign CC only if not already defined + - add CFLAGS and LDFLAGS instead of replacing them + - allow for specifying DESTDIR to 'make install' + - drop the local subdir (openadk doesnt use this path) + - create the directories to install into +--- tptest-3.1.7.orig/apps/unix/client/Makefile 2004-04-07 15:22:56.000000000 +0200 ++++ tptest-3.1.7/apps/unix/client/Makefile 2010-01-28 00:00:45.000000000 +0100 +@@ -1,4 +1,4 @@ +-CC = gcc ++CC ?= gcc + # + # Use this for Linux and other systems that have makedepend + # instead of mkdep. +@@ -25,8 +25,8 @@ EXTRADEFINES = -DUNIX -DLINUX + # + #EXTRADEFINES = -DUSE_GMTIME + +-CFLAGS = ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall +-LDFLAGS = ${CDEBUG} ++CFLAGS += ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall ++LDFLAGS += ${CDEBUG} + LIBDIR = + LOCLIBS = + +@@ -69,7 +69,8 @@ clean: + rm -f tptestclient core *.o *.BAK *.bak *.CKP a.out tpio_unix.c tpengine.c tpcommon.c tpclient.c + + install: +- install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin ++ install -d -m 755 ${DESTDIR}/usr/bin ++ install -c -m 755 tptestclient ${DESTDIR}/usr/bin + + depend: + ${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS} diff --git a/package/tptest/patches/patch-apps_unix_server_Makefile b/package/tptest/patches/patch-apps_unix_server_Makefile new file mode 100644 index 000000000..127bd0a72 --- /dev/null +++ b/package/tptest/patches/patch-apps_unix_server_Makefile @@ -0,0 +1,34 @@ + - assign CC only if not already defined + - add CFLAGS and LDFLAGS instead of replacing them + - allow for specifying DESTDIR to 'make install' + - drop the local subdir (openadk doesnt use this path) + - create the directories to install into +--- tptest-3.1.7.orig/apps/unix/server/Makefile 2003-01-22 11:42:45.000000000 +0100 ++++ tptest-3.1.7/apps/unix/server/Makefile 2010-01-28 00:00:23.000000000 +0100 +@@ -1,4 +1,4 @@ +-CC = gcc ++CC ?= gcc + # + # Use this for Linux and other systems that have makedepend + # instead of mkdep. +@@ -25,8 +25,8 @@ EXTRADEFINES = -DUNIX -DLINUX + # + #EXTRADEFINES = -DUSE_GMTIME + +-CFLAGS = ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall +-LDFLAGS = ${CDEBUG} ++CFLAGS += ${CDEBUG} ${EXTRADEFINES} ${INCL} -Wall ++LDFLAGS += ${CDEBUG} + LIBDIR = + LOCLIBS = + +@@ -66,7 +66,8 @@ clean: + rm -f tptestserver core *.o *.BAK *.bak *.CKP a.out tpio_unix.c tpengine.c tpcommon.c + + install: +- install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin ++ install -d -m 755 ${DESTDIR}/usr/bin ++ install -c -m 755 tptestserver ${DESTDIR}/usr/bin + + depend: + ${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS} diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile new file mode 100644 index 000000000..4db926568 --- /dev/null +++ b/package/traceroute/Makefile @@ -0,0 +1,31 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= traceroute +PKG_VERSION:= 2.0.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d400573042d41559fc3e5260275300d8 +PKG_DESCR:= Utility to trace the route of IP packets +PKG_SECTION:= utils +PKG_URL:= http://traceroute.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=traceroute/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,TRACEROUTE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +BUILD_STYLE:= auto +MAKE_FLAGS+= CC="${TARGET_CC}" \ + AR="${TARGET_CROSS}ar" \ + RANLIB="${TARGET_CROSS}ranlib" \ + LDFLAGS="-L${WRKSRC}/libsupp" +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/local/bin/traceroute \ + $(IDIR_TRACEROUTE)/usr/bin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index e6d080a37..5ee7b280c 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -34,6 +34,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} done uclibc-dev-install: + ${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 4de64d7b0..b73689687 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin @@ -29,6 +29,7 @@ $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-use-tty-group \ + --disable-schedutils \ --disable-cramfs \ --disable-libblkid \ --disable-libuuid diff --git a/package/vsftpd/files/vsftpd.conf b/package/vsftpd/files/vsftpd.conf index 1868be6f8..e43a5f8c0 100644 --- a/package/vsftpd/files/vsftpd.conf +++ b/package/vsftpd/files/vsftpd.conf @@ -15,3 +15,4 @@ syslog_enable=YES #xferlog_enable=YES #xferlog_file=/var/log/vsftpd.log #xferlog_std_format=YES +secure_chroot_dir=/var/run/vsftpd diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index 1424b29fd..eda6f83cb 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= watchdog -PKG_VERSION:= 5.4 +PKG_VERSION:= 5.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 66480128b9dabcced2e4c8db3e60fa50 +PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d PKG_DESCR:= watchdog daemon PKG_SECTION:= sys PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/} @@ -16,16 +16,13 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu -XAKE_FLAGS+= CCOPT="${TARGET_CFLAGS}" \ - INCLS="-I. -I${STAGING_DIR}/usr/include" \ - LIBS="-L${STAGING_DIR}/usr/lib" BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/ - ${INSTALL_DATA} ${WRKINST}/etc/watchdog.conf ${IDIR_WATCHDOG}/etc/ + ${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \ - ${WRKINST}/usr/sbin/wd_keepalive ${IDIR_WATCHDOG}/usr/sbin/ + ${IDIR_WATCHDOG}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/watchdog/files/watchdog.conf b/package/watchdog/files/watchdog.conf new file mode 100644 index 000000000..0314adcfb --- /dev/null +++ b/package/watchdog/files/watchdog.conf @@ -0,0 +1,41 @@ +#ping = 172.31.14.1 +#ping = 172.26.1.255 +#interface = eth0 +#file = /var/log/messages +#change = 1407 + +# Uncomment to enable test. Setting one of these values to '0' disables it. +# These values will hopefully never reboot your machine during normal use +# (if your machine is really hung, the loadavg will go much higher than 25) +#max-load-1 = 24 +#max-load-5 = 18 +#max-load-15 = 12 + +# Note that this is the number of pages! +# To get the real size, check how large the pagesize is on your machine. +#min-memory = 1 + +#repair-binary = /usr/sbin/repair +#test-binary = +#test-timeout = + +watchdog-device = /dev/watchdog +watchdog-timeout = 20 + +# Defaults compiled into the binary +#temperature-device = +#max-temperature = 120 + +# Defaults compiled into the binary +#admin = root +#interval = 10 +#logtick = 1 + +# This greatly decreases the chance that watchdog won't be scheduled before +# your machine is really loaded +realtime = yes +priority = 1 + +# Check if syslogd is still running by enabling the following line +#pidfile = /var/run/syslogd.pid + diff --git a/package/watchdog/files/watchdog.postinst b/package/watchdog/files/watchdog.postinst index 17d144395..a44195149 100644 --- a/package/watchdog/files/watchdog.postinst +++ b/package/watchdog/files/watchdog.postinst @@ -1,3 +1,3 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf watchdog watchdog NO +add_rcconf watchdog watchdog YES diff --git a/package/watchdog/patches/01-fstab-sys_siglist.patch b/package/watchdog/patches/01-fstab-sys_siglist.patch deleted file mode 100644 index 604ecdcb6..000000000 --- a/package/watchdog/patches/01-fstab-sys_siglist.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- watchdog-5.2.4.orig.orig/src/fstab.c 2003-01-28 07:47:38.000000000 +0100 -+++ watchdog-5.2.4.orig/src/fstab.c 2008-10-16 12:56:40.000000000 +0200 -@@ -237,7 +237,7 @@ static int old_lockfile = 1; - /* Ensure that the lock is released if we are interrupted. */ - static void - handler (int sig) { -- die (EX_USER, "%s", sys_siglist[sig]); -+ die (EX_USER, "%s", "sys_siglist[sig]"); - } - - static void diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c deleted file mode 100644 index c00b6ff45..000000000 --- a/package/watchdog/patches/patch-src_mntent_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- watchdog-5.2.4.orig.orig/src/mntent.c 2003-01-28 07:47:38.000000000 +0100 -+++ watchdog-5.2.4.orig/src/mntent.c 2008-10-16 13:00:20.000000000 +0200 -@@ -6,7 +6,7 @@ - #endif - - #include <stdio.h> --#include <string.h> /* for index */ -+#include <string.h> /* for strchr */ - #include <ctype.h> /* for isdigit */ - #include "wd_mntent.h" - #include "sundries.h" /* for xmalloc */ -@@ -155,7 +155,7 @@ my_getmntent (mntFILE *mfp) { - if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL) - return NULL; - -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (s == NULL) { - /* extremely long line - assume file was corrupted */ - mfp->mntent_errs = 1; diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c deleted file mode 100644 index cf421ce79..000000000 --- a/package/watchdog/patches/patch-src_umount_c +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- watchdog-5.2.4.orig.orig/src/umount.c 2003-01-28 07:47:38.000000000 +0100 -+++ watchdog-5.2.4.orig/src/umount.c 2008-10-16 13:00:07.000000000 +0200 -@@ -210,7 +210,7 @@ umount_one (const char *spec, const char - if (res < 0) - umnt_err2 = errno; - /* Do not complain about remote NFS mount points */ -- if (errno == ENOENT && index(spec, ':')) -+ if (errno == ENOENT && strchr(spec, ':')) - umnt_err2 = 0; - } - } diff --git a/package/xauth/Makefile b/package/xauth/Makefile new file mode 100644 index 000000000..c18f936d0 --- /dev/null +++ b/package/xauth/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xauth +PKG_VERSION:= 1.0.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2eb3cc3e4421e1b747c4ac16aac20cda +PKG_DESCR:= X authority file utility +PKG_SECTION:= x11 +PKG_DEPENDS:= libx11 libxext libxmu +PKG_BUILDDEP+= libX11 libXext libXmu +PKG_URL:= http://www.x.org +PKG_SITES:= ${MASTER_SITE_XORG} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XAUTH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + $(INSTALL_DIR) $(IDIR_XAUTH)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/xauth $(IDIR_XAUTH)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile new file mode 100644 index 000000000..c85687366 --- /dev/null +++ b/package/xlsfonts/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= xlsfonts +PKG_VERSION:= 1.0.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7a6bee1512ccdef52fc519a86684891e +PKG_DESCR:= List X11 fonts +PKG_SECTION:= libs +PKG_URL:= http://www.x.org/ +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,XLSFONTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XLSFONTS}/usr/bin + ${CP} ${WRKINST}/usr/bin/xlsfonts \ + ${IDIR_XLSFONTS}/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 39f44c7c2..1b604fbe4 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 @@ -23,6 +23,7 @@ $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE} CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= \ + --with-fontdir=/usr/share/fonts/X11 \ --enable-dga \ --enable-xorg \ --enable-xv \ @@ -47,13 +48,15 @@ CONFIGURE_ARGS+= \ --disable-xvmc \ --with-xkb-output=/tmp \ --with-os-vendor=OpenADK \ - --with-vendor-web="http://www.openadk.org" + --with-vendor-web="http://openadk.org" BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia} + ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ + $(IDIR_XORG_SERVER)/usr/lib/xorg/ ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin ${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules diff --git a/scripts/cpio b/scripts/cpio new file mode 100755 index 000000000..2a12d4ffe --- /dev/null +++ b/scripts/cpio @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +/bin/cpio --quiet "$@" diff --git a/scripts/create-image.sh b/scripts/create-image.sh index 4a23b49cf..96a96ced8 100755 --- a/scripts/create-image.sh +++ b/scripts/create-image.sh @@ -24,6 +24,16 @@ if [ $(id -u) -ne 0 ];then exit 1 fi +printf "Checking if mkfs is installed" +mkfs=$(which mkfs.$filesystem) + +if [ ! -z $mkfs -a -x $mkfs ];then + printf "...okay\n" +else + printf "...failed\n" + exit 1 +fi + printf "Checking if parted is installed" parted=$(which parted) diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index fcc64ac94..b96a92e8f 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -31,9 +31,6 @@ if [[ -n $ADK_NATIVE ]];then if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then NEED_RPM="$NEED_RPM rpm" fi - if [[ -n $ADK_PACKAGE_SQUID ]]; then - NEED_GXX="$NEED_GXX squid" - fi fi if [[ -n $ADK_PACKAGE_RUBY ]]; then @@ -58,6 +55,7 @@ fi if [[ -n $ADK_PACKAGE_SQUID ]]; then NEED_SSLDEV="$NEED_SSLDEV squid" + NEED_GXX="$NEED_GXX squid" fi if [[ -n $ADK_PACKAGE_DANSGUARDIAN ]]; then @@ -88,6 +86,22 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then NEED_GPERF="$NEED_GPERF eglibc" fi +if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi" +fi + +if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_75DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-75dpi" +fi + +if [[ -n $ADK_PACKAGE_FONT_ADOBE_100DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-100dpi" +fi + +if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then + NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi" +fi + if [[ -n $NEED_GETTEXT ]]; then if ! which xgettext >/dev/null 2>&1; then echo >&2 You need gettext to build $NEED_GETTEXT @@ -116,6 +130,13 @@ if [[ -n $NEED_SSLDEV ]]; then fi fi +if [[ -n $NEED_MKFONTDIR ]]; then + if ! which mkfontdir >/dev/null 2>&1; then + echo >&2 You need mkfontdir to build $NEED_MKFONTDIR + out=1 + fi +fi + if [[ -n $NEED_INTL ]]; then if ! which intltool-update >/dev/null 2>&1; then echo >&2 You need intltool-update to build $NEED_INTL diff --git a/scripts/tarpkg b/scripts/tarpkg index f2e5def9e..bbb242a5e 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -29,6 +29,7 @@ elif [ "$1" = "install" ];then IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst fi + rm -rf ${PKG_INSTROOT}/usr/lib/pkg else echo "unknown command" exit 1 diff --git a/target/Config.in b/target/Config.in index 92fcc4882..44d6a4465 100644 --- a/target/Config.in +++ b/target/Config.in @@ -29,6 +29,9 @@ config ADK_TARGET_WITH_PP config ADK_TARGET_WITH_CARDBUS bool +config ADK_TARGET_WITH_WATCHDOG + bool + config ADK_TOOLCHAIN_ONLY bool @@ -186,85 +189,12 @@ config ADK_LINUX_NATIVE Make a native build. Use host tools. No toolchain will be created. -config ADK_LINUX_X86_ALIX1C - bool "PC Engines Alix1C" - select ADK_alix1c - select ADK_KERNEL_SCSI - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV_SD - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_MII - select ADK_KERNEL_WATCHDOG - select BUSYBOX_HWCLOCK - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_MINIPCI - select ADK_TARGET_WITH_INPUT +config ADK_LINUX_ALIX + bool "ALIX and WRAP boards" help - Support for ALIX1C boards. - http://www.pcengines.ch/ - Status: stable + Support for Alix and Wrap boards. + http://www.pcengines.ch -config ADK_LINUX_X86_ALIX2D - bool "PC Engines Alix2D" - select ADK_alix2d - select ADK_KERNEL_SCSI - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV_SD - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_MII - select BUSYBOX_HWCLOCK - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_MINIPCI - select ADK_TARGET_WITH_LEDS - help - Support for ALIX2D boards. - http://www.pcengines.ch/ - Status: stable - -config ADK_LINUX_X86_ALIX2D13 - bool "PC Engines Alix2D13" - select ADK_alix2d13 - select ADK_KERNEL_SCSI - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV_SD - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NEW_LEDS - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_MII - select BUSYBOX_HWCLOCK - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_MINIPCI - select ADK_TARGET_WITH_LEDS - help - Support for ALIX2D13 boards. - http://www.pcengines.ch/ - Status: stable - -config ADK_LINUX_X86_WRAP - bool "PC Engines WRAP" - select ADK_wrap - select ADK_KERNEL_SCSI - select ADK_KERNEL_ATA - select ADK_KERNEL_BLK_DEV_SD - select ADK_KERNEL_EXT2_FS - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_MII - select BUSYBOX_HWCLOCK - help - End of life, but I still have one board. - http://www.pcengines.ch/ - Status: stable config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" @@ -375,6 +305,7 @@ config ADK_LINUX_QEMU bool "Qemu Emulator" select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_MII select ADK_KERNEL_NET_ETHERNET select ADK_TARGET_WITH_INPUT help @@ -389,10 +320,12 @@ config ADK_LINUX_X86_64_SHUTTLE select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_PP select ADK_KERNEL_INPUT_KEYBOARD + select ADK_KERNEL_SCSI select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE + select ADK_KERNEL_BLK_DEV_SD if ADK_TARGET_ROOTFS_ARCHIVE select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE @@ -515,6 +448,92 @@ config ADK_LINUX_X86_64_QEMU endchoice choice +prompt "Alix/Wrap model" +default ADK_LINUX_X86_ALIX1C +depends on ADK_LINUX_ALIX + +config ADK_LINUX_X86_ALIX1C + bool "PC Engines Alix1C" + select ADK_alix1c + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select BUSYBOX_HWCLOCK + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_INPUT + help + Support for ALIX1C boards. + http://www.pcengines.ch/ + Status: stable + +config ADK_LINUX_X86_ALIX2D + bool "PC Engines Alix2D" + select ADK_alix2d + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select BUSYBOX_HWCLOCK + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_LEDS + help + Support for ALIX2D boards. + http://www.pcengines.ch/ + Status: stable + +config ADK_LINUX_X86_ALIX2D13 + bool "PC Engines Alix2D13" + select ADK_alix2d13 + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NEW_LEDS + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select BUSYBOX_HWCLOCK + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_LEDS + help + Support for ALIX2D13 boards. + http://www.pcengines.ch/ + Status: stable + +config ADK_LINUX_X86_WRAP + bool "PC Engines WRAP" + select ADK_wrap + select ADK_KERNEL_SCSI + select ADK_KERNEL_ATA + select ADK_KERNEL_BLK_DEV_SD + select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_NET_PCI + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_MII + select BUSYBOX_HWCLOCK + help + End of life, but I still have one board. + http://www.pcengines.ch/ + Status: stable + +endchoice + +choice prompt "Routerboard model" default ADK_LINUX_MIPS_RB433 depends on ADK_LINUX_MIKROTIK @@ -550,9 +569,12 @@ config ADK_LINUX_MIPS_RB532 select ADK_KERNEL_NET_PCI select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_MII + select ADK_KERNEL_ATA select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_SCSI + select ADK_KERNEL_EXT2_FS select ADK_TARGET_WITH_MINIPCI + select ADK_TARGET_WITH_WATCHDOG help Support for Mikrotik RB532. Status: stable @@ -809,6 +831,33 @@ config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA endchoice +choice +prompt "Compression method for Kernel" + depends on ADK_LINUX_QEMU || ADK_LINUX_ALIX + +config ADK_TARGET_KERNEL_COMPRESSION_GZIP + boolean + prompt "gzip" + select ADK_KERNEL_KERNEL_GZIP + help + Select gzip compression for Kernel. + +config ADK_TARGET_KERNEL_COMPRESSION_BZIP2 + boolean + prompt "bzip2" + select ADK_KERNEL_KERNEL_BZIP2 + help + Select BZIP2 compression for Kernel. + +config ADK_TARGET_KERNEL_COMPRESSION_LZMA + boolean + prompt "lzma" + select ADK_KERNEL_KERNEL_LZMA + help + Select LZMA compression for Kernel. + +endchoice + config ADK_COMPRESSION_TOOL string default "gzip -n9" if ADK_TARGET_INITRAMFS_COMPRESSION_GZIP @@ -816,7 +865,6 @@ config ADK_COMPRESSION_TOOL default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA help - choice prompt "Root filesystem type" depends on ADK_TARGET_ROOTFS_ARCHIVE @@ -864,7 +912,7 @@ config ADK_PACKAGE_SUFFIX string default "ipk" if ADK_TARGET_PACKAGE_IPKG default "tar.gz" if ADK_TARGET_PACKAGE_TGZ - default "rpm" if ADK_TARGET_PACKAGE_RPM +# default "rpm" if ADK_TARGET_PACKAGE_RPM help choice @@ -888,13 +936,12 @@ config ADK_TARGET_PACKAGE_TGZ directory. There will be no package manager installed onto the target. -config ADK_TARGET_PACKAGE_RPM - boolean - prompt "rpm package format" - help - Create rpm packages and use rpm package management on the - target. WARNING: NOT YET IMPLEMENTED +#config ADK_TARGET_PACKAGE_RPM +# boolean +# prompt "rpm package format" +# help +# Create rpm packages and use rpm package management on the +# target. WARNING: NOT YET IMPLEMENTED endchoice - endmenu diff --git a/target/ag241/uclibc.config b/target/ag241/uclibc.config index 581455c3b..4ec29e966 100644 --- a/target/ag241/uclibc.config +++ b/target/ag241/uclibc.config @@ -60,7 +60,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y UCLIBC_HAS_FENV=y -KERNEL_HEADERS="/home/wbx/lemote/toolchain_build_mipsel/libc_dev/usr/include" +KERNEL_HEADERS="" HAVE_DOT_CONFIG=y # diff --git a/target/bulk.lst b/target/bulk.lst index fbd1f9463..0dacdd64c 100644 --- a/target/bulk.lst +++ b/target/bulk.lst @@ -1 +1,2 @@ ag241 uclibc nfsroot y +foxboard uclibc nfsroot y diff --git a/target/foxboard/kernel.config b/target/foxboard/kernel.config index e4f870878..9a76abe76 100644 --- a/target/foxboard/kernel.config +++ b/target/foxboard/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.28 -# Tue Dec 30 19:37:01 2008 +# Linux kernel version: 2.6.32 +# Tue Jan 19 21:38:01 2010 # CONFIG_MMU=y CONFIG_ZONE_DMA=y @@ -17,6 +17,7 @@ CONFIG_FORCE_MAX_ZONEORDER=6 CONFIG_CRIS=y CONFIG_HZ=100 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y # # General setup @@ -33,16 +34,27 @@ CONFIG_SYSVIPC_SYSCTL=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_CGROUPS is not set # CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set # CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -51,26 +63,32 @@ CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y # CONFIG_ELF_CORE is not set -# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set + +# +# Kernel Performance Events And Counters +# # CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set @@ -78,11 +96,8 @@ 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 CONFIG_BLOCK=y -# CONFIG_LBD is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_LSF is not set +# CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -98,19 +113,18 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_DEFAULT_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_CLASSIC_RCU=y # CONFIG_FREEZER is not set # # General setup # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set # CONFIG_BINFMT_MISC is not set CONFIG_GENERIC_HARDIRQS=y CONFIG_ETRAX_CMDLINE="console=ttyS0,115200" -# CONFIG_ETRAX_WATCHDOG is not set +CONFIG_ETRAX_WATCHDOG=y +# CONFIG_ETRAX_WATCHDOG_NICE_DOGGY is not set CONFIG_ETRAX_FAST_TIMER=y # CONFIG_ETRAX_KMALLOCED_MODULES is not set # CONFIG_OOM_REBOOT is not set @@ -125,12 +139,14 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_RESOURCES_64BIT is not set # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # # Hardware setup @@ -144,6 +160,7 @@ CONFIG_ETRAX100LX_V2=y CONFIG_ETRAX_ARCH_V10=y # CONFIG_ETRAX_ARCH_V32 is not set CONFIG_ETRAX_DRAM_SIZE=16 +CONFIG_ETRAX_MTD_SIZE=0x00800000 CONFIG_ETRAX_FLASH_BUSWIDTH=2 CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1 CONFIG_ETRAX_FLASH1_SIZE=0 @@ -194,14 +211,12 @@ CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_ASK_IP_FIB_HASH is not set -# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set -CONFIG_SYN_COOKIES=y +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set @@ -214,12 +229,6 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y -# CONFIG_DEFAULT_BIC is not set -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set @@ -227,6 +236,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -240,7 +250,10 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_LAPB is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set # # Network testing @@ -251,8 +264,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -# CONFIG_PHONET is not set # CONFIG_WIRELESS is not set +# CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -312,16 +325,17 @@ CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set CONFIG_MTD_CONCAT=y CONFIG_MTD_PARTITIONS=y CONFIG_MTD_ROOTFS_ROOT_DEV=y -CONFIG_MTD_ROOTFS_SPLIT=y # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_AR7_PARTS is not set @@ -395,6 +409,11 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y # CONFIG_MTD_ONENAND is not set # +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# # UBI - Unsorted block images # # CONFIG_MTD_UBI is not set @@ -418,22 +437,7 @@ CONFIG_HAVE_IDE=y # CONFIG_SCSI is not set # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -444,6 +448,8 @@ CONFIG_NETDEVICES=y # CONFIG_PHYLIB is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y +# CONFIG_ETHOC is not set +# CONFIG_DNET is not set # CONFIG_IBM_NEW_EMAC_ZMII is not set # CONFIG_IBM_NEW_EMAC_RGMII is not set # CONFIG_IBM_NEW_EMAC_TAH is not set @@ -451,15 +457,17 @@ CONFIG_MII=y # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set +CONFIG_WLAN=y +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # -# Wireless LAN +# Enable WiMAX (Networking options) to see the WiMAX drivers # -# CONFIG_WLAN_PRE80211 is not set -# CONFIG_WLAN_80211 is not set -# CONFIG_IWLWIFI_LEDS is not set # # USB Network Adapters @@ -505,6 +513,7 @@ CONFIG_USB_CATC=m # Non-8250 serial port support # CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -527,17 +536,27 @@ CONFIG_UNIX98_PTYS=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # CONFIG_FUSE_FS is not set # +# Caches +# +# CONFIG_FSCACHE is not set + +# # CD-ROM/DVD Filesystems # # CONFIG_ISO9660_FS is not set @@ -562,10 +581,7 @@ CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_CONFIGFS_FS=y - -# -# Miscellaneous filesystems -# +CONFIG_MISC_FILESYSTEMS=y # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set @@ -620,7 +636,10 @@ CONFIG_USB=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set # CONFIG_USB_SL811_HCD is not set # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set @@ -634,11 +653,11 @@ CONFIG_USB=y # CONFIG_USB_TMC is not set # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # -# see USB_STORAGE Help for more information +# also be needed; see USB_STORAGE Help for more info # # CONFIG_USB_LIBUSUAL is not set @@ -666,26 +685,33 @@ CONFIG_USB=y # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set # CONFIG_USB_GADGET is not set # +# OTG and related infrastructure +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_STAGING is not set + +# # Kernel hacking # # CONFIG_SYSTEM_PROFILER is not set -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_PRINTK_TIME=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -693,11 +719,6 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set - -# -# Tracers -# -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set # CONFIG_SAMPLES is not set # @@ -712,7 +733,6 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -744,11 +764,13 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set @@ -785,6 +807,7 @@ CONFIG_CRYPTO=y # Compression # # CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set # @@ -797,11 +820,13 @@ CONFIG_CRYPTO=y # OCF Configuration # # CONFIG_OCF_OCF is not set +# CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_BITREVERSE=y +CONFIG_GENERIC_FIND_LAST_BIT=y # CONFIG_CRC_CCITT is not set # CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set @@ -810,6 +835,6 @@ CONFIG_CRC32=y # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y -CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_DMA=y +CONFIG_NLATTR=y diff --git a/target/foxboard/uclibc.config b/target/foxboard/uclibc.config index 50ba1fc5b..21295f984 100644 --- a/target/foxboard/uclibc.config +++ b/target/foxboard/uclibc.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.30 -# Thu Dec 25 10:29:25 2008 +# Version: 0.9.30.1 +# Thu Jan 14 19:34:22 2010 # # TARGET_alpha is not set # TARGET_arm is not set @@ -36,23 +36,6 @@ TARGET_ARCH="cris" FORCE_OPTIONS_FOR_ARCH=y CONFIG_CRIS=y # CONFIG_CRISV32 is not set -# CONFIG_GENERIC_386 is not set -# CONFIG_386 is not set -# CONFIG_486 is not set -# CONFIG_586 is not set -# CONFIG_586MMX is not set -# CONFIG_686 is not set -# CONFIG_PENTIUMII is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_ELAN is not set -# CONFIG_CRUSOE is not set -# CONFIG_WINCHIPC6 is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_CYRIXIII is not set -# CONFIG_NEHEMIAH is not set TARGET_SUBARCH="" # @@ -136,7 +119,7 @@ UCLIBC_HAS_BSD_ERR=y # UCLIBC_NTP_LEGACY is not set # UCLIBC_SV4_DEPRECATED is not set UCLIBC_HAS_REALTIME=y -# UCLIBC_HAS_ADVANCED_REALTIME is not set +UCLIBC_HAS_ADVANCED_REALTIME=y UCLIBC_HAS_EPOLL=y UCLIBC_HAS_XATTR=y # UCLIBC_HAS_PROFILING is not set @@ -230,12 +213,12 @@ CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set # DODEBUG_PT is not set -# DOASSERTS is not set DOSTRIP=y +# DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set # UCLIBC_MALLOC_DEBUGGING is not set WARNINGS="-Wall" -EXTRA_WARNINGS=y +# EXTRA_WARNINGS is not set # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/target/linux/config/Config.in.aufs b/target/linux/config/Config.in.aufs index fb63ac931..7956f31c1 100644 --- a/target/linux/config/Config.in.aufs +++ b/target/linux/config/Config.in.aufs @@ -1,8 +1,7 @@ config ADK_KPACKAGE_KMOD_AUFS_FS prompt "Aufs (Advanced multi layered unification filesystem) support" + depends on !ADK_LINUX_CRIS_FOXBOARD tristate - select ADK_KERNEL_EXPERIMENTAL - select FWRT_KPACKAGE_KMOD_EXPORTFS if ADK_KERNEL_AUFS_EXPORT help Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 96f211e0a..d8b32c716 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -46,6 +46,7 @@ config ADK_KERNEL_DM_CRYPT config ADK_KERNEL_BLK_DEV_DM select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD boolean default n @@ -175,6 +176,7 @@ config ADK_KPACKAGE_KMOD_SCSI select ADK_KERNEL_LSF select ADK_KERNEL_IOSCHED_AS depends on !ADK_KERNEL_SCSI + depends on !ADK_KERNEL_SATA_AHCI tristate help If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or @@ -190,8 +192,8 @@ config ADK_KPACKAGE_KMOD_SCSI config ADK_KPACKAGE_KMOD_BLK_DEV_SD prompt "kmod-scsi-disk.................... SCSI disk support" + select ADK_KPACKAGE_KMOD_SCSI depends on !ADK_KERNEL_BLK_DEV_SD - depends on ADK_KPACKAGE_KMOD_SCSI tristate help If you want to use SCSI hard disks, Fibre Channel disks, @@ -215,12 +217,14 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR config ADK_KERNEL_BLK_DEV_MD tristate select ADK_KERNEL_MD + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD prompt "kmod-md........................... RAID support" tristate depends on !ADK_KERNEL_BLK_DEV_MD + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KERNEL_MD help @@ -255,7 +259,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID456 config ADK_KPACKAGE_KMOD_BLK_DEV_DM prompt "kmod-dm........................... Device Mapper support" select ADK_KERNEL_MD - depends on !ADK_KERNEL_BLK_DEV_DM + depends on !(ADK_KERNEL_BLK_DEV_DM || ADK_LINUX_CRIS_FOXBOARD) tristate help Device-mapper is a low level volume manager. It works by allowing @@ -267,8 +271,8 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DM config ADK_KPACKAGE_KMOD_DM_CRYPT prompt "kmod-dm-crypt................... Crypt target support" + depends on !(ADK_KERNEL_DM_CRYPT || ADK_LINUX_CRIS_FOXBOARD) select ADK_KPACKAGE_KMOD_BLK_DEV_DM - depends on !ADK_KERNEL_DM_CRYPT select ADK_KERNEL_MD select ADK_KERNEL_CRYPTO select ADK_KPACKAGE_KMOD_CRYPTO_CBC @@ -286,6 +290,7 @@ config ADK_KPACKAGE_KMOD_DM_CRYPT config ADK_KPACKAGE_KMOD_DM_SNAPSHOT prompt "kmod-dm-snapshot................ Snapshot target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to take writable snapshots of a device. @@ -293,6 +298,7 @@ config ADK_KPACKAGE_KMOD_DM_SNAPSHOT config ADK_KPACKAGE_KMOD_DM_MIRROR prompt "kmod-dm-mirror.................. Mirror target" select ADK_KPACKAGE_KMOD_BLK_DEV_DM + depends on !ADK_LINUX_CRIS_FOXBOARD tristate help Allow volume managers to mirror logical volumes, also diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth index 5f4dca821..748a6b280 100644 --- a/target/linux/config/Config.in.bluetooth +++ b/target/linux/config/Config.in.bluetooth @@ -68,6 +68,8 @@ config ADK_KPACKAGE_KMOD_BT_HIDP prompt "kmod-bluetooth-hidp............... HIDP protocol support" tristate default n + depends on !ADK_LINUX_CRIS_FOXBOARD + select ADK_KERNEL_INPUT select ADK_KERNEL_HID depends on ADK_KPACKAGE_KMOD_BT depends on ADK_KPACKAGE_KMOD_BT_L2CAP diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 3721c7584..dc417c146 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -14,6 +14,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET config ADK_KPACKAGE_KMOD_EXPORTFS tristate + depends on !ADK_KERNEL_EXPORTFS default n help @@ -70,12 +71,14 @@ config ADK_KPACKAGE_KMOD_EXT3_FS config ADK_KERNEL_EXT4_FS boolean select ADK_KERNEL_CRC16 + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_EXT4_FS prompt "kmod-fs-ext4...................... EXT4 filesystem support" tristate - depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_KERNEL_EXT4_FS + depends on !ADK_LINUX_CRIS_FOXBOARD select ADK_KPACKAGE_KMOD_CRC16 default n help @@ -174,20 +177,6 @@ config ADK_KPACKAGE_KMOD_XFS_FS for complete details. This implementation is on-disk compatible with the IRIX version of XFS. -#config ADK_KPACKAGE_KMOD_YAFFS_FS -# prompt "kmod-fs-yaffs..................... YAFFS1/2 filesystem support" -# tristate -# default n -# select ADK_KERNEL_YAFFS_FS -# select ADK_KERNEL_YAFFS_YAFFS1 -# select ADK_KERNEL_YAFFS_YAFFS2 -# select ADK_KERNEL_YAFFS_AUTO_YAFFS2 -# select ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM -# help -# Support for the YAFFS1 and YAFFS2 filesystems for the rb532 NAND -# internal flash (for example). Say 'yes' here if you want to build -# an initramfs for the Routerboard with access to internal flash. -# config ADK_KPACKAGE_KMOD_FUSE_FS prompt "kmod-fs-fuse...................... Filesystem in Userspace support" tristate diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 71236c47f..1db9d72b6 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -49,6 +49,7 @@ config ADK_KPACKAGE_KMOD_NFS_FS default n select ADK_KERNEL_NFS_V3 select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_LOCKD depends on !ADK_TARGET_ROOTFS_NFSROOT help If you are connected to some other (usually local) Unix computer @@ -92,9 +93,10 @@ config ADK_KPACKAGE_KMOD_NFSD prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)" tristate default n - select ADK_KPACKAGE_KMOD_EXPORTFS + select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS select ADK_KERNEL_NFSD_V3 - depends on ADK_KPACKAGE_KMOD_NFS_FS + select ADK_KPACKAGE_KMOD_SUNRPC + select ADK_KPACKAGE_KMOD_LOCKD help If you want your Linux box to act as an NFS *server*, so that other computers on your local network which support NFS can access certain @@ -126,14 +128,20 @@ config ADK_KERNEL_NFSD_V4 help NFSv4 with Kerberos authentication. +config ADK_KPACKAGE_KMOD_LOCKD + tristate + default n + config ADK_KPACKAGE_KMOD_SUNRPC tristate default n config ADK_KPACKAGE_KMOD_SUNRPC_GSS tristate + select ADK_KPACKAGE_KMOD_SUNRPC default n config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5 tristate + select ADK_KPACKAGE_KMOD_SUNRPC_GSS default n diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index e281290a2..c320c43a7 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -14,7 +14,7 @@ config ADK_KERNEL_HID_SUPPORT default n config ADK_KERNEL_HID - tristate + bool select ADK_KERNEL_HID_SUPPORT default n @@ -25,6 +25,7 @@ config ADK_KPACKAGE_KMOD_USB_HID select ADK_KERNEL_HID select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB + depends on !ADK_LINUX_CRIS_FOXBOARD default n config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD diff --git a/target/linux/config/Config.in.isdn b/target/linux/config/Config.in.isdn index 596160e54..e876fd5ef 100644 --- a/target/linux/config/Config.in.isdn +++ b/target/linux/config/Config.in.isdn @@ -38,6 +38,7 @@ config ADK_KPACKAGE_KMOD_ISDN_CAPI tristate select ADK_KERNEL_ISDN_CAPI_CAPI20 select ADK_KERNEL_ISDN + depends on !ADK_LINUX_CRIS_FOXBOARD default n help Kernel support for CAPI 2.0 and /dev/capi20 diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index e61eb46df..abc7364df 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -87,29 +87,3 @@ config ADK_KERNEL_NFS_COMMON config ADK_KERNEL_SUNRPC boolean default n - -#config ADK_KERNEL_YAFFS_FS -# tristate -# default n - -#config ADK_KERNEL_YAFFS_YAFFS1 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_YAFFS2 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_AUTO_YAFFS2 -# boolean -# default n - -#config ADK_KERNEL_YAFFS_CHECKPOINT_RESERVED_BLOCKS -# int -# default 0 - -#config ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM -# boolean -# default n - - diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index fd62e69a1..7ed83c79e 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -9,6 +9,7 @@ menu "Miscellaneous devices support" config ADK_KERNEL_WATCHDOG boolean + default y if ADK_TARGET_WITH_WATCHDOG default n config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 6c0e91517..b24ac2fa3 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -1,5 +1,5 @@ menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD config ADK_KERNEL_SND_TIMER boolean diff --git a/target/linux/patches/2.6.32/startup.patch b/target/linux/patches/2.6.32/startup.patch index 25302f8d9..1e50e6312 100644 --- a/target/linux/patches/2.6.32/startup.patch +++ b/target/linux/patches/2.6.32/startup.patch @@ -1,16 +1,16 @@ -diff -Nur linux-2.6.30.5.orig/init/main.c linux-2.6.30.5/init/main.c ---- linux-2.6.30.5.orig/init/main.c 2009-08-16 23:19:38.000000000 +0200 -+++ linux-2.6.30.5/init/main.c 2009-08-22 20:26:39.000000000 +0200 -@@ -811,7 +811,7 @@ - numa_default_policy(); - +diff -Nur linux-2.6.32.orig/init/main.c linux-2.6.32/init/main.c +--- linux-2.6.32.orig/init/main.c 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/init/main.c 2010-01-31 11:01:41.154334301 +0100 +@@ -814,6 +814,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) -- printk(KERN_WARNING "Warning: unable to open an initial console.\n"); -+ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n"); + printk(KERN_WARNING "Warning: unable to open an initial console.\n"); ++ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n"); ++ (void) sys_dup(0); (void) sys_dup(0); -@@ -835,6 +835,7 @@ + +@@ -836,6 +838,7 @@ printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } diff --git a/target/linux/patches/2.6.32/yaffs2.patch b/target/linux/patches/2.6.32/yaffs2.patch index a19ab9c84..d23ad0161 100644 --- a/target/linux/patches/2.6.32/yaffs2.patch +++ b/target/linux/patches/2.6.32/yaffs2.patch @@ -1,7 +1,7 @@ -diff -Nur linux-2.6.30.orig/fs/Kconfig linux-2.6.30/fs/Kconfig ---- linux-2.6.30.orig/fs/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ linux-2.6.30/fs/Kconfig 2009-06-11 09:21:04.000000000 +0200 -@@ -162,6 +162,10 @@ +diff -Nur linux-2.6.32.orig/fs/Kconfig linux-2.6.32/fs/Kconfig +--- linux-2.6.32.orig/fs/Kconfig 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/fs/Kconfig 2010-01-30 20:35:00.921899692 +0100 +@@ -174,6 +174,10 @@ source "fs/befs/Kconfig" source "fs/bfs/Kconfig" source "fs/efs/Kconfig" @@ -12,17 +12,17 @@ diff -Nur linux-2.6.30.orig/fs/Kconfig linux-2.6.30/fs/Kconfig source "fs/jffs2/Kconfig" # UBIFS File system configuration source "fs/ubifs/Kconfig" -diff -Nur linux-2.6.30.orig/fs/Makefile linux-2.6.30/fs/Makefile ---- linux-2.6.30.orig/fs/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ linux-2.6.30/fs/Makefile 2009-06-11 09:21:31.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/Makefile linux-2.6.32/fs/Makefile +--- linux-2.6.32.orig/fs/Makefile 2009-12-03 04:51:21.000000000 +0100 ++++ linux-2.6.32/fs/Makefile 2010-01-30 20:35:00.933084814 +0100 @@ -124,3 +124,4 @@ obj-$(CONFIG_BTRFS_FS) += btrfs/ obj-$(CONFIG_GFS2_FS) += gfs2/ obj-$(CONFIG_EXOFS_FS) += exofs/ +obj-$(CONFIG_YAFFS_FS) += yaffs2/ -diff -Nur linux-2.6.30.orig/fs/Makefile.pre.yaffs linux-2.6.30/fs/Makefile.pre.yaffs ---- linux-2.6.30.orig/fs/Makefile.pre.yaffs 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/Makefile.pre.yaffs 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/Makefile.pre.yaffs linux-2.6.32/fs/Makefile.pre.yaffs +--- linux-2.6.32.orig/fs/Makefile.pre.yaffs 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/Makefile.pre.yaffs 2010-01-30 20:35:00.983076819 +0100 @@ -0,0 +1,126 @@ +# +# Makefile for the Linux filesystems. @@ -150,9 +150,9 @@ diff -Nur linux-2.6.30.orig/fs/Makefile.pre.yaffs linux-2.6.30/fs/Makefile.pre.y +obj-$(CONFIG_OCFS2_FS) += ocfs2/ +obj-$(CONFIG_BTRFS_FS) += btrfs/ +obj-$(CONFIG_GFS2_FS) += gfs2/ -diff -Nur linux-2.6.30.orig/fs/yaffs2/devextras.h linux-2.6.30/fs/yaffs2/devextras.h ---- linux-2.6.30.orig/fs/yaffs2/devextras.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/devextras.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/devextras.h linux-2.6.32/fs/yaffs2/devextras.h +--- linux-2.6.32.orig/fs/yaffs2/devextras.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/devextras.h 2010-01-30 20:35:01.021829008 +0100 @@ -0,0 +1,196 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -350,9 +350,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/devextras.h linux-2.6.30/fs/yaffs2/devextr + + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/Kconfig linux-2.6.30/fs/yaffs2/Kconfig ---- linux-2.6.30.orig/fs/yaffs2/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/Kconfig 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/Kconfig linux-2.6.32/fs/yaffs2/Kconfig +--- linux-2.6.32.orig/fs/yaffs2/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/Kconfig 2010-01-30 20:35:01.053081300 +0100 @@ -0,0 +1,156 @@ +# +# YAFFS file system configurations @@ -510,9 +510,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/Kconfig linux-2.6.30/fs/yaffs2/Kconfig + but makes look-ups faster. + + If unsure, say Y. -diff -Nur linux-2.6.30.orig/fs/yaffs2/Makefile linux-2.6.30/fs/yaffs2/Makefile ---- linux-2.6.30.orig/fs/yaffs2/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/Makefile 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/Makefile linux-2.6.32/fs/yaffs2/Makefile +--- linux-2.6.32.orig/fs/yaffs2/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/Makefile 2010-01-30 20:35:01.093074881 +0100 @@ -0,0 +1,10 @@ +# +# Makefile for the linux YAFFS filesystem routines. @@ -524,9 +524,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/Makefile linux-2.6.30/fs/yaffs2/Makefile +yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o +yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o +yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o -diff -Nur linux-2.6.30.orig/fs/yaffs2/moduleconfig.h linux-2.6.30/fs/yaffs2/moduleconfig.h ---- linux-2.6.30.orig/fs/yaffs2/moduleconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/moduleconfig.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/moduleconfig.h linux-2.6.32/fs/yaffs2/moduleconfig.h +--- linux-2.6.32.orig/fs/yaffs2/moduleconfig.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/moduleconfig.h 2010-01-30 20:35:01.131828051 +0100 @@ -0,0 +1,65 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -593,9 +593,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/moduleconfig.h linux-2.6.30/fs/yaffs2/modu +#endif /* YAFFS_OUT_OF_TREE */ + +#endif /* __YAFFS_CONFIG_H__ */ -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.30/fs/yaffs2/yaffs_checkptrw.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_checkptrw.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.32/fs/yaffs2/yaffs_checkptrw.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_checkptrw.c 2010-01-30 20:35:01.171829690 +0100 @@ -0,0 +1,394 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -991,9 +991,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.c linux-2.6.30/fs/yaffs2/y + + + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.30/fs/yaffs2/yaffs_checkptrw.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_checkptrw.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.32/fs/yaffs2/yaffs_checkptrw.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_checkptrw.h 2010-01-30 20:35:01.213084831 +0100 @@ -0,0 +1,35 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -1030,9 +1030,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_checkptrw.h linux-2.6.30/fs/yaffs2/y + +#endif + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.30/fs/yaffs2/yaffs_ecc.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_ecc.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.32/fs/yaffs2/yaffs_ecc.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_ecc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_ecc.c 2010-01-30 20:35:01.251829837 +0100 @@ -0,0 +1,326 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -1360,9 +1360,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.c linux-2.6.30/fs/yaffs2/yaffs_e + + return -1; +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.30/fs/yaffs2/yaffs_ecc.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_ecc.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.32/fs/yaffs2/yaffs_ecc.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_ecc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_ecc.h 2010-01-30 20:35:01.292693842 +0100 @@ -0,0 +1,44 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -1408,9 +1408,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_ecc.h linux-2.6.30/fs/yaffs2/yaffs_e + yaffs_ECCOther *read_ecc, + const yaffs_ECCOther *test_ecc); +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_fs.c linux-2.6.30/fs/yaffs2/yaffs_fs.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_fs.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_fs.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_fs.c linux-2.6.32/fs/yaffs2/yaffs_fs.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_fs.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_fs.c 2010-01-30 20:35:01.331845579 +0100 @@ -0,0 +1,2529 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -3941,9 +3941,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_fs.c linux-2.6.30/fs/yaffs2/yaffs_fs +MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); +MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006"); +MODULE_LICENSE("GPL"); -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.30/fs/yaffs2/yaffs_getblockinfo.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_getblockinfo.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.32/fs/yaffs2/yaffs_getblockinfo.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_getblockinfo.h 2010-01-30 20:35:01.373074589 +0100 @@ -0,0 +1,34 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -3979,9 +3979,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_getblockinfo.h linux-2.6.30/fs/yaffs +} + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_guts.c linux-2.6.30/fs/yaffs2/yaffs_guts.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_guts.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_guts.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_guts.c linux-2.6.32/fs/yaffs2/yaffs_guts.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_guts.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_guts.c 2010-01-30 20:35:01.393075518 +0100 @@ -0,0 +1,7552 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -11535,9 +11535,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_guts.c linux-2.6.30/fs/yaffs2/yaffs_ +#endif + return YAFFS_OK; +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_guts.h linux-2.6.30/fs/yaffs2/yaffs_guts.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_guts.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_guts.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_guts.h linux-2.6.32/fs/yaffs2/yaffs_guts.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_guts.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_guts.h 2010-01-30 20:35:01.441990129 +0100 @@ -0,0 +1,904 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -12443,9 +12443,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_guts.h linux-2.6.30/fs/yaffs2/yaffs_ +void yaffs_ReleaseTempBuffer(yaffs_Device *dev, __u8 *buffer, int lineNo); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffsinterface.h linux-2.6.30/fs/yaffs2/yaffsinterface.h ---- linux-2.6.30.orig/fs/yaffs2/yaffsinterface.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffsinterface.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffsinterface.h linux-2.6.32/fs/yaffs2/yaffsinterface.h +--- linux-2.6.32.orig/fs/yaffs2/yaffsinterface.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffsinterface.h 2010-01-30 20:35:01.492020092 +0100 @@ -0,0 +1,21 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -12468,9 +12468,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffsinterface.h linux-2.6.30/fs/yaffs2/ya +int yaffs_Initialise(unsigned nBlocks); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.30/fs/yaffs2/yaffs_mtdif1.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif1.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.32/fs/yaffs2/yaffs_mtdif1.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif1.c 2010-01-30 20:35:01.534033438 +0100 @@ -0,0 +1,365 @@ +/* + * YAFFS: Yet another FFS. A NAND-flash specific file system. @@ -12837,9 +12837,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.c linux-2.6.30/fs/yaffs2/yaff +} + +#endif /*MTD_VERSION*/ -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.30/fs/yaffs2/yaffs_mtdif1.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif1.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.32/fs/yaffs2/yaffs_mtdif1.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif1.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif1.h 2010-01-30 20:35:01.572068025 +0100 @@ -0,0 +1,28 @@ +/* + * YAFFS: Yet another Flash File System. A NAND-flash specific file system. @@ -12869,9 +12869,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif1.h linux-2.6.30/fs/yaffs2/yaff + yaffs_BlockState *state, __u32 *sequenceNumber); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.30/fs/yaffs2/yaffs_mtdif2.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif2.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.32/fs/yaffs2/yaffs_mtdif2.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif2.c 2010-01-30 20:35:01.611828597 +0100 @@ -0,0 +1,246 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -13119,9 +13119,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.c linux-2.6.30/fs/yaffs2/yaff + return YAFFS_FAIL; +} + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.30/fs/yaffs2/yaffs_mtdif2.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif2.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.32/fs/yaffs2/yaffs_mtdif2.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif2.h 2010-01-30 20:35:01.663084824 +0100 @@ -0,0 +1,29 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -13152,9 +13152,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif2.h linux-2.6.30/fs/yaffs2/yaff + yaffs_BlockState *state, __u32 *sequenceNumber); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.30/fs/yaffs2/yaffs_mtdif.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.32/fs/yaffs2/yaffs_mtdif.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif.c 2010-01-30 20:35:01.701828807 +0100 @@ -0,0 +1,241 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -13397,9 +13397,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.c linux-2.6.30/fs/yaffs2/yaffs + return YAFFS_OK; +} + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.30/fs/yaffs2/yaffs_mtdif.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_mtdif.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.32/fs/yaffs2/yaffs_mtdif.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_mtdif.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_mtdif.h 2010-01-30 20:35:01.733074983 +0100 @@ -0,0 +1,32 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -13433,9 +13433,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_mtdif.h linux-2.6.30/fs/yaffs2/yaffs +int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber); +int nandmtd_InitialiseNAND(yaffs_Device *dev); +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nand.c linux-2.6.30/fs/yaffs2/yaffs_nand.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_nand.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_nand.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_nand.c linux-2.6.32/fs/yaffs2/yaffs_nand.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_nand.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_nand.c 2010-01-30 20:35:01.771938289 +0100 @@ -0,0 +1,135 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -13572,9 +13572,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nand.c linux-2.6.30/fs/yaffs2/yaffs_ + + + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.30/fs/yaffs2/yaffs_nandemul2k.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_nandemul2k.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_nandemul2k.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.32/fs/yaffs2/yaffs_nandemul2k.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_nandemul2k.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_nandemul2k.h 2010-01-30 20:35:01.811826092 +0100 @@ -0,0 +1,39 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -13615,9 +13615,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.30/fs/yaffs2/ +int nandemul2k_GetNumberOfBlocks(void); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nand.h linux-2.6.30/fs/yaffs2/yaffs_nand.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_nand.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_nand.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_nand.h linux-2.6.32/fs/yaffs2/yaffs_nand.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_nand.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_nand.h 2010-01-30 20:35:01.851862979 +0100 @@ -0,0 +1,44 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -13663,9 +13663,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_nand.h linux-2.6.30/fs/yaffs2/yaffs_ + +#endif + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.30/fs/yaffs2/yaffs_packedtags1.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_packedtags1.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.32/fs/yaffs2/yaffs_packedtags1.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_packedtags1.c 2010-01-30 20:35:01.902201298 +0100 @@ -0,0 +1,50 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -13717,9 +13717,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.c linux-2.6.30/fs/yaffs2 + memset(t, 0, sizeof(yaffs_ExtendedTags)); + } +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.30/fs/yaffs2/yaffs_packedtags1.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_packedtags1.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.32/fs/yaffs2/yaffs_packedtags1.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_packedtags1.h 2010-01-30 20:35:01.951826961 +0100 @@ -0,0 +1,37 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -13758,9 +13758,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags1.h linux-2.6.30/fs/yaffs2 +void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t); +void yaffs_UnpackTags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt); +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.30/fs/yaffs2/yaffs_packedtags2.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_packedtags2.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.32/fs/yaffs2/yaffs_packedtags2.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_packedtags2.c 2010-01-30 20:35:01.991823846 +0100 @@ -0,0 +1,206 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -13968,9 +13968,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.c linux-2.6.30/fs/yaffs2 + +} + -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.30/fs/yaffs2/yaffs_packedtags2.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_packedtags2.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.32/fs/yaffs2/yaffs_packedtags2.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_packedtags2.h 2010-01-30 20:35:02.031973375 +0100 @@ -0,0 +1,43 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -14015,9 +14015,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_packedtags2.h linux-2.6.30/fs/yaffs2 +void yaffs_PackTags2TagsPart(yaffs_PackedTags2TagsPart *pt, const yaffs_ExtendedTags *t); +void yaffs_UnpackTags2TagsPart(yaffs_ExtendedTags *t, yaffs_PackedTags2TagsPart *pt); +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.c linux-2.6.30/fs/yaffs2/yaffs_qsort.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_qsort.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_qsort.c linux-2.6.32/fs/yaffs2/yaffs_qsort.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_qsort.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_qsort.c 2010-01-30 20:35:02.071829765 +0100 @@ -0,0 +1,163 @@ +/* + * Copyright (c) 1992, 1993 @@ -14182,9 +14182,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.c linux-2.6.30/fs/yaffs2/yaffs + } +/* yaffs_qsort(pn - r, r / es, es, cmp);*/ +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.h linux-2.6.30/fs/yaffs2/yaffs_qsort.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_qsort.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_qsort.h linux-2.6.32/fs/yaffs2/yaffs_qsort.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_qsort.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_qsort.h 2010-01-30 20:35:02.131826281 +0100 @@ -0,0 +1,23 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -14209,9 +14209,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_qsort.h linux-2.6.30/fs/yaffs2/yaffs + int (*cmp)(const void *, const void *)); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.30/fs/yaffs2/yaffs_tagscompat.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_tagscompat.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.32/fs/yaffs2/yaffs_tagscompat.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_tagscompat.c 2010-01-30 20:35:02.173084965 +0100 @@ -0,0 +1,541 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -14754,9 +14754,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.c linux-2.6.30/fs/yaffs2/ + + return YAFFS_OK; +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.30/fs/yaffs2/yaffs_tagscompat.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_tagscompat.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.32/fs/yaffs2/yaffs_tagscompat.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_tagscompat.h 2010-01-30 20:35:02.213084840 +0100 @@ -0,0 +1,39 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -14797,9 +14797,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagscompat.h linux-2.6.30/fs/yaffs2/ +int yaffs_CountBits(__u8 byte); + +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.30/fs/yaffs2/yaffs_tagsvalidity.c ---- linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_tagsvalidity.c 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.32/fs/yaffs2/yaffs_tagsvalidity.c +--- linux-2.6.32.orig/fs/yaffs2/yaffs_tagsvalidity.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_tagsvalidity.c 2010-01-30 20:35:02.251827798 +0100 @@ -0,0 +1,28 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. @@ -14829,9 +14829,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.30/fs/yaffs + tags->validMarker1 == 0x55555555); + +} -diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.30/fs/yaffs2/yaffs_tagsvalidity.h ---- linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yaffs_tagsvalidity.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.32/fs/yaffs2/yaffs_tagsvalidity.h +--- linux-2.6.32.orig/fs/yaffs2/yaffs_tagsvalidity.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yaffs_tagsvalidity.h 2010-01-30 20:35:02.292761803 +0100 @@ -0,0 +1,24 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. @@ -14857,9 +14857,9 @@ diff -Nur linux-2.6.30.orig/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.30/fs/yaffs +void yaffs_InitialiseTags(yaffs_ExtendedTags *tags); +int yaffs_ValidateTags(yaffs_ExtendedTags *tags); +#endif -diff -Nur linux-2.6.30.orig/fs/yaffs2/yportenv.h linux-2.6.30/fs/yaffs2/yportenv.h ---- linux-2.6.30.orig/fs/yaffs2/yportenv.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.30/fs/yaffs2/yportenv.h 2009-06-11 09:21:04.000000000 +0200 +diff -Nur linux-2.6.32.orig/fs/yaffs2/yportenv.h linux-2.6.32/fs/yaffs2/yportenv.h +--- linux-2.6.32.orig/fs/yaffs2/yportenv.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.32/fs/yaffs2/yportenv.h 2010-01-30 20:35:02.332076176 +0100 @@ -0,0 +1,203 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile index dcbb46b31..03513b8f2 100644 --- a/target/qemu-mipsel/Makefile +++ b/target/qemu-mipsel/Makefile @@ -12,7 +12,7 @@ kernel-install: ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," + @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Be sure to change permissions after image creation." diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index d9828d77f..44e4b2319 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -28,7 +28,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -39,7 +39,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -49,6 +49,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img' + @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile index fe980bdac..b7847eeaa 100644 --- a/target/qemu-x86_64/Makefile +++ b/target/qemu-x86_64/Makefile @@ -29,7 +29,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -40,7 +40,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif @@ -50,6 +50,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit @echo 'You need a dummy qemu.img, create it with:' @echo 'qemu-img create -f raw qemu.img 1M' @echo "Start qemu with following command line:" - @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img' + @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 77a204a11..27a070c31 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -26,7 +26,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' - @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/rb532/TODO b/target/rb532/TODO new file mode 100644 index 000000000..f48d0f482 --- /dev/null +++ b/target/rb532/TODO @@ -0,0 +1 @@ +- implement cfgfs for NAND/YAFFS2 rootfs diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config index 7516f64e4..f9ce20f75 100644 --- a/target/rb532/kernel.config +++ b/target/rb532/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30 -# Sat Jun 27 21:41:18 2009 +# Linux kernel version: 2.6.32 +# Sat Jan 30 22:33:23 2010 # CONFIG_MIPS=y @@ -9,13 +9,15 @@ CONFIG_MIPS=y # Machine selection # # CONFIG_MACH_ALCHEMY is not set +# CONFIG_AR7 is not set # CONFIG_BASLER_EXCITE is not set # CONFIG_BCM47XX is not set +# CONFIG_BCM63XX is not set # CONFIG_MIPS_COBALT is not set # CONFIG_MACH_DECSTATION is not set # CONFIG_MACH_JAZZ is not set # CONFIG_LASAT is not set -# CONFIG_LEMOTE_FULONG is not set +# CONFIG_MACH_LOONGSON is not set # CONFIG_MIPS_MALTA is not set # CONFIG_MIPS_SIM is not set # CONFIG_NEC_MARKEINS is not set @@ -45,6 +47,7 @@ CONFIG_MIKROTIK_RB532=y # CONFIG_WR_PPMC is not set # CONFIG_CAVIUM_OCTEON_SIMULATOR is not set # CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set +# CONFIG_ALCHEMY_GPIO_INDIRECT is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set @@ -64,7 +67,6 @@ CONFIG_CSRC_R4K_LIB=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y CONFIG_DMA_NEED_PCI_MAP_STATE=y -# CONFIG_HOTPLUG_CPU is not set # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_GPIO=y # CONFIG_CPU_BIG_ENDIAN is not set @@ -77,7 +79,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=4 # # CPU selection # -# CONFIG_CPU_LOONGSON2 is not set +# CONFIG_CPU_LOONGSON2E is not set CONFIG_CPU_MIPS32_R1=y # CONFIG_CPU_MIPS32_R2 is not set # CONFIG_CPU_MIPS64_R1 is not set @@ -120,7 +122,6 @@ CONFIG_CPU_HAS_PREFETCH=y CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set # CONFIG_MIPS_MT_SMTC is not set -CONFIG_CPU_HAS_LLSC=y CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y @@ -138,8 +139,10 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=0 CONFIG_VIRT_TO_BUS=y -# CONFIG_UNEVICTABLE_LRU is not set CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -161,6 +164,7 @@ CONFIG_PREEMPT_NONE=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y # # General setup @@ -181,11 +185,12 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 # CONFIG_GROUP_SCHED is not set @@ -201,7 +206,6 @@ CONFIG_EMBEDDED=y CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set -# CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -215,17 +219,24 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_VM_EVENT_COUNTERS=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_VM_EVENT_COUNTERS is not set CONFIG_PCI_QUIRKS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y + +# +# GCOV-based kernel profiling +# # CONFIG_SLOW_WORK is not set -# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 @@ -236,7 +247,7 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y -# CONFIG_LBD is not set +CONFIG_LBDAF=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_BLK_DEV_INTEGRITY is not set @@ -279,6 +290,7 @@ CONFIG_TRAD_SIGNALS=y # # Power management options # +CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_PM is not set CONFIG_NET=y @@ -289,11 +301,6 @@ CONFIG_NET=y CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -301,13 +308,10 @@ 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_MULTIPATH=y +# CONFIG_IP_MULTIPLE_TABLES is not set +# CONFIG_IP_ROUTE_MULTIPATH is not set # CONFIG_IP_ROUTE_VERBOSE is not set -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_IP_PNP_RARP is not set +# CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set @@ -318,9 +322,9 @@ CONFIG_SYN_COOKIES=y # 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_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y @@ -333,6 +337,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -347,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -359,7 +365,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_AF_RXRPC is not set -CONFIG_FIB_RULES=y # CONFIG_WIRELESS is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set @@ -373,12 +378,97 @@ CONFIG_FIB_RULES=y # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_ROOTFS_ROOT_DEV is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_CHAR is not set +CONFIG_MTD_BLKDEVS=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 +# CONFIG_SSFDC is not set +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE 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_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# 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 +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +CONFIG_MTD_NAND_PLATFORM=y +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set CONFIG_BLK_DEV=y # CONFIG_BLK_CPQ_DA is not set @@ -416,10 +506,6 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set @@ -436,6 +522,8 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SRP_ATTRS is not set CONFIG_SCSI_LOWLEVEL=y # CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_ACARD is not set @@ -444,6 +532,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_ADVANSYS is not set # CONFIG_SCSI_ARCMSR is not set @@ -460,7 +549,6 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set -# CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set @@ -472,11 +560,14 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set # CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y # CONFIG_SATA_PMP is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SIL24 is not set @@ -498,6 +589,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set # CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set @@ -526,6 +618,7 @@ CONFIG_ATA_SFF=y # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RB532=y +# CONFIG_PATA_RDC is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set # CONFIG_PATA_SERVERWORKS is not set @@ -544,13 +637,16 @@ CONFIG_PATA_RB532=y # # -# Enable only one of the two stacks, unless you know what you are doing +# You can enable one or both FireWire driver stacks. +# + +# +# See the help texts for more information. # # CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set # CONFIG_I2O is not set CONFIG_NETDEVICES=y -CONFIG_COMPAT_NET_DEV_OPS=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_MACVLAN is not set @@ -599,6 +695,8 @@ CONFIG_NET_PCI=y # CONFIG_SMSC9420 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set +# CONFIG_KS8842 is not set +# CONFIG_KS8851_MLL is not set CONFIG_VIA_RHINE=y CONFIG_VIA_RHINE_MMIO=y # CONFIG_SC92031 is not set @@ -606,10 +704,7 @@ CONFIG_VIA_RHINE_MMIO=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_TR is not set - -# -# Wireless LAN -# +CONFIG_WLAN=y # CONFIG_WLAN_PRE80211 is not set # CONFIG_WLAN_80211 is not set @@ -662,12 +757,8 @@ CONFIG_INPUT=y # # Character devices # -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_DEVKMEM=y +# CONFIG_VT is not set +# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set @@ -676,9 +767,9 @@ CONFIG_DEVKMEM=y # 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_PCI is not set +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 # CONFIG_SERIAL_8250_EXTENDED is not set # @@ -699,6 +790,11 @@ CONFIG_UNIX98_PTYS=y CONFIG_DEVPORT=y # CONFIG_I2C is not set # CONFIG_SPI is not set + +# +# PPS support +# +# CONFIG_PPS is not set CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_GPIO_SYSFS is not set @@ -715,16 +811,34 @@ CONFIG_GPIOLIB=y # PCI GPIO expanders: # # CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set # # SPI GPIO expanders: # + +# +# AC97 GPIO expanders: +# # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set -# CONFIG_WATCHDOG is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_ALIM7101_WDT is not set +CONFIG_RC32434_WDT=y + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set CONFIG_SSB_POSSIBLE=y # @@ -740,26 +854,12 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set # CONFIG_REGULATOR is not set - -# -# Multimedia devices -# - -# -# Multimedia core support -# -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set -# CONFIG_VIDEO_MEDIA is not set - -# -# Multimedia drivers -# -# CONFIG_DAB is not set +# CONFIG_MEDIA_SUPPORT is not set # # Graphics support # +# CONFIG_VGA_ARB is not set # CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set @@ -770,12 +870,6 @@ CONFIG_SSB_POSSIBLE=y # Display device support # # CONFIG_DISPLAY_SUPPORT is not set - -# -# Console display driver support -# -# CONFIG_VGA_CONSOLE is not set -CONFIG_DUMMY_CONSOLE=y # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y @@ -809,6 +903,10 @@ CONFIG_RTC_LIB=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set + +# +# TI VLYNQ +# # CONFIG_STAGING is not set # @@ -820,13 +918,17 @@ CONFIG_RTC_LIB=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set -CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set -CONFIG_DNOTIFY=y -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y +# CONFIG_NILFS2_FS is not set +# CONFIG_AUFS_FS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FSNOTIFY is not set +# CONFIG_DNOTIFY is not set +# CONFIG_INOTIFY is not set +# CONFIG_INOTIFY_USER is not set # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set @@ -870,6 +972,17 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_YAFFS1=y +# CONFIG_YAFFS_9BYTE_TAGS is not set +# CONFIG_YAFFS_DOES_ECC is not set +CONFIG_YAFFS_YAFFS2=y +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y +# CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set # CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set @@ -880,7 +993,6 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -# CONFIG_NILFS2_FS is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set @@ -907,6 +1019,7 @@ CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set @@ -915,22 +1028,10 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_TRACING_SUPPORT=y - -# -# Tracers -# -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_EVENT_TRACER is not set -# CONFIG_BOOT_TRACER is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_FTRACE is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -CONFIG_CMDLINE="console=ttyS0,115200" +CONFIG_CMDLINE="console=ttyS0,115200 nowayout=1" # # Security options @@ -944,7 +1045,6 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -# CONFIG_CRYPTO_FIPS is not set # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set @@ -976,11 +1076,13 @@ CONFIG_CRYPTO=y # # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set # # Digest # # CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_GHASH is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set diff --git a/target/rb532/uclibc.config b/target/rb532/uclibc.config index 9a6a711be..34038425d 100644 --- a/target/rb532/uclibc.config +++ b/target/rb532/uclibc.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.30.1 -# Thu Jun 18 16:03:47 2009 +# Version: 0.9.30.2 +# Fri Jan 29 19:30:32 2010 # # TARGET_alpha is not set # TARGET_arm is not set @@ -24,6 +24,7 @@ TARGET_mips=y # TARGET_sh is not set # TARGET_sh64 is not set # TARGET_sparc is not set +# TARGET_ubicom32 is not set # TARGET_v850 is not set # TARGET_vax is not set # TARGET_x86_64 is not set diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 713c7b161..e40fc2dec 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gcc -PKG_VERSION:= 4.4.2 +PKG_VERSION:= 4.4.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= 70f5ac588a79e3c9901d5b34f58d896d +PKG_MD5SUM:= fe1ca818fc6d2caeffc9051fe67ff103 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 9ecb2afa4..edb9bdc56 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -8,14 +8,10 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -#workaround for mips and gcc 4.4, where -Os does not inline code in ld.so -ifeq ($(ARCH),mips) -TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS)) -endif #workaround for cris and gcc 4.4, where -Os generates ICE -ifeq ($(ARCH),cris) -TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS)) -endif +#ifeq ($(ARCH),cris) +#TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS)) +#endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc index 5fdeb5a17..cc215bd1c 100644 --- a/toolchain/uClibc/Makefile.inc +++ b/toolchain/uClibc/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= uClibc -PKG_VERSION:= 0.9.30.1 +PKG_VERSION:= 0.9.30.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 1a4b84e5536ad8170563ffa88c34679c PKG_SITES:= http://uclibc.org/downloads/ diff --git a/toolchain/uClibc/patches/disable-opt-debug-cflags.patch b/toolchain/uClibc/patches/disable-opt-debug-cflags.patch deleted file mode 100644 index 434f1d793..000000000 --- a/toolchain/uClibc/patches/disable-opt-debug-cflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/Rules.mak uClibc-0.9.30.1/Rules.mak ---- uClibc-0.9.30.1.orig/Rules.mak 2009-03-02 22:10:04.000000000 +0100 -+++ uClibc-0.9.30.1/Rules.mak 2009-06-18 16:02:34.000000000 +0200 -@@ -150,9 +150,10 @@ - # Flags in OPTIMIZATION are used only for non-debug builds - OPTIMIZATION:= - # Use '-Os' optimization if available, else use -O2, allow Config to override --OPTIMIZATION+=$(call check_gcc,-Os,-O2) -+# disable, let OpenADK do the optimization -+#OPTIMIZATION+=$(call check_gcc,-Os,-O2) - # Use the gcc 3.4 -funit-at-a-time optimization when available --OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,) -+#OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,) - - GCC_MAJOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1) - #GCC_MINOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 2) -@@ -547,7 +548,7 @@ - - LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs - ifeq ($(DODEBUG),y) --CFLAGS += -O0 -g3 -+CFLAGS += - else - CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS) - endif diff --git a/toolchain/uClibc/patches/extension-insteadof-inline.patch b/toolchain/uClibc/patches/extension-insteadof-inline.patch deleted file mode 100644 index bd3a720e9..000000000 --- a/toolchain/uClibc/patches/extension-insteadof-inline.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/ldso/ldso/mips/dl-sysdep.h uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h ---- uClibc-0.9.30.1.orig/ldso/ldso/mips/dl-sysdep.h 2008-09-15 18:36:11.000000000 +0200 -+++ uClibc-0.9.30.1/ldso/ldso/mips/dl-sysdep.h 2009-06-21 19:08:44.487613137 +0200 -@@ -163,22 +163,25 @@ - - #define OFFSET_GP_GOT 0x7ff0 - --static __inline__ ElfW(Addr) * --elf_mips_got_from_gpreg (ElfW(Addr) gpreg) --{ -- /* FIXME: the offset of gp from GOT may be system-dependent. */ -- return (ElfW(Addr) *) (gpreg - OFFSET_GP_GOT); --} -+#define elf_mips_got_from_gpreg(gpreg) __extension__({ \ -+ ElfW(Addr) *elf_mips_got_from_gpreg_res; \ -+ \ -+ /* FIXME: the offset of gp from GOT may be system-dependent. */ \ -+ elf_mips_got_from_gpreg_res = gpreg - OFFSET_GP_GOT; \ -+ (elf_mips_got_from_gpreg_res); \ -+}) - - /* Return the link-time address of _DYNAMIC. Conveniently, this is the - first element of the GOT. This must be inlined in a function which - uses global data. We assume its $gp points to the primary GOT. */ --static __inline__ ElfW(Addr) --elf_machine_dynamic (void) --{ -- register ElfW(Addr) gp __asm__ ("$28"); -- return *elf_mips_got_from_gpreg (gp); --} -+#define elf_machine_dynamic() __extension__({ \ -+ register ElfW(Addr) elf_machine_dynamic_gp __asm__("$28"); \ -+ ElfW(Addr) elf_machine_dynamic_res; \ -+ \ -+ elf_machine_dynamic_res = *elf_mips_got_from_gpreg( \ -+ elf_machine_dynamic_gp); \ -+ (elf_machine_dynamic_res); \ -+}) - - #define STRINGXP(X) __STRING(X) - #define STRINGXV(X) STRINGV_(X) -@@ -192,21 +195,20 @@ - #endif - - /* Return the run-time load address of the shared object. */ --static __inline__ ElfW(Addr) --elf_machine_load_address (void) --{ -- ElfW(Addr) addr; -- __asm__ (" .set noreorder\n" -- " " STRINGXP (PTR_LA) " %0, 0f\n" -- " bltzal $0, 0f\n" -- " nop\n" -- "0: " STRINGXP (PTR_SUBU) " %0, $31, %0\n" -- " .set reorder\n" -- : "=r" (addr) -- : /* No inputs */ -- : "$31"); -- return addr; --} -+#define elf_machine_load_address() __extension__({ \ -+ ElfW(Addr) elf_machine_load_address_addr; \ -+ \ -+ __asm__ (" .set noreorder\n" \ -+ " " STRINGXP (PTR_LA) " %0, 0f\n" \ -+ " bltzal $0, 0f\n" \ -+ " nop\n" \ -+ "0: " STRINGXP (PTR_SUBU) " %0, $31, %0\n" \ -+ " .set reorder\n" \ -+ : "=r" (elf_machine_load_address_addr) \ -+ : /* No inputs */ \ -+ : "$31"); \ -+ (elf_machine_load_address_addr); \ -+}) - - static __inline__ void - elf_machine_relative (ElfW(Addr) load_off, const ElfW(Addr) rel_addr, diff --git a/toolchain/uClibc/patches/fastat-64bithost.patch b/toolchain/uClibc/patches/fastat-64bithost.patch new file mode 100644 index 000000000..dee068d00 --- /dev/null +++ b/toolchain/uClibc/patches/fastat-64bithost.patch @@ -0,0 +1,79 @@ +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat64.c uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat64.c +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat64.c 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat64.c 2010-01-23 11:55:14.000000000 +0100 +@@ -12,6 +12,11 @@ + + #ifdef __UCLIBC_HAS_LFS__ + ++/* 64bit ports tend to favor newfstatat() */ ++#ifdef __NR_newfstatat ++# define __NR_fstatat64 __NR_newfstatat ++#endif ++ + #ifdef __NR_fstatat64 + int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) + { +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat.c uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat.c +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/fstatat.c 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/common/fstatat.c 2010-01-23 11:54:50.000000000 +0100 +@@ -10,15 +10,20 @@ + #include <sys/stat.h> + #include "xstatconv.h" + ++/* 64bit ports tend to favor newfstatat() */ ++#ifdef __NR_newfstatat ++# define __NR_fstatat64 __NR_newfstatat ++#endif ++ + #ifdef __NR_fstatat64 + int fstatat(int fd, const char *file, struct stat *buf, int flag) + { + int ret; +- struct kernel_stat kbuf; ++ struct kernel_stat64 kbuf; + + ret = INLINE_SYSCALL(fstatat64, 4, fd, file, &kbuf, flag); + if (ret == 0) +- __xstat_conv(&kbuf, buf); ++ __xstat32_conv(&kbuf, buf); + + return ret; + } +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.c uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.c +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.c 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.c 2010-01-23 11:56:07.000000000 +0100 +@@ -70,4 +70,23 @@ + buf->st_ctim = kbuf->st_ctim; + } + ++void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) ++{ ++ /* Convert to current kernel version of `struct stat64'. */ ++ memset(buf, 0x00, sizeof(*buf)); ++ buf->st_dev = kbuf->st_dev; ++ buf->st_ino = kbuf->st_ino; ++ buf->st_mode = kbuf->st_mode; ++ buf->st_nlink = kbuf->st_nlink; ++ buf->st_uid = kbuf->st_uid; ++ buf->st_gid = kbuf->st_gid; ++ buf->st_rdev = kbuf->st_rdev; ++ buf->st_size = kbuf->st_size; ++ buf->st_blksize = kbuf->st_blksize; ++ buf->st_blocks = kbuf->st_blocks; ++ buf->st_atim = kbuf->st_atim; ++ buf->st_mtim = kbuf->st_mtim; ++ buf->st_ctim = kbuf->st_ctim; ++} ++ + #endif /* __UCLIBC_HAS_LFS__ */ +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.h uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.h +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/common/xstatconv.h 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/common/xstatconv.h 2010-01-23 11:56:38.000000000 +0100 +@@ -26,6 +26,7 @@ + #include <bits/kernel_stat.h> + + extern void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) attribute_hidden; ++extern void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) attribute_hidden; + #if defined __UCLIBC_HAS_LFS__ + extern void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) attribute_hidden; + #endif diff --git a/toolchain/uClibc/patches/getline.patch b/toolchain/uClibc/patches/getline.patch deleted file mode 100644 index fb9f9bcc2..000000000 --- a/toolchain/uClibc/patches/getline.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/extra/scripts/unifdef.c uClibc-0.9.30.1/extra/scripts/unifdef.c ---- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 -+++ uClibc-0.9.30.1/extra/scripts/unifdef.c 2009-10-10 12:37:04.230249774 +0200 -@@ -206,7 +206,7 @@ - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; diff --git a/toolchain/uClibc/patches/mips.patch b/toolchain/uClibc/patches/mips.patch new file mode 100644 index 000000000..59bf5963c --- /dev/null +++ b/toolchain/uClibc/patches/mips.patch @@ -0,0 +1,66 @@ +diff -Nur uClibc-0.9.30.2.orig/libc/sysdeps/linux/mips/crt1.S uClibc-0.9.30.2/libc/sysdeps/linux/mips/crt1.S +--- uClibc-0.9.30.2.orig/libc/sysdeps/linux/mips/crt1.S 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-0.9.30.2/libc/sysdeps/linux/mips/crt1.S 2010-01-24 20:33:06.297867491 +0100 +@@ -85,29 +85,10 @@ + + __start: + #ifdef __PIC__ +-#if _MIPS_SIM == _MIPS_SIM_ABI32 +- .frame sp, 24, sp +- .set noreorder +- move $0, $31 /* Save old ra. */ +- bal 10f /* Find addr of cpload. */ +- nop +-10: +- .cpload $31 +- move $31, $0 +- .set reorder +- .cprestore 16 +-#else +- move $0, $31; /* Save old ra. */ +- .set noreorder +- bal 10f /* Find addr of .cpsetup. */ +- nop +-10: +- .set reorder +- .cpsetup $31, $25, 10b +- move $31, $0 +-#endif ++ SETUP_GPX($0) ++ SETUP_GPX64($25,$0) + #else +- la $28, _gp /* Setup GP correctly if we're non-PIC. */ ++ PTR_LA $28, _gp /* Setup GP correctly if we're non-PIC. */ + move $31, $0 + #endif + +@@ -118,18 +99,18 @@ + /* Allocate space on the stack for seven arguments and + * make sure the stack is aligned to double words (8 bytes) */ + ++ and $29, -2 * SZREG ++ + #if _MIPS_SIM == _MIPS_SIM_ABI32 +- and $29, -2 * 4 +- subu $29, 32 +- la $7, _init /* init */ +- la $8, _fini +- sw $8, 16($29) /* fini */ +- sw $2, 20($29) /* rtld_fini */ +- sw $29, 24($29) /* stack_end */ +-#else +- and $29, -2 * PTRSIZE ++ PTR_SUBIU $29, 32 ++#endif + PTR_LA $7, _init /* init */ +- PTR_LA $8, _fini /* fini */ ++ PTR_LA $8, _fini ++#if _MIPS_SIM == _MIPS_SIM_ABI32 ++ PTR_S $8, 16($29) /* fini */ ++ PTR_S $2, 20($29) /* rtld_fini */ ++ PTR_S $29, 24($29) /* stack_end */ ++#else + move $9, $2 /* rtld_fini */ + move $10, $29 /* stack_end */ + #endif +- diff --git a/toolchain/uClibc/patches/mips64.patch b/toolchain/uClibc/patches/mips64.patch deleted file mode 100644 index 70fcc24e6..000000000 --- a/toolchain/uClibc/patches/mips64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/Rules.mak uClibc-0.9.30.1/Rules.mak ---- uClibc-0.9.30.1.orig/Rules.mak 2009-03-02 22:10:04.000000000 +0100 -+++ uClibc-0.9.30.1/Rules.mak 2009-05-28 15:08:37.000000000 +0200 -@@ -292,7 +292,7 @@ - CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32 - CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32R2)+=-march=mips32r2 -mtune=mips32r2 -- CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32 -+ CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 - ifeq ($(strip $(ARCH_BIG_ENDIAN)),y) - CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64btsmip - CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32btsmip diff --git a/toolchain/uClibc/patches/null-pointer.patch b/toolchain/uClibc/patches/null-pointer.patch deleted file mode 100644 index e77cd72b8..000000000 --- a/toolchain/uClibc/patches/null-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c uClibc-0.9.30.1/libc/inet/getaddrinfo.c ---- uClibc-0.9.30.1.orig/libc/inet/getaddrinfo.c 2009-02-26 13:49:14.000000000 +0100 -+++ uClibc-0.9.30.1/libc/inet/getaddrinfo.c 2009-06-14 17:46:45.000000000 +0200 -@@ -187,6 +187,8 @@ - } - - for (runp = ifa; runp != NULL; runp = runp->ifa_next) { -+ if (runp->ifa_addr == NULL) -+ continue; - #if defined __UCLIBC_HAS_IPV4__ - if (runp->ifa_addr->sa_family == PF_INET) - seen |= SEEN_IPV4; |