mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-25 06:23:35 +08:00
Merge branch 'next'
Conflicts: toolchain/kernel-headers/Config.in
This commit is contained in:
Peter Korsgaard
commit
bdb4c3a6dc
@ -99,6 +99,38 @@ config BR2_TARGET_UBOOT_FORMAT_LDR
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_TARGET_UBOOT_OMAP_IFT
|
||||
depends on BR2_TARGET_UBOOT_FORMAT_BIN
|
||||
depends on BR2_arm || BR2_armeb
|
||||
select BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
|
||||
bool "produce a .ift signed image (OMAP)"
|
||||
help
|
||||
Use gpsign to produce an image of u-boot.bin signed with
|
||||
a Configuration Header for booting on OMAP processors.
|
||||
This allows U-Boot to boot without the need for an
|
||||
intermediate bootloader (e.g. x-loader) if it is written
|
||||
on the first sector of the boot medium.
|
||||
This only works for some media, such as NAND. Check your
|
||||
chip documentation for details. You might also want to
|
||||
read the documentation of gpsign, the tool that generates
|
||||
the .ift image, at:
|
||||
https://github.com/nmenon/omap-u-boot-utils/blob/master/README
|
||||
|
||||
if BR2_TARGET_UBOOT_OMAP_IFT
|
||||
|
||||
config BR2_TARGET_UBOOT_OMAP_IFT_CONFIG
|
||||
string "gpsign Configuration Header config file"
|
||||
help
|
||||
The Configuration Header (CH) config file defines the
|
||||
desired content of the CH for the signed image.
|
||||
It usually contains external RAM settings and
|
||||
possibly other external devices initialization.
|
||||
The omap-u-boot-utils software contains example
|
||||
configuration files for some boards:
|
||||
https://github.com/nmenon/omap-u-boot-utils/tree/master/configs
|
||||
|
||||
endif
|
||||
|
||||
menuconfig BR2_TARGET_UBOOT_NETWORK
|
||||
bool "Custom Network Settings"
|
||||
help
|
||||
|
||||
@ -33,6 +33,7 @@ else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
|
||||
UBOOT_BIN = u-boot.img
|
||||
else
|
||||
UBOOT_BIN = u-boot.bin
|
||||
UBOOT_BIN_IFT = $(UBOOT_BIN).ift
|
||||
endif
|
||||
|
||||
UBOOT_ARCH=$(KERNEL_ARCH)
|
||||
@ -88,12 +89,36 @@ define UBOOT_BUILD_CMDS
|
||||
$(UBOOT_MAKE_TARGET)
|
||||
endef
|
||||
|
||||
define UBOOT_BUILD_OMAP_IFT
|
||||
$(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \
|
||||
-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_IMAGES_CMDS
|
||||
cp -dpf $(@D)/$(UBOOT_BIN) $(BINARIES_DIR)/
|
||||
$(if $(BR2_TARGET_UBOOT_SPL),
|
||||
cp -dpf $(@D)/$(BR2_TARGET_UBOOT_SPL_NAME) $(BINARIES_DIR)/)
|
||||
endef
|
||||
|
||||
define UBOOT_INSTALL_OMAP_IFT_IMAGE
|
||||
cp -dpf $(@D)/$(UBOOT_BIN_IFT) $(BINARIES_DIR)/
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT_OMAP_IFT),y)
|
||||
# we NEED a config file unless we're at make source
|
||||
ifeq ($(filter source,$(MAKECMDGOALS)),)
|
||||
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG)),)
|
||||
$(error No gpsign config file. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
|
||||
endif
|
||||
ifeq ($(wildcard $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))),)
|
||||
$(error gpsign config file $(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG) not found. Check your BR2_TARGET_UBOOT_OMAP_IFT_CONFIG setting)
|
||||
endif
|
||||
endif
|
||||
UBOOT_DEPENDENCIES += host-omap-u-boot-utils
|
||||
UBOOT_POST_BUILD_HOOKS += UBOOT_BUILD_OMAP_IFT
|
||||
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_INSTALL_OMAP_IFT_IMAGE
|
||||
endif
|
||||
|
||||
$(eval $(call GENTARGETS))
|
||||
|
||||
ifeq ($(BR2_TARGET_UBOOT),y)
|
||||
|
||||
@ -183,6 +183,15 @@ define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
|
||||
endef
|
||||
endif
|
||||
|
||||
|
||||
define LINUX_INSTALL_HOST_TOOLS
|
||||
# Installing dtc (device tree compiler) as host tool, if selected
|
||||
if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
|
||||
$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
|
||||
fi
|
||||
endef
|
||||
|
||||
|
||||
define LINUX_INSTALL_IMAGES_CMDS
|
||||
cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
|
||||
endef
|
||||
@ -197,6 +206,7 @@ define LINUX_INSTALL_TARGET_CMDS
|
||||
rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
|
||||
rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
|
||||
fi
|
||||
$(LINUX_INSTALL_HOST_TOOLS)
|
||||
endef
|
||||
|
||||
include linux/linux-ext-*.mk
|
||||
|
||||
@ -112,6 +112,7 @@ source "package/fbgrab/Config.in"
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/fbset/Config.in"
|
||||
endif
|
||||
source "package/fbterm/Config.in"
|
||||
source "package/fbv/Config.in"
|
||||
source "package/imagemagick/Config.in"
|
||||
source "package/linux-fusion/Config.in"
|
||||
@ -206,6 +207,7 @@ source "package/memtester/Config.in"
|
||||
source "package/minicom/Config.in"
|
||||
source "package/mtd/Config.in"
|
||||
source "package/ntfs-3g/Config.in"
|
||||
source "package/ofono/Config.in"
|
||||
source "package/open2300/Config.in"
|
||||
source "package/openocd/Config.in"
|
||||
source "package/parted/Config.in"
|
||||
@ -255,6 +257,7 @@ source "package/python/Config.in"
|
||||
if BR2_PACKAGE_PYTHON
|
||||
menu "external python modules"
|
||||
source "package/python-dpkt/Config.in"
|
||||
source "package/python-id3/Config.in"
|
||||
source "package/python-mad/Config.in"
|
||||
source "package/python-netifaces/Config.in"
|
||||
source "package/python-pygame/Config.in"
|
||||
@ -286,6 +289,7 @@ source "package/portaudio/Config.in"
|
||||
source "package/speex/Config.in"
|
||||
source "package/taglib/Config.in"
|
||||
source "package/tremor/Config.in"
|
||||
source "package/webrtc-audio-processing/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Compression and decompression"
|
||||
@ -360,6 +364,7 @@ source "package/tslib/Config.in"
|
||||
source "package/libftdi/Config.in"
|
||||
source "package/libhid/Config.in"
|
||||
source "package/libiqrf/Config.in"
|
||||
source "package/libnfc/Config.in"
|
||||
source "package/libusb/Config.in"
|
||||
source "package/libusb-compat/Config.in"
|
||||
source "package/libv4l/Config.in"
|
||||
@ -402,12 +407,15 @@ source "package/libmnl/Config.in"
|
||||
source "package/libmodbus/Config.in"
|
||||
source "package/libmbus/Config.in"
|
||||
source "package/libnetfilter_conntrack/Config.in"
|
||||
source "package/libnetfilter_cttimeout/Config.in"
|
||||
source "package/libnfnetlink/Config.in"
|
||||
source "package/libnl/Config.in"
|
||||
source "package/liboping/Config.in"
|
||||
source "package/libpcap/Config.in"
|
||||
source "package/libosip2/Config.in"
|
||||
source "package/librsync/Config.in"
|
||||
source "package/libsoup/Config.in"
|
||||
source "package/libtorrent/Config.in"
|
||||
source "package/libupnp/Config.in"
|
||||
source "package/libvncserver/Config.in"
|
||||
source "package/zeromq/Config.in"
|
||||
@ -470,7 +478,9 @@ endmenu
|
||||
endmenu
|
||||
|
||||
menu "Miscellaneous"
|
||||
source "package/collectd/Config.in"
|
||||
source "package/empty/Config.in"
|
||||
source "package/mobile-broadband-provider-info/Config.in"
|
||||
source "package/shared-mime-info/Config.in"
|
||||
endmenu
|
||||
|
||||
@ -520,6 +530,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/lighttpd/Config.in"
|
||||
endif
|
||||
source "package/links/Config.in"
|
||||
source "package/linphone/Config.in"
|
||||
source "package/lrzsz/Config.in"
|
||||
source "package/mii-diag/Config.in"
|
||||
source "package/mrouted/Config.in"
|
||||
@ -558,6 +569,7 @@ source "package/radvd/Config.in"
|
||||
source "package/rp-pppoe/Config.in"
|
||||
source "package/rsh-redone/Config.in"
|
||||
source "package/rsync/Config.in"
|
||||
source "package/rtorrent/Config.in"
|
||||
source "package/samba/Config.in"
|
||||
source "package/ser2net/Config.in"
|
||||
source "package/socat/Config.in"
|
||||
@ -591,6 +603,7 @@ endmenu
|
||||
|
||||
menu "Package managers"
|
||||
source "package/ipkg/Config.in"
|
||||
source "package/opkg/Config.in"
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
source "package/rpm/Config.in"
|
||||
endif
|
||||
@ -612,6 +625,7 @@ source "package/file/Config.in"
|
||||
source "package/inotify-tools/Config.in"
|
||||
source "package/lockfile-progs/Config.in"
|
||||
source "package/logrotate/Config.in"
|
||||
source "package/logsurfer/Config.in"
|
||||
source "package/screen/Config.in"
|
||||
source "package/sudo/Config.in"
|
||||
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
menu "Host utilities"
|
||||
|
||||
source "package/lpc3250loader/Config.in.host"
|
||||
source "package/omap-u-boot-utils/Config.in.host"
|
||||
source "package/openocd/Config.in.host"
|
||||
source "package/sam-ba/Config.in.host"
|
||||
source "package/uboot-tools/Config.in.host"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
AUDIOFILE_VERSION = 0.3.3
|
||||
AUDIOFILE_VERSION = 0.3.4
|
||||
AUDIOFILE_SITE = http://audiofile.68k.org
|
||||
AUDIOFILE_INSTALL_STAGING = YES
|
||||
AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
BIND_VERSION = 9.6-ESV-R6
|
||||
BIND_VERSION = 9.6-ESV-R7
|
||||
BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
BIND_MAKE = $(MAKE1)
|
||||
BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone
|
||||
|
||||
382
package/collectd/Config.in
Normal file
382
package/collectd/Config.in
Normal file
@ -0,0 +1,382 @@
|
||||
config BR2_PACKAGE_COLLECTD
|
||||
bool "collectd"
|
||||
help
|
||||
collectd is a daemon which collects system performance
|
||||
statistics periodically and provides mechanisms to store
|
||||
the values in a variety of ways, for example in RRD files.
|
||||
|
||||
http://collectd.org/
|
||||
|
||||
if BR2_PACKAGE_COLLECTD
|
||||
|
||||
menu "match plugins"
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_EMPTY_COUNTER
|
||||
bool "empty counter"
|
||||
help
|
||||
Match counter values which are currently zero.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_HASHED
|
||||
bool "hashed"
|
||||
help
|
||||
Match values using a hash function of the hostname.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_REGEX
|
||||
bool "regex"
|
||||
help
|
||||
Match values by their identifier based on regular expressions.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_TIMEDIFF
|
||||
bool "timediff"
|
||||
help
|
||||
Match values with an invalid timestamp.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_VALUE
|
||||
bool "value"
|
||||
help
|
||||
Select values by their data sources' values.
|
||||
endmenu
|
||||
|
||||
menu "misc plugins"
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_LOGFILE
|
||||
bool "logfile"
|
||||
default y
|
||||
help
|
||||
Writes log messages to a file or STDOUT/STDERR.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SYSLOG
|
||||
bool "syslog"
|
||||
default y
|
||||
help
|
||||
Logs to the standard UNIX logging mechanism.
|
||||
|
||||
config BR2_PACKAGE_THRESHOLD
|
||||
bool "threshold"
|
||||
help
|
||||
Checks values against configured thresholds and creates notifications
|
||||
if values are out of bounds.
|
||||
|
||||
endmenu
|
||||
|
||||
menu "read plugins"
|
||||
|
||||
comment "Select at least one for collectd to be useful"
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_APACHE
|
||||
bool "apache"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
help
|
||||
Collects Apache's mod_status information.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_APCUPS
|
||||
bool "apcups"
|
||||
help
|
||||
Collects UPS statistics from apcupsd.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_BATTERY
|
||||
bool "battery"
|
||||
help
|
||||
Collects the battery's charge, the drawn current and voltage.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_BIND
|
||||
bool "bind"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
Collects BIND DNS statistics.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CONNTRACK
|
||||
bool "conntrack"
|
||||
help
|
||||
Collects the number of entries in Linux's connection tracking table.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH
|
||||
bool "contextswitch"
|
||||
help
|
||||
Collects the number of context switches done by the operating system.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CPU
|
||||
bool "cpu"
|
||||
help
|
||||
Collects the amount of time spent by the CPU in various states.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CPUFREQ
|
||||
bool "cpufreq"
|
||||
help
|
||||
Collects the current CPU's frequency.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CURL
|
||||
bool "curl"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
help
|
||||
Uses libcurl to read files and then parses them according
|
||||
to the configuration.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CURL_JSON
|
||||
bool "curl-json"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
select BR2_PACKAGE_YAJL
|
||||
help
|
||||
Queries JSON data using the cURL library and parses it
|
||||
according to the user's configuration using YAJL.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CURL_XML
|
||||
bool "curl-xml"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
Reads files using libcurl and parses it as XML.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_DF
|
||||
bool "df"
|
||||
help
|
||||
Collects file system usage information.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_DISK
|
||||
bool "disk"
|
||||
help
|
||||
Collects performance statistics of hard-disks and partitions.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_DNS
|
||||
bool "dns"
|
||||
select BR2_PACKAGE_LIBPCAP
|
||||
help
|
||||
Collects statistics of DNS traffic using libpcap.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_ENTROPY
|
||||
bool "entropy"
|
||||
help
|
||||
Collects the available entropy on a system.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_ETHSTAT
|
||||
bool "ethstat"
|
||||
help
|
||||
Collects network interface card statistics.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_EXEC
|
||||
bool "exec"
|
||||
help
|
||||
Executes scripts and reads values back that are printed
|
||||
to STDOUT by that program.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_FILECOUNT
|
||||
bool "filecount"
|
||||
help
|
||||
Counts the number of files in a directory and all its subdirectories.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_FSCACHE
|
||||
bool "fscache"
|
||||
help
|
||||
Collects information about the file-system based caching
|
||||
infrastructure for network file-systems and other slow media.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_INTERFACE
|
||||
bool "interface"
|
||||
help
|
||||
Collects information about the traffic of network interfaces.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_IPTABLES
|
||||
bool "iptables"
|
||||
select BR2_PACKAGE_IPTABLES
|
||||
help
|
||||
Gather statistics from iptables packet filter.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_IRQ
|
||||
bool "irq"
|
||||
help
|
||||
Collects the number of interrupts.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_LOAD
|
||||
bool "load"
|
||||
help
|
||||
Collects the system load.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_MD
|
||||
bool "md"
|
||||
help
|
||||
Collects software-RAID device information.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_MEMCACHED
|
||||
bool "memcached"
|
||||
help
|
||||
Collects statistics from a memcached daemon.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_MEMORY
|
||||
bool "memory"
|
||||
help
|
||||
Collects physical memory utilization.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_MYSQL
|
||||
bool "mysql"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
help
|
||||
Connects to a MySQL database and issues a "show status" command.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_NFS
|
||||
bool "nfs"
|
||||
help
|
||||
Collects information about the usage of the Network File System.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_NTPD
|
||||
bool "ntpd"
|
||||
help
|
||||
Queries an NTP server and extracts parameters.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_OLSRD
|
||||
bool "olsrd"
|
||||
help
|
||||
Reads information about meshed networks from olsrd.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_OPENVPN
|
||||
bool "openvpn"
|
||||
help
|
||||
Reads the status file of OpenVPN to collect statistics.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_PING
|
||||
bool "ping"
|
||||
depends on BR2_INET_IPV6
|
||||
select BR2_PACKAGE_LIBOPING
|
||||
help
|
||||
Mesures network latency using ICMP "echo requests".
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_PROCESSES
|
||||
bool "processes"
|
||||
help
|
||||
Collects the number of processes gruped by state.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_PROTOCOLS
|
||||
bool "protocols"
|
||||
help
|
||||
Collects information about the network protocols.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SERIAL
|
||||
bool "serial"
|
||||
help
|
||||
Collects the traffic on serial interfaces.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SNMP
|
||||
bool "snmp"
|
||||
select BR2_PACKAGE_NETSNMP
|
||||
help
|
||||
Reads values from SNMP devices.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SWAP
|
||||
bool "swap"
|
||||
help
|
||||
Collects the amount of memory currently written to disk.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_TABLE
|
||||
bool "table"
|
||||
help
|
||||
Parses table-like structured plain-text files.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_TAIL
|
||||
bool "tail"
|
||||
help
|
||||
Tails log files and each line is given to one or more matches
|
||||
which test if the line is relevant for any statistics.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_TCPCONNS
|
||||
bool "tcpconns"
|
||||
help
|
||||
Counts the number of TCP connections to/from a specified port.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_THERMAL
|
||||
bool "thermal"
|
||||
help
|
||||
Reads ACPI thermal zone information.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_UPTIME
|
||||
bool "uptime"
|
||||
help
|
||||
Keeps track of the system uptime.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_USERS
|
||||
bool "users"
|
||||
help
|
||||
Counts the number of users currently logged in.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_VMEM
|
||||
bool "vmem"
|
||||
help
|
||||
Collects information about the virtual memory subsystem.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_WIRELESS
|
||||
bool "wireless"
|
||||
help
|
||||
Collects signal quality, power and noise ratio for WLAN cards.
|
||||
|
||||
endmenu
|
||||
|
||||
menu "target plugins"
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_NOTIFICATION
|
||||
bool "notification"
|
||||
help
|
||||
Create and dispatch a notification.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_REPLACE
|
||||
bool "replace"
|
||||
help
|
||||
Replace parts of an identifier using regular expressions.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SCALE
|
||||
bool "scale"
|
||||
help
|
||||
Scale (multiply) values by an arbitrary number.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_SET
|
||||
bool "set"
|
||||
help
|
||||
Set (overwrite) entire parts of an identifier.
|
||||
|
||||
endmenu
|
||||
|
||||
menu "write plugins"
|
||||
|
||||
comment "Select at least one for collectd to be useful"
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_CSV
|
||||
bool "csv"
|
||||
help
|
||||
Writes values to a plain-text file in Comma Separated Values format.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_GRAPHITE
|
||||
bool "graphite"
|
||||
help
|
||||
Writes data collected to Carbon (Graphite's) storage API.
|
||||
http://graphite.wikidot.com/start
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_NETWORK
|
||||
bool "network"
|
||||
depends on BR2_INET_IPV6
|
||||
help
|
||||
Send/receive values from other instances of collectd.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_RRDTOOL
|
||||
bool "rrdtool"
|
||||
select BR2_PACKAGE_FREETYPE
|
||||
select BR2_PACKAGE_LIBART
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_RRDTOOL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Writes values to RRD-files.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_UNIXSOCK
|
||||
bool "unixsock"
|
||||
help
|
||||
Opens a UNIX domain socket and accepts connections.
|
||||
One can send commands to the daemon and receive information.
|
||||
|
||||
config BR2_PACKAGE_COLLECTD_WRITEHTTP
|
||||
bool "writehttp"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
help
|
||||
Sends values collected to a web-server using HTTP POST and PUTVAL.
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
127
package/collectd/collectd.mk
Normal file
127
package/collectd/collectd.mk
Normal file
@ -0,0 +1,127 @@
|
||||
#############################################################
|
||||
#
|
||||
# collectd
|
||||
#
|
||||
#############################################################
|
||||
|
||||
COLLECTD_VERSION = 5.1.0
|
||||
COLLECTD_SITE = http://collectd.org/files
|
||||
COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm"
|
||||
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
|
||||
|
||||
# These require unmet dependencies, are fringe, pointless or deprecated
|
||||
COLLECTD_PLUGINS_DISABLE = amqp apple_sensors ascent dbi email \
|
||||
gmond hddtemp ipmi ipvs java libvirt lpar madwifi mbmon \
|
||||
memcachec modbus multimeter netapp netlink nginx \
|
||||
notify_desktop notify_email numa nut onewire oracle perl \
|
||||
pinba postgresql powerdns python redis routeros rrdcached \
|
||||
sensors tape target_v5upgrade teamspeak2 ted tokyotyrant \
|
||||
uuid varnish vserver write_mongodb write_redis xmms zfs_arc
|
||||
|
||||
COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
|
||||
--localstatedir=/var --with-perl-bindings=no \
|
||||
$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_ETHSTAT),--enable-ethstat,--disable-ethstat) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_EXEC),--enable-exec,--disable-exec) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NFS),--enable-nfs,--disable-nfs) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_PROCESSES),--enable-processes,--disable-processes) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_TCPCONNS),--enable-tcpconns,--disable-tcpconns) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http)
|
||||
|
||||
COLLECTD_DEPENDENCIES = host-pkg-config \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
|
||||
$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)
|
||||
|
||||
# include/library fixups
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
|
||||
COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_NETSNMP),y)
|
||||
COLLECTD_CONF_OPT += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_YAJL),y)
|
||||
COLLECTD_CONF_OPT += --with-yajl=$(STAGING_DIR)/usr
|
||||
endif
|
||||
|
||||
# network can use libgcrypt
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
COLLECTD_DEPENDENCIES += libgcrypt
|
||||
COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr
|
||||
endif
|
||||
|
||||
define COLLECTD_INSTALL_TARGET_CMDS
|
||||
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
|
||||
rm -f $(TARGET_DIR)/usr/bin/collectd-nagios
|
||||
rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf
|
||||
endef
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -3,7 +3,8 @@ config BR2_PACKAGE_CONNMAN
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_IPTABLES
|
||||
depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
|
||||
help
|
||||
The Connection Manager (ConnMan) project provides a daemon for
|
||||
managing internet connections within embedded devices running
|
||||
@ -44,4 +45,4 @@ config BR2_PACKAGE_CONNMAN_CLIENT
|
||||
endif # BR2_PACKAGE_CONNMAN
|
||||
|
||||
comment "connman needs a toolchain with resolver support"
|
||||
depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_eglibc)
|
||||
depends on BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32
|
||||
|
||||
44
package/connman/connman-uclibc-backtrace.patch
Normal file
44
package/connman/connman-uclibc-backtrace.patch
Normal file
@ -0,0 +1,44 @@
|
||||
[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE
|
||||
|
||||
Backtrace support is only used for logging on signal errors, which
|
||||
isn't really critical, so simply remove backtrace info if not
|
||||
available in uClibc.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
---
|
||||
src/log.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
Index: connman-0.78/src/log.c
|
||||
===================================================================
|
||||
--- connman-0.78.orig/src/log.c
|
||||
+++ connman-0.78/src/log.c
|
||||
@@ -30,7 +30,12 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
+#include <features.h>
|
||||
+/* backtrace support is optional on uClibc */
|
||||
+#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
|
||||
+#define HAVE_BACKTRACE
|
||||
#include <execinfo.h>
|
||||
+#endif
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include "connman.h"
|
||||
@@ -112,6 +117,7 @@
|
||||
|
||||
static void print_backtrace(unsigned int offset)
|
||||
{
|
||||
+#ifdef HAVE_BACKTRACE
|
||||
void *frames[99];
|
||||
size_t n_ptrs;
|
||||
unsigned int i;
|
||||
@@ -210,6 +216,7 @@
|
||||
|
||||
close(outfd[1]);
|
||||
close(infd[0]);
|
||||
+#endif /* HAVE_BACKTRACE */
|
||||
}
|
||||
|
||||
static void signal_handler(int signo)
|
||||
@ -4,9 +4,9 @@
|
||||
#
|
||||
#######################################################
|
||||
|
||||
CONNMAN_VERSION = 0.78
|
||||
CONNMAN_SITE = git://git.kernel.org/pub/scm/network/connman/connman.git
|
||||
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
|
||||
CONNMAN_VERSION = 1.0
|
||||
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/
|
||||
CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls
|
||||
CONNMAN_INSTALL_STAGING = YES
|
||||
CONNMAN_CONF_OPT += --localstatedir=/var \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_THREADS),--enable-threads,--disable-threads) \
|
||||
@ -17,9 +17,6 @@ CONNMAN_CONF_OPT += --localstatedir=/var \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_NTPD),--enable-ntpd,--disable-ntpd)
|
||||
|
||||
# as long as sources are obtained from git, we need to generate the autofoo stuff
|
||||
CONNMAN_AUTORECONF = YES
|
||||
|
||||
define CONNMAN_INSTALL_INITSCRIPT
|
||||
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
|
||||
endef
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
config BR2_PACKAGE_CONNTRACK_TOOLS
|
||||
bool "conntrack-tools"
|
||||
depends on BR2_INET_IPV6
|
||||
depends on BR2_LARGEFILE
|
||||
select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
|
||||
select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
|
||||
help
|
||||
The conntrack-tools are a set of tools targeted at
|
||||
system administrators.
|
||||
@ -10,5 +12,5 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
|
||||
|
||||
http://www.netfilter.org/projects/conntrack-tools/
|
||||
|
||||
comment "conntrack-tools requires a toolchain with IPV6 support"
|
||||
depends on !BR2_INET_IPV6
|
||||
comment "conntrack-tools requires a toolchain with IPV6 and LARGEFILE support"
|
||||
depends on !BR2_INET_IPV6 || !BR2_LARGEFILE
|
||||
|
||||
@ -4,9 +4,10 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
CONNTRACK_TOOLS_VERSION = 1.0.1
|
||||
CONNTRACK_TOOLS_VERSION = 1.2.1
|
||||
CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2
|
||||
CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
|
||||
CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config libnetfilter_conntrack
|
||||
CONNTRACK_TOOLS_DEPENDENCIES = host-pkg-config \
|
||||
libnetfilter_conntrack libnetfilter_cttimeout
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
Add missing dependency of tst_uuid.o on uuid.h
|
||||
|
||||
The missing dependency used to break parallel builds.
|
||||
|
||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||
---
|
||||
diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
|
||||
--- e2fsprogs.orig//lib/uuid/Makefile.in 2010-06-14 05:07:36.000000000 +0200
|
||||
+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in 2011-07-18 13:44:58.000000000 +0200
|
||||
@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
|
||||
$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
|
||||
cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
|
||||
|
||||
-tst_uuid.o: $(srcdir)/tst_uuid.c
|
||||
+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
|
||||
$(E) " CC $@"
|
||||
$(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
E2FSPROGS_VERSION = 1.42.2
|
||||
E2FSPROGS_VERSION = 1.42.3
|
||||
E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
|
||||
|
||||
E2FSPROGS_CONF_OPT = \
|
||||
|
||||
13
package/fbterm/Config.in
Normal file
13
package/fbterm/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_FBTERM
|
||||
bool "fbterm"
|
||||
depends on (BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
|
||||
select BR2_PACKAGE_FONTCONFIG
|
||||
select BR2_PACKAGE_LIBERATION
|
||||
help
|
||||
fbterm is a fast terminal emulator for Linux with frame buffer
|
||||
device or VESA video card.
|
||||
|
||||
http://code.google.com/p/fbterm/
|
||||
|
||||
comment "fbterm requires a toolchain with C++, WCHAR and locale support"
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
|
||||
12
package/fbterm/fbterm.mk
Normal file
12
package/fbterm/fbterm.mk
Normal file
@ -0,0 +1,12 @@
|
||||
############################################
|
||||
#
|
||||
# fbterm
|
||||
#
|
||||
############################################
|
||||
|
||||
FBTERM_VERSION = 1.7.0
|
||||
FBTERM_SITE = http://fbterm.googlecode.com/files/
|
||||
|
||||
FBTERM_DEPENDENCIES = fontconfig liberation
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
GMP_VERSION = 5.0.4
|
||||
GMP_VERSION = 5.0.5
|
||||
GMP_SITE = $(BR2_GNU_MIRROR)/gmp
|
||||
GMP_SOURCE = gmp-$(GMP_VERSION).tar.bz2
|
||||
GMP_INSTALL_STAGING = YES
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
GNUTLS_VERSION = 2.12.18
|
||||
GNUTLS_VERSION = 2.12.19
|
||||
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.bz2
|
||||
GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls
|
||||
GNUTLS_DEPENDENCIES = host-pkg-config libgcrypt
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
GREP_VERSION = 2.11
|
||||
GREP_VERSION = 2.12
|
||||
GREP_SITE = $(BR2_GNU_MIRROR)/grep
|
||||
GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
|
||||
GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
|
||||
|
||||
@ -9,21 +9,22 @@ This patch adds a ENABLE_SSL_EXTERNAL option, which, when used in
|
||||
addition to ENABLE_SSL, tells Hiawatha's build system to link against
|
||||
the already existing PolarSSL library instead of building its own.
|
||||
|
||||
[Gustavo]: Update for version 8.3
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
Index: hiawatha-8.1/CMakeLists.txt
|
||||
===================================================================
|
||||
--- hiawatha-8.1.orig/CMakeLists.txt
|
||||
+++ hiawatha-8.1/CMakeLists.txt
|
||||
@@ -9,6 +9,7 @@
|
||||
option(ENABLE_IPV6 "Enable IPv6 support in Hiawatha." ON)
|
||||
option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." OFF)
|
||||
option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." ON)
|
||||
+option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." OFF)
|
||||
option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" ON)
|
||||
option(ENABLE_XSLT "Enable XSLT support in Hiawatha." ON)
|
||||
diff -Nura hiawatha-8.3.orig//CMakeLists.txt hiawatha-8.3/CMakeLists.txt
|
||||
--- hiawatha-8.3.orig//CMakeLists.txt 2012-05-23 14:22:26.000000000 -0300
|
||||
+++ hiawatha-8.3/CMakeLists.txt 2012-05-24 08:13:00.007107500 -0300
|
||||
@@ -10,6 +10,7 @@
|
||||
option(ENABLE_MONITOR "Enable support for the Hiawatha Monitor." off)
|
||||
option(ENABLE_RPROXY "Enable reverse proxy support in Hiawatha." on)
|
||||
option(ENABLE_SSL "Enable SSL (PolarSSL) support in Hiawatha." on)
|
||||
+option(ENABLE_SSL_EXTERNAL "Enable SSL (PolarSSL) as an external library." off)
|
||||
option(ENABLE_TOOLKIT "Enable the URL toolkit in Hiawatha" on)
|
||||
option(ENABLE_XSLT "Enable XSLT support in Hiawatha." on)
|
||||
|
||||
@@ -86,19 +87,23 @@
|
||||
@@ -85,19 +86,23 @@
|
||||
|
||||
# PolarSSL
|
||||
if(ENABLE_SSL)
|
||||
@ -48,7 +49,7 @@ Index: hiawatha-8.1/CMakeLists.txt
|
||||
# Configure files
|
||||
configure_file(config.h.in config.h)
|
||||
foreach (configfile ${config_files_in})
|
||||
@@ -119,7 +124,9 @@
|
||||
@@ -118,7 +123,9 @@
|
||||
target_link_libraries(hiawatha ${CRYPT_LIBRARY} pthread ${Z_LIBRARY})
|
||||
if(ENABLE_SSL)
|
||||
target_link_libraries(hiawatha ${POLARSSL_LIBRARY})
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
HIAWATHA_VERSION = 8.1
|
||||
HIAWATHA_VERSION = 8.3
|
||||
HIAWATHA_SITE = http://www.hiawatha-webserver.org/files/
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
|
||||
@ -8,6 +8,11 @@ endif
|
||||
|
||||
HIAWATHA_CONF_OPT += \
|
||||
-DENABLE_TOOLKIT=OFF \
|
||||
-DENABLE_XSLT=OFF
|
||||
-DENABLE_XSLT=OFF \
|
||||
-DCONFIG_DIR=/etc/hiawatha \
|
||||
-DLOG_DIR=/var/log \
|
||||
-DPID_DIR=/var/run \
|
||||
-DWEBROOT_DIR=/var/www/hiawatha \
|
||||
-DWORK_DIR=/var/lib/hiawatha
|
||||
|
||||
$(eval $(call CMAKETARGETS))
|
||||
|
||||
@ -10,14 +10,16 @@ config BR2_PACKAGE_HOSTAPD
|
||||
|
||||
http://hostap.epitest.fi/
|
||||
|
||||
if BR2_PACKAGE_HOSTAPD
|
||||
|
||||
config BR2_PACKAGE_HOSTAPD_EAP
|
||||
bool "Enable EAP"
|
||||
depends on BR2_PACKAGE_HOSTAPD
|
||||
help
|
||||
Enable support for EAP and RADIUS.
|
||||
|
||||
config BR2_PACKAGE_HOSTAPD_WPS
|
||||
bool "Enable WPS"
|
||||
depends on BR2_PACKAGE_HOSTAPD
|
||||
help
|
||||
Enable support for Wi-Fi Protected Setup.
|
||||
|
||||
endif
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From dea50507861b79f522c70500fe978072f143af8f Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <jouni.malinen@atheros.com>
|
||||
Date: Fri, 12 Nov 2010 18:31:56 +0200
|
||||
Subject: [PATCH] AP: Verify that HT40 secondary channel is supported
|
||||
|
||||
Refuse to enable HT40 mode AP unless both the primary and secondary
|
||||
channels are enabled for AP use.
|
||||
(cherry picked from commit 8ea3dd21d2e8b760612af0c7b6a3bb5b89ba7304)
|
||||
---
|
||||
src/ap/hw_features.c | 26 ++++++++++++++++++++++++++
|
||||
1 files changed, 26 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
|
||||
index 0159c72..7fc5b83 100644
|
||||
--- a/src/ap/hw_features.c
|
||||
+++ b/src/ap/hw_features.c
|
||||
@@ -642,6 +642,32 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
|
||||
break;
|
||||
}
|
||||
}
|
||||
+ if (ok && iface->conf->secondary_channel) {
|
||||
+ int sec_ok = 0;
|
||||
+ int sec_chan = iface->conf->channel +
|
||||
+ iface->conf->secondary_channel * 4;
|
||||
+ for (j = 0; j < iface->current_mode->num_channels; j++) {
|
||||
+ struct hostapd_channel_data *chan =
|
||||
+ &iface->current_mode->channels[j];
|
||||
+ if (!(chan->flag & HOSTAPD_CHAN_DISABLED) &&
|
||||
+ (chan->chan == sec_chan)) {
|
||||
+ sec_ok = 1;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!sec_ok) {
|
||||
+ hostapd_logger(iface->bss[0], NULL,
|
||||
+ HOSTAPD_MODULE_IEEE80211,
|
||||
+ HOSTAPD_LEVEL_WARNING,
|
||||
+ "Configured HT40 secondary channel "
|
||||
+ "(%d) not found from the channel list "
|
||||
+ "of current mode (%d) %s",
|
||||
+ sec_chan, iface->current_mode->mode,
|
||||
+ hostapd_hw_mode_txt(
|
||||
+ iface->current_mode->mode));
|
||||
+ ok = 0;
|
||||
+ }
|
||||
+ }
|
||||
if (iface->conf->channel == 0) {
|
||||
/* TODO: could request a scan of neighboring BSSes and select
|
||||
* the channel automatically */
|
||||
--
|
||||
1.7.4-rc1
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- a/src/drivers/drivers.mak 2011-11-29 19:09:23.889942913 +0100
|
||||
+++ b/src/drivers/drivers.mak 2011-11-29 19:09:40.637381428 +0100
|
||||
@@ -31,10 +31,10 @@
|
||||
NEED_AP_MLME=y
|
||||
NEED_NETLINK=y
|
||||
NEED_LINUX_IOCTL=y
|
||||
-DRV_LIBS += -lnl
|
||||
+DRV_LIBS += -lnl-3
|
||||
|
||||
ifdef CONFIG_LIBNL20
|
||||
-DRV_LIBS += -lnl-genl
|
||||
+DRV_LIBS += -lnl-genl-3
|
||||
DRV_CFLAGS += -DCONFIG_LIBNL20
|
||||
endif
|
||||
endif
|
||||
@ -4,11 +4,12 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
HOSTAPD_VERSION = 0.7.3
|
||||
HOSTAPD_VERSION = 1.0
|
||||
HOSTAPD_SITE = http://hostap.epitest.fi/releases
|
||||
HOSTAPD_SUBDIR = hostapd
|
||||
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
|
||||
HOSTAPD_DEPENDENCIES = libnl
|
||||
HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
|
||||
HOSTAPD_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
# libnl needs -lm (for rint) if linking statically
|
||||
@ -17,78 +18,73 @@ HOSTAPD_LDFLAGS += -lm
|
||||
endif
|
||||
|
||||
define HOSTAPD_LIBNL_CONFIG
|
||||
echo "CONFIG_LIBNL20=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CFLAGS += -I$(STAGING_DIR)/usr/include/libnl3/" >>$(HOSTAPD_CONFIG)
|
||||
echo 'CONFIG_LIBNL32=y' >>$(HOSTAPD_CONFIG)
|
||||
endef
|
||||
|
||||
define HOSTAPD_CRYPTO_CONFIG
|
||||
echo "CONFIG_CRYPTO=internal" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_INTERNAL_LIBTOMMATH=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_INTERNAL_LIBTOMMATH_FAST=y" >>$(HOSTAPD_CONFIG)
|
||||
define HOSTAPD_LIBTOMMATH_CONFIG
|
||||
$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
|
||||
# Try to use openssl for TLS if it's already available
|
||||
# gnutls is also supported for TLS
|
||||
# Try to use openssl or gnutls if it's already available
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
HOSTAPD_DEPENDENCIES += openssl
|
||||
define HOSTAPD_TLS_CONFIG
|
||||
echo "CONFIG_TLS=openssl" >>$(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
HOSTAPD_DEPENDENCIES += gnutls
|
||||
define HOSTAPD_TLS_CONFIG
|
||||
$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
else
|
||||
define HOSTAPD_TLS_CONFIG
|
||||
echo "CONFIG_TLS=internal" >>$(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
|
||||
define HOSTAPD_EAP_CONFIG
|
||||
$(SED) "s/CONFIG_EAP_MSCHAPV2=y//" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/CONFIG_EAP_PEAP=y//" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/CONFIG_EAP_TLS=y//" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/CONFIG_EAP_TTLS=y//" $(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_AKA=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_AKA_PRIME=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_GPSK=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_GPSK_SHA256=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_PAX=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_PSK=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_SAKE=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG)
|
||||
echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_AKA.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_FAST.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_GPSK.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_IKEV2.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_PAX.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_PSK.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_SAKE.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_SIM.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_EAP_TNC.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_RADIUS_SERVER.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
ifeq ($(BR2_INET_IPV6),y)
|
||||
ifneq ($(BR2_INET_IPV6),y)
|
||||
define HOSTAPD_RADIUS_IPV6_CONFIG
|
||||
$(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(CONFIG_IPV6.*\)/#\1/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
endif
|
||||
else
|
||||
define HOSTAPD_EAP_CONFIG
|
||||
$(SED) "s/^CONFIG_EAP/#CONFIG_EAP/g" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/^#CONFIG_NO_ACCOUNTING/CONFIG_NO_ACCOUNTING/" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/^#CONFIG_NO_RADIUS/CONFIG_NO_RADIUS/" $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/^\(CONFIG_EAP.*\)/#\1/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_NO_ACCOUNTING.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_NO_RADIUS.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y)
|
||||
define HOSTAPD_WPS_CONFIG
|
||||
$(SED) "s/^#CONFIG_WPS/CONFIG_WPS/g" $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_WPS.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
endef
|
||||
endif
|
||||
|
||||
define HOSTAPD_CONFIGURE_CMDS
|
||||
cp $(@D)/$(HOSTAPD_SUBDIR)/defconfig $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/\/local//" $(@D)/$(HOSTAPD_SUBDIR)/Makefile
|
||||
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG)
|
||||
echo "LDFLAGS += $(HOSTAPD_LDFLAGS)" >>$(HOSTAPD_CONFIG)
|
||||
echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG)
|
||||
# Drivers
|
||||
$(SED) "s/^#CONFIG_DRIVER_WIRED/CONFIG_DRIVER_WIRED/" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/^#CONFIG_DRIVER_NL80211/CONFIG_DRIVER_NL80211/" $(HOSTAPD_CONFIG)
|
||||
cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG)
|
||||
# Misc
|
||||
$(SED) "s/^CONFIG_IPV6/#CONFIG_IPV6/" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/^#CONFIG_IEEE80211N/CONFIG_IEEE80211N/" $(HOSTAPD_CONFIG)
|
||||
$(SED) "s/^#CONFIG_IEEE80211R/CONFIG_IEEE80211R/" $(HOSTAPD_CONFIG)
|
||||
$(HOSTAPD_CRYPTO_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_IEEE80211N.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_IEEE80211R.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_INTERWORKING.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(SED) 's/\(#\)\(CONFIG_FULL_DYNAMIC_VLAN.*\)/\2/' $(HOSTAPD_CONFIG)
|
||||
$(HOSTAPD_LIBTOMMATH_CONFIG)
|
||||
$(HOSTAPD_TLS_CONFIG)
|
||||
$(HOSTAPD_RADIUS_IPV6_CONFIG)
|
||||
$(HOSTAPD_EAP_CONFIG)
|
||||
@ -96,6 +92,12 @@ define HOSTAPD_CONFIGURE_CMDS
|
||||
$(HOSTAPD_LIBNL_CONFIG)
|
||||
endef
|
||||
|
||||
define HOSTAPD_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR)
|
||||
endef
|
||||
|
||||
define HOSTAPD_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \
|
||||
$(TARGET_DIR)/usr/sbin/hostapd
|
||||
@ -103,9 +105,4 @@ define HOSTAPD_INSTALL_TARGET_CMDS
|
||||
$(TARGET_DIR)/usr/bin/hostapd_cli
|
||||
endef
|
||||
|
||||
define HOSTAPD_UNINSTALL_TARGET_CMDS
|
||||
rm -f $(TARGET_DIR)/usr/sbin/hostapd
|
||||
rm -f $(TARGET_DIR)/usr/bin/hostapd
|
||||
endef
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
$(eval $(call GENTARGETS))
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
https://bugs.icu-project.org/trac/ticket/7664
|
||||
https://bugs.icu-project.org/trac/changeset/28107
|
||||
|
||||
--- icu.orig/source/tools/toolutil/pkg_genc.c
|
||||
+++ icu/source/tools/toolutil/pkg_genc.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/******************************************************************************
|
||||
- * Copyright (C) 2009, International Business Machines
|
||||
+ * Copyright (C) 2009-2010, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*******************************************************************************
|
||||
*/
|
||||
@@ -118,10 +118,10 @@
|
||||
} assemblyHeader[] = {
|
||||
{"gcc",
|
||||
".globl %s\n"
|
||||
- "\t.section .note.GNU-stack,\"\",@progbits\n"
|
||||
+ "\t.section .note.GNU-stack,\"\",%%progbits\n"
|
||||
"\t.section .rodata\n"
|
||||
"\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
|
||||
- "\t.type %s,@object\n"
|
||||
+ "\t.type %s,%%object\n"
|
||||
"%s:\n\n",
|
||||
|
||||
".long ","",HEX_0X
|
||||
@ -1,17 +0,0 @@
|
||||
We need to double-escape CC & CXX since we've got --sysroot and thus a space
|
||||
when cross-compiling.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura icu.orig/source/tools/icuinfo/Makefile.in icu/source/tools/icuinfo/Makefile.in
|
||||
--- icu.orig/source/tools/icuinfo/Makefile.in 2010-09-29 15:37:26.000000000 -0300
|
||||
+++ icu/source/tools/icuinfo/Makefile.in 2010-12-21 13:36:45.393439756 -0300
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME)
|
||||
|
||||
-CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\"
|
||||
+CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\""@CC@\"" -DU_CXX=\""@CXX@\""
|
||||
# -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ "
|
||||
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
|
||||
A combination of issue & patches from...
|
||||
|
||||
https://bugs.icu-project.org/trac/ticket/7680
|
||||
https://bugs.icu-project.org/trac/changeset/28002
|
||||
https://bugs.icu-project.org/trac/changeset/28124
|
||||
|
||||
Enlarged buffers more since include files for pkgdata can grow
|
||||
significantly when cross-compiling.
|
||||
This ONLY affects building.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura icu.orig/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
|
||||
--- icu.orig/source/tools/pkgdata/pkgdata.cpp 2010-09-29 15:37:28.000000000 -0300
|
||||
+++ icu/source/tools/pkgdata/pkgdata.cpp 2010-12-21 15:53:30.252554924 -0300
|
||||
@@ -97,8 +97,9 @@
|
||||
#define PKGDATA_FILE_SEP_STRING U_FILE_SEP_STRING
|
||||
#endif
|
||||
|
||||
-#define LARGE_BUFFER_MAX_SIZE 2048
|
||||
-#define SMALL_BUFFER_MAX_SIZE 512
|
||||
+#define LARGE_BUFFER_MAX_SIZE 8192
|
||||
+#define MEDIUM_BUFFER_MAX_SIZE 4096
|
||||
+#define SMALL_BUFFER_MAX_SIZE 2048
|
||||
|
||||
static void loadLists(UPKGOptions *o, UErrorCode *status);
|
||||
|
||||
@@ -472,29 +473,48 @@
|
||||
}
|
||||
|
||||
static int runCommand(const char* command, UBool specialHandling) {
|
||||
- char cmd[SMALL_BUFFER_MAX_SIZE];
|
||||
+ char *cmd = NULL;
|
||||
+ char cmdBuffer[SMALL_BUFFER_MAX_SIZE];
|
||||
+ int32_t len = strlen(command);
|
||||
+
|
||||
+ if (len == 0) {
|
||||
+ return 0;
|
||||
+ }
|
||||
|
||||
if (!specialHandling) {
|
||||
+#if defined(USING_CYGWIN) || defined(OS400)
|
||||
+#define CMD_PADDING_SIZE 20
|
||||
+ if ((len + CMD_PADDING_SIZE) >= SMALL_BUFFER_MAX_SIZE) {
|
||||
+ cmd = (char *)uprv_malloc(len + CMD_PADDING_SIZE);
|
||||
+ } else {
|
||||
+ cmd = cmdBuffer;
|
||||
+ }
|
||||
#ifdef USING_CYGWIN
|
||||
sprintf(cmd, "bash -c \"%s\"", command);
|
||||
|
||||
#elif defined(OS400)
|
||||
sprintf(cmd, "QSH CMD('%s')", command);
|
||||
+#endif
|
||||
#else
|
||||
goto normal_command_mode;
|
||||
#endif
|
||||
} else {
|
||||
normal_command_mode:
|
||||
- sprintf(cmd, "%s", command);
|
||||
+ cmd = (char *)command;
|
||||
}
|
||||
-
|
||||
+
|
||||
printf("pkgdata: %s\n", cmd);
|
||||
int result = system(cmd);
|
||||
- if (result != 0) {
|
||||
- printf("-- return status = %d\n", result);
|
||||
+ if (result != 0) {
|
||||
+ printf("-- return status = %d\n", result);
|
||||
+ }
|
||||
+
|
||||
+ if (cmd != cmdBuffer && cmd != command) {
|
||||
+ uprv_free(cmd);
|
||||
}
|
||||
- return result;
|
||||
-}
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
|
||||
#define LN_CMD "ln -s"
|
||||
#define RM_CMD "rm -f"
|
||||
@@ -586,7 +606,7 @@
|
||||
pkgDataFlags = (char**)uprv_malloc(sizeof(char*) * PKGDATA_FLAGS_SIZE);
|
||||
if (pkgDataFlags != NULL) {
|
||||
for (int32_t i = 0; i < PKGDATA_FLAGS_SIZE; i++) {
|
||||
- pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * SMALL_BUFFER_MAX_SIZE);
|
||||
+ pkgDataFlags[i] = (char*)uprv_malloc(sizeof(char) * MEDIUM_BUFFER_MAX_SIZE);
|
||||
if (pkgDataFlags[i] != NULL) {
|
||||
pkgDataFlags[i][0] = 0;
|
||||
} else {
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
ICU_VERSION = 4.4.2
|
||||
ICU_VERSION = 4.8.1.1
|
||||
ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
|
||||
ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
|
||||
ICU_DEPENDENCIES = host-icu
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
IPROUTE2_VERSION = 3.3.0
|
||||
IPROUTE2_VERSION = 3.4.0
|
||||
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
|
||||
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
|
||||
|
||||
|
||||
@ -4,10 +4,9 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
IPSET_VERSION = 6.11
|
||||
IPSET_VERSION = 6.12.1
|
||||
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
|
||||
IPSET_SITE = http://ipset.netfilter.org
|
||||
IPSET_AUTORECONF = YES
|
||||
IPSET_DEPENDENCIES = libmnl host-pkg-config
|
||||
IPSET_CONF_OPT = --with-kmod=no
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
IPTABLES_VERSION = 1.4.13
|
||||
IPTABLES_VERSION = 1.4.14
|
||||
IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2
|
||||
IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
|
||||
IPTABLES_INSTALL_STAGING = YES
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBCURL_VERSION = 7.24.0
|
||||
LIBCURL_VERSION = 7.25.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
||||
LIBCURL_SITE = http://curl.haxx.se/download
|
||||
LIBCURL_INSTALL_STAGING = YES
|
||||
|
||||
@ -2,10 +2,12 @@ config BR2_PACKAGE_LIBEXOSIP2
|
||||
bool "libeXosip2"
|
||||
select BR2_PACKAGE_LIBOSIP2
|
||||
help
|
||||
GNU Higher level SIP (Session Initiation Protocol)
|
||||
This library aims to provide multimedia and telecom software
|
||||
developers an easy and powerful interface to initiate and
|
||||
control SIP based sessions in their applications.
|
||||
SIP is a open standard replacement from IETF for H323.
|
||||
eXosip is a library that hides the complexity of using the
|
||||
SIP protocol for mutlimedia session establishement.
|
||||
This protocol is mainly to be used by VoIP telephony
|
||||
applications (endpoints or conference server) but might be
|
||||
also usefull for any application that wish to establish
|
||||
sessions like multiplayer games.
|
||||
eXosip is based in libosip.
|
||||
|
||||
http://www.gnu.org/software/osip/
|
||||
http://savannah.nongnu.org/projects/exosip/
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
#############################################################
|
||||
|
||||
LIBEXOSIP2_VERSION = 3.6.0
|
||||
LIBEXOSIP2_SOURCE = libeXosip2-$(LIBEXOSIP2_VERSION).tar.gz
|
||||
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip/
|
||||
LIBEXOSIP2_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBIDN_VERSION = 1.24
|
||||
LIBIDN_VERSION = 1.25
|
||||
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
||||
LIBIDN_INSTALL_STAGING = YES
|
||||
LIBIDN_CONF_ENV = EMACS="no"
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
Drop bcopy since it's deprecated.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
diff -Nura libmbus-0.6.1/mbus/mbus-tcp.c libmbus-0.6.1-bcopy/mbus/mbus-tcp.c
|
||||
--- libmbus-0.6.1/mbus/mbus-tcp.c 2011-11-06 02:34:28.000000000 -0300
|
||||
+++ libmbus-0.6.1-bcopy/mbus/mbus-tcp.c 2012-05-03 08:11:39.680346347 -0300
|
||||
@@ -78,7 +78,7 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- bcopy((void *)(host_addr->h_addr), (void *)(&s_addr.sin_addr), host_addr->h_length);
|
||||
+ memmove((void *)(&s_addr.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
|
||||
|
||||
if (connect(handle->sock, (struct sockaddr *)&s_addr, sizeof(s_addr)) < 0)
|
||||
{
|
||||
16
package/libmbus/libmbus-bcopy.patch
Normal file
16
package/libmbus/libmbus-bcopy.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Drop bcopy since it's deprecated.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura libmbus-0.7.0/mbus/mbus-tcp.c libmbus-0.7.0-bcopy/mbus/mbus-tcp.c
|
||||
--- libmbus-0.7.0/mbus/mbus-tcp.c 2011-12-08 13:21:19.000000000 -0300
|
||||
+++ libmbus-0.7.0-bcopy/mbus/mbus-tcp.c 2012-05-03 09:08:36.987106612 -0300
|
||||
@@ -78,7 +78,7 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length);
|
||||
+ memmove((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length);
|
||||
|
||||
if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0)
|
||||
{
|
||||
@ -4,8 +4,8 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBMBUS_VERSION = 0.6.1
|
||||
LIBMBUS_SITE = http://www.freescada.com/public-dist/
|
||||
LIBMBUS_VERSION = 0.7.0
|
||||
LIBMBUS_SITE = http://www.freescada.com/public-dist
|
||||
LIBMBUS_INSTALL_STAGING = YES
|
||||
|
||||
# Without this the build yields an error:
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBMNL_VERSION = 1.0.2
|
||||
LIBMNL_VERSION = 1.0.3
|
||||
LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
|
||||
LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
|
||||
LIBMNL_INSTALL_STAGING = YES
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBNETFILTER_CONNTRACK_VERSION = 1.0.0
|
||||
LIBNETFILTER_CONNTRACK_VERSION = 1.0.1
|
||||
LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2
|
||||
LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
|
||||
LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
|
||||
|
||||
13
package/libnetfilter_cttimeout/Config.in
Normal file
13
package/libnetfilter_cttimeout/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT
|
||||
bool "libnetfilter_cttimeout"
|
||||
depends on BR2_LARGEFILE
|
||||
select BR2_PACKAGE_LIBMNL
|
||||
help
|
||||
libnetfilter_cttimeout is the userspace library that provides
|
||||
the programming interface to the fine-grain
|
||||
connection tracking timeout infrastructure.
|
||||
|
||||
http://www.netfilter.org/projects/libnetfilter_cttimeout/
|
||||
|
||||
comment "libnetfilter_cttimout requires a toolchain with LARGEFILE support"
|
||||
depends on !BR2_LARGEFILE
|
||||
13
package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
Normal file
13
package/libnetfilter_cttimeout/libnetfilter-cttimeout.mk
Normal file
@ -0,0 +1,13 @@
|
||||
#############################################################
|
||||
#
|
||||
# libnetfilter-cttimeout
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0
|
||||
LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2
|
||||
LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files
|
||||
LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
|
||||
LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkg-config libmnl
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
8
package/libnfc/Config.in
Normal file
8
package/libnfc/Config.in
Normal file
@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_LIBNFC
|
||||
bool "libnfc"
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
select BR2_PACKAGE_LIBUSB_COMPAT
|
||||
help
|
||||
Public platform independent Near Field Communication (NFC) library.
|
||||
|
||||
http://www.libnfc.org/
|
||||
16
package/libnfc/libnfc.mk
Normal file
16
package/libnfc/libnfc.mk
Normal file
@ -0,0 +1,16 @@
|
||||
#############################################################
|
||||
#
|
||||
# libnfc
|
||||
#
|
||||
#############################################################
|
||||
LIBNFC_VERSION = 1.5.1
|
||||
LIBNFC_SITE = http://libnfc.googlecode.com/files/
|
||||
LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.gz
|
||||
LIBNFC_INSTALL_STAGING = YES
|
||||
|
||||
LIBNFC_DEPENDENCIES = host-pkg-config libusb libusb-compat
|
||||
|
||||
# N.B. The acr122 driver requires pcsc-lite.
|
||||
LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -4,3 +4,9 @@ config BR2_PACKAGE_LIBNL
|
||||
A library for applications dealing with netlink socket.
|
||||
|
||||
http://people.suug.ch/~tgr/libnl/
|
||||
|
||||
config BR2_PACKAGE_LIBNL_TOOLS
|
||||
bool "install tools"
|
||||
depends on BR2_PACKAGE_LIBNL
|
||||
help
|
||||
Install binary tools.
|
||||
|
||||
@ -4,15 +4,26 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBNL_VERSION = 3.2.8
|
||||
LIBNL_VERSION = 3.2.9
|
||||
LIBNL_SITE = http://www.infradead.org/~tgr/libnl/files
|
||||
LIBNL_INSTALL_STAGING = YES
|
||||
LIBNL_DEPENDENCIES = host-bison
|
||||
LIBNL_MAKE = $(MAKE1)
|
||||
LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \
|
||||
cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \
|
||||
qdisc-list
|
||||
|
||||
define LIBNL_UNINSTALL_TARGET_CMDS
|
||||
rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.*
|
||||
rm -rf $(TARGET_DIR)/usr/lib/libnl
|
||||
endef
|
||||
|
||||
define LIBNL_REMOVE_TOOLS
|
||||
rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES))
|
||||
endef
|
||||
|
||||
ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
|
||||
LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS
|
||||
endif
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
config BR2_PACKAGE_LIBOGG
|
||||
bool "libogg"
|
||||
help
|
||||
Ogg is the name of Xiph.org's container format for audio,
|
||||
video, and metadata
|
||||
Ogg is a multimedia container format, and the native file
|
||||
and stream format for the Xiph.org multimedia codecs. As
|
||||
with all Xiph.org technology is it an open format free for
|
||||
anyone to use.
|
||||
|
||||
http://xiph.org/ogg/
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#
|
||||
#############################################################
|
||||
LIBOGG_VERSION = 1.3.0
|
||||
LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
|
||||
LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
|
||||
LIBOGG_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
11
package/liboping/Config.in
Normal file
11
package/liboping/Config.in
Normal file
@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_LIBOPING
|
||||
bool "liboping"
|
||||
depends on BR2_INET_IPV6
|
||||
help
|
||||
liboping is a C library to generate ICMP echo requests,
|
||||
better known as "ping packets".
|
||||
|
||||
http://verplant.org/liboping/
|
||||
|
||||
comment "liboping requires a toolchain with IPv6 support enabled"
|
||||
depends on !BR2_INET_IPV6
|
||||
13
package/liboping/liboping.mk
Normal file
13
package/liboping/liboping.mk
Normal file
@ -0,0 +1,13 @@
|
||||
#############################################################
|
||||
#
|
||||
# liboping
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBOPING_VERSION = 1.6.2
|
||||
LIBOPING_SITE = http://verplant.org/liboping/files
|
||||
LIBOPING_INSTALL_STAGING = YES
|
||||
LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
|
||||
LIBOPING_CONF_OPT = --without-perl-bindings
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -7,3 +7,5 @@ config BR2_PACKAGE_LIBOSIP2
|
||||
control SIP based sessions in their applications.
|
||||
SIP is a open standard replacement from IETF for H323.
|
||||
|
||||
http://www.gnu.org/software/osip/
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
#############################################################
|
||||
|
||||
LIBOSIP2_VERSION = 3.6.0
|
||||
LIBOSIP2_SOURCE = libosip2-$(LIBOSIP2_VERSION).tar.gz
|
||||
LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
|
||||
LIBOSIP2_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
11
package/libtorrent/Config.in
Normal file
11
package/libtorrent/Config.in
Normal file
@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_LIBTORRENT
|
||||
bool "libtorrent"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_LIBSIGC
|
||||
help
|
||||
BitTorrent library written in C++ for *nix
|
||||
|
||||
http://libtorrent.rakshasa.no/
|
||||
|
||||
comment "libtorrent requires a toolchain with C++ support enabled"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
27
package/libtorrent/libtorrent-cross_compile.patch
Normal file
27
package/libtorrent/libtorrent-cross_compile.patch
Normal file
@ -0,0 +1,27 @@
|
||||
Fix cross compilation, based on OpenWRT patch.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura libtorrent-0.13.2/configure.ac libtorrent-0.13.2-cross/configure.ac
|
||||
--- libtorrent-0.13.2/configure.ac 2012-04-20 03:55:10.000000000 -0300
|
||||
+++ libtorrent-0.13.2-cross/configure.ac 2012-05-09 10:57:49.671175421 -0300
|
||||
@@ -17,7 +17,6 @@
|
||||
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
-AM_PATH_CPPUNIT(1.9.6)
|
||||
AC_DISABLE_STATIC
|
||||
|
||||
AM_DISABLE_STATIC
|
||||
diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/checks.m4
|
||||
--- libtorrent-0.13.2/scripts/checks.m4 2012-04-12 06:44:23.000000000 -0300
|
||||
+++ libtorrent-0.13.2-cross/scripts/checks.m4 2012-05-09 10:42:32.642728917 -0300
|
||||
@@ -96,7 +96,7 @@
|
||||
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
|
||||
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
|
||||
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
16
package/libtorrent/libtorrent.mk
Normal file
16
package/libtorrent/libtorrent.mk
Normal file
@ -0,0 +1,16 @@
|
||||
#############################################################
|
||||
#
|
||||
# libtorrent
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LIBTORRENT_VERSION = 0.13.2
|
||||
LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
|
||||
LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl)
|
||||
LIBTORRENT_CONF_OPT = --enable-aligned \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
|
||||
LIBTORRENT_INSTALL_STAGING = YES
|
||||
LIBTORRENT_AUTORECONF = YES
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
21
package/linphone/Config.in
Normal file
21
package/linphone/Config.in
Normal file
@ -0,0 +1,21 @@
|
||||
config BR2_PACKAGE_LINPHONE
|
||||
bool "linphone"
|
||||
select BR2_PACKAGE_LIBEXOSIP2
|
||||
select BR2_PACKAGE_SPEEX
|
||||
help
|
||||
Linphone is an internet phone or Voice Over IP phone (VoIP).
|
||||
|
||||
With linphone you can communicate freely with people over
|
||||
the internet, with voice, video, and text instant messaging.
|
||||
Linphone makes use of the SIP protocol, an open standard
|
||||
for internet telephony. You can use Linphone with any SIP
|
||||
VoIP operator, including our free SIP audio/video service.
|
||||
linphone is free-software (or open-source), you can download
|
||||
and redistribute it freely.
|
||||
Linphone is available for desktop computers: Linux, Windows,
|
||||
MacOSX, and for mobile phones: Android, iPhone, Blackberry.
|
||||
|
||||
Linphone support in Buildroot is limited to the commandline
|
||||
client, linphonec, and video support is not enabled.
|
||||
|
||||
http://www.linphone.org/
|
||||
12
package/linphone/linphone.mk
Normal file
12
package/linphone/linphone.mk
Normal file
@ -0,0 +1,12 @@
|
||||
#############################################################
|
||||
#
|
||||
# linphone
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LINPHONE_VERSION = 3.5.2
|
||||
LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/
|
||||
LINPHONE_CONF_OPT = --disable-video --disable-gtk_ui
|
||||
LINPHONE_DEPENDENCIES = libeXosip2 speex
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
7
package/logsurfer/Config.in
Normal file
7
package/logsurfer/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_LOGSURFER
|
||||
bool "logsurfer"
|
||||
help
|
||||
Logsurfer is a program for monitoring system logs in real-time,
|
||||
and reporting on the occurrence of events.
|
||||
|
||||
http://www.crypt.gen.nz/logsurfer/
|
||||
29
package/logsurfer/logsurfer.mk
Normal file
29
package/logsurfer/logsurfer.mk
Normal file
@ -0,0 +1,29 @@
|
||||
#############################################################
|
||||
#
|
||||
# logsurfer
|
||||
#
|
||||
#############################################################
|
||||
|
||||
LOGSURFER_VERSION = 1.8
|
||||
LOGSURFER_SOURCE = logsurfer-$(LOGSURFER_VERSION).tar.gz
|
||||
LOGSURFER_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION)
|
||||
|
||||
define LOGSURFER_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/src/logsurfer \
|
||||
$(TARGET_DIR)/usr/bin/logsurfer
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_HAVE_DOCUMENTATION),y)
|
||||
|
||||
define LOGSURFER_INSTALL_TARGET_MAN
|
||||
$(INSTALL) -D -m 0644 $(@D)/man/logsurfer.1 \
|
||||
$(TARGET_DIR)/usr/man/man1/logsurfer.1
|
||||
$(INSTALL) -D -m 0644 $(@D)/man/logsurfer.conf.4 \
|
||||
$(TARGET_DIR)/usr/man/man4/logsurfer.conf.4
|
||||
endef
|
||||
|
||||
LOGSURFER_POST_INSTALL_TARGET_HOOKS += LOGSURFER_INSTALL_TARGET_MAN
|
||||
|
||||
endif
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -2,6 +2,9 @@ config BR2_PACKAGE_MIDORI
|
||||
bool "midori"
|
||||
select BR2_PACKAGE_WEBKIT
|
||||
select BR2_PACKAGE_LIBSEXY
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
depends on BR2_PACKAGE_LIBGTK2
|
||||
depends on BR2_INSTALL_LIBSTDCPP # webkit
|
||||
depends on BR2_USE_WCHAR # webkit
|
||||
|
||||
@ -4,10 +4,18 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
MIDORI_VERSION = 0.3.6
|
||||
MIDORI_VERSION = 0.4.6
|
||||
MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
|
||||
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
|
||||
MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2
|
||||
MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.4/
|
||||
MIDORI_DEPENDENCIES = \
|
||||
host-intltool \
|
||||
host-pkg-config \
|
||||
host-vala \
|
||||
libgtk2 \
|
||||
libsexy \
|
||||
webkit \
|
||||
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XORG7),y)
|
||||
define MIDORI_WITHOUT_X11
|
||||
@ -21,7 +29,7 @@ define MIDORI_CONFIGURE_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
./waf configure \
|
||||
--prefix=/usr \
|
||||
--disable-vala \
|
||||
--disable-libnotify \
|
||||
)
|
||||
endef
|
||||
|
||||
|
||||
6
package/mobile-broadband-provider-info/Config.in
Normal file
6
package/mobile-broadband-provider-info/Config.in
Normal file
@ -0,0 +1,6 @@
|
||||
config BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
|
||||
bool "mobile-broadband-provider-info"
|
||||
help
|
||||
Mobile broadband provider database.
|
||||
|
||||
http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders
|
||||
@ -0,0 +1,11 @@
|
||||
#############################################################
|
||||
#
|
||||
# mobile broadband provider info
|
||||
#
|
||||
#############################################################
|
||||
MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20110511
|
||||
MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
|
||||
MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES
|
||||
MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkg-config
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -1,21 +0,0 @@
|
||||
diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
|
||||
--- mrouted-3.9.4/mtrace.c 2010-11-19 20:53:19.000000000 -0300
|
||||
+++ mrouted-3.9.4-memmove/mtrace.c 2012-05-03 08:27:33.895422455 -0300
|
||||
@@ -556,7 +556,7 @@
|
||||
save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
|
||||
(tr.tv_usec << 10) / 15625;
|
||||
save->len = len;
|
||||
- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
|
||||
+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
|
||||
}
|
||||
return recvlen;
|
||||
}
|
||||
@@ -646,7 +646,7 @@
|
||||
base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
|
||||
(tr.tv_usec << 10) / 15625;
|
||||
base.len = len;
|
||||
- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
|
||||
+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
|
||||
/*
|
||||
* If the user specified which traces to monitor,
|
||||
* only accept traces that correspond to the
|
||||
@ -1,64 +0,0 @@
|
||||
---
|
||||
Makefile | 20 +++++++++-----------
|
||||
1 file changed, 9 insertions(+), 11 deletions(-)
|
||||
|
||||
Index: mrouted-3.9.4/Makefile
|
||||
===================================================================
|
||||
--- mrouted-3.9.4.orig/Makefile
|
||||
+++ mrouted-3.9.4/Makefile
|
||||
@@ -42,11 +42,9 @@
|
||||
#MSTAT_OBJS = mstat.o $(EXTRA_OBJS)
|
||||
|
||||
## Common
|
||||
-CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
|
||||
-CFLAGS += -O2 -W -Wall -Werror
|
||||
-#CFLAGS += -O -g
|
||||
-LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
|
||||
-LDFLAGS += -Wl,-Map,$@.map
|
||||
+MROUTED_CFLAGS = $(MCAST_INCLUDE) $(SNMPDEF) $(RSRRDEF) $(INCLUDES) $(DEFS) $(USERCOMPILE)
|
||||
+LDLIBS = $(SNMPLIBDIR) $(SNMPLIBS) $(EXTRA_LIBS)
|
||||
+MROUTED_LDFLAGS += -Wl,-Map,$@.map
|
||||
OBJS = $(IGMP_OBJS) $(ROUTER_OBJS) $(MAPPER_OBJS) $(MRINFO_OBJS) \
|
||||
$(MTRACE_OBJS) $(MSTAT_OBJS)
|
||||
SRCS = $(OBJS:.o=.c)
|
||||
@@ -65,7 +63,7 @@
|
||||
|
||||
.c.o:
|
||||
@printf " CC $@\n"
|
||||
- @$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(CPPFLAGS) -c -o $@ $<
|
||||
|
||||
install: $(EXECS)
|
||||
@install -d $(DESTDIR)$(prefix)/sbin
|
||||
@@ -95,26 +93,26 @@
|
||||
|
||||
mrouted: $(IGMP_OBJS) $(ROUTER_OBJS) $(CMULIBS)
|
||||
@printf " LINK $@\n"
|
||||
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(ROUTER_OBJS) $(LDLIBS)
|
||||
|
||||
vers.c: Makefile
|
||||
@echo $(VERSION) | sed -e 's/.*/char todaysversion[]="&";/' > vers.c
|
||||
|
||||
map-mbone: $(IGMP_OBJS) $(MAPPER_OBJS)
|
||||
@printf " LINK $@\n"
|
||||
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MAPPER_OBJS) $(LDLIBS)
|
||||
|
||||
mrinfo: $(IGMP_OBJS) $(MRINFO_OBJS)
|
||||
@printf " LINK $@\n"
|
||||
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MRINFO_OBJS) $(LDLIBS)
|
||||
|
||||
mtrace: $(IGMP_OBJS) $(MTRACE_OBJS)
|
||||
@printf " LINK $@\n"
|
||||
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(IGMP_OBJS) $(MTRACE_OBJS) $(LDLIBS)
|
||||
|
||||
mstat: $(MSTAT_OBJS) $(CMULIBS)
|
||||
@printf " LINK $@\n"
|
||||
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
|
||||
+ @$(CC) $(CFLAGS) $(MROUTED_CFLAGS) $(LDFLAGS) $(MROUTED_LDFLAGS) -o $@ $(MSTAT_OBJS) $(LDLIBS)
|
||||
|
||||
clean: $(SNMPCLEAN)
|
||||
-@$(RM) $(OBJS) $(EXECS)
|
||||
39
package/mrouted/mrouted-bcopy.patch
Normal file
39
package/mrouted/mrouted-bcopy.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 2d33110ee18fb59a1d6917d598fc1f4eb3c4cf83 Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Mon, 7 May 2012 16:32:10 -0300
|
||||
Subject: [PATCH] Switch from bcopy to memmove
|
||||
|
||||
The bcopy() function is marked as legacy per POSIX.1-2001 and removed by
|
||||
POSIX-1.2008 thus shouldn't be used.
|
||||
So switch over to memmove()
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
mtrace.c | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mtrace.c b/mtrace.c
|
||||
index c982a67..64630bf 100644
|
||||
--- a/mtrace.c
|
||||
+++ b/mtrace.c
|
||||
@@ -556,7 +556,7 @@ int send_recv(u_int32_t dst, int type, int code, int tries, struct resp_buf *sav
|
||||
save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
|
||||
(tr.tv_usec << 10) / 15625;
|
||||
save->len = len;
|
||||
- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
|
||||
+ memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
|
||||
}
|
||||
return recvlen;
|
||||
}
|
||||
@@ -646,7 +646,7 @@ void passive_mode(void)
|
||||
base.rtime = ((tr.tv_sec + JAN_1970) << 16) +
|
||||
(tr.tv_usec << 10) / 15625;
|
||||
base.len = len;
|
||||
- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
|
||||
+ memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
|
||||
/*
|
||||
* If the user specified which traces to monitor,
|
||||
* only accept traces that correspond to the
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
#
|
||||
# mrouted
|
||||
#
|
||||
#
|
||||
#############################################################
|
||||
MROUTED_VERSION = 3.9.4
|
||||
|
||||
MROUTED_VERSION = 3.9.6
|
||||
MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
|
||||
MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted
|
||||
MROUTED_SITE = http://cloud.github.com/downloads/troglobit/mrouted
|
||||
|
||||
define MROUTED_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# mtd provides jffs2 utilities
|
||||
#
|
||||
#############################################################
|
||||
MTD_VERSION = 1.4.9
|
||||
MTD_VERSION = 1.5.0
|
||||
MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
|
||||
MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
|
||||
ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
MPG123_VERSION = 1.13.8
|
||||
MPG123_VERSION = 1.14.2
|
||||
MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
|
||||
MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mpg123
|
||||
MPG123_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
|
||||
MPG123_CONF_OPT = --with-optimization=0 --disable-lfs-alias
|
||||
MPG123_INSTALL_STAGING = YES
|
||||
|
||||
|
||||
@ -4,14 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PULSEAUDIO_VERSION = 1.1
|
||||
PULSEAUDIO_VERSION = 2.0
|
||||
PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases/
|
||||
PULSEAUDIO_INSTALL_STAGING = YES
|
||||
PULSEAUDIO_CONF_OPT = \
|
||||
--localstatedir=/var \
|
||||
--disable-default-build-tests \
|
||||
--disable-legacy-runtime-dir \
|
||||
--disable-legacy-database-entry-format
|
||||
--disable-legacy-database-entry-format \
|
||||
$(if $(BR2_HAVE_DOCUMENTATION),,--disable-manpages)
|
||||
|
||||
PULSEAUDIO_DEPENDENCIES = \
|
||||
host-pkg-config libtool json-c libsndfile speex host-intltool \
|
||||
@ -27,7 +28,9 @@ PULSEAUDIO_DEPENDENCIES = \
|
||||
$(if $(BR2_PACKAGE_UDEV),udev) \
|
||||
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_FFTW),fftw) \
|
||||
$(if $(BR2_PACKAGE_ORC),orc)
|
||||
$(if $(BR2_PACKAGE_ORC),orc) \
|
||||
$(if $(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),webrtc-audio-processing) \
|
||||
$(if $(BR2_PACKAGE_SYSTEMD),systemd)
|
||||
|
||||
# pulseaudio alsa backend needs pcm/mixer apis
|
||||
ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
|
||||
|
||||
@ -10,10 +10,10 @@ The added patch is a workaround for cross build as follows:
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
|
||||
--- mxml-2.6-dist//Makefile.in 2008-12-06 06:20:38.000000000 +0200
|
||||
+++ mxml-2.6/Makefile.in 2011-07-13 07:25:36.615999491 +0300
|
||||
@@ -59,7 +59,7 @@
|
||||
diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in
|
||||
--- mxml-2.7-orig/Makefile.in 2011-04-13 18:43:32.000000000 +0300
|
||||
+++ mxml-2.7/Makefile.in 2012-05-16 07:21:42.677220980 +0300
|
||||
@@ -57,7 +57,7 @@
|
||||
# Install commands...
|
||||
#
|
||||
|
||||
@ -23,7 +23,7 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
|
||||
INSTALL_DIR = $(INSTALL) -d
|
||||
INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755
|
||||
@@ -88,7 +88,7 @@
|
||||
mxml-node.o mxml-search.o mxml-set.o
|
||||
mxml-index.o mxml-node.o mxml-search.o mxml-set.o
|
||||
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o
|
||||
OBJS = mxmldoc.o testmxml.o $(LIBOBJS)
|
||||
-TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
|
||||
@ -31,23 +31,25 @@ diff -Nuar mxml-2.6-dist//Makefile.in mxml-2.6/Makefile.in
|
||||
|
||||
|
||||
#
|
||||
@@ -134,8 +134,6 @@
|
||||
@@ -140,9 +140,6 @@
|
||||
#
|
||||
|
||||
install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
|
||||
- echo Installing mxmldoc in $(BUILDROOT)$(bindir)...
|
||||
- $(INSTALL_DIR) $(BUILDROOT)$(bindir)
|
||||
- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
|
||||
- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
|
||||
echo Installing documentation in $(BUILDROOT)$(docdir)...
|
||||
$(INSTALL_DIR) $(BUILDROOT)$(docdir)
|
||||
for file in $(DOCFILES); do \
|
||||
$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
|
||||
@@ -144,10 +142,6 @@
|
||||
$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
|
||||
@@ -154,11 +151,6 @@
|
||||
echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig...
|
||||
$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
|
||||
$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
|
||||
- echo Installing man pages in $(BUILDROOT)$(mandir)...
|
||||
- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
|
||||
- $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
|
||||
- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
|
||||
- $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
|
||||
|
||||
install-libmxml.a:
|
||||
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
||||
echo Installing libmxml.a to $(BUILDROOT)$(libdir)...
|
||||
@ -3,8 +3,8 @@
|
||||
# mxml
|
||||
#
|
||||
#############################################################
|
||||
MXML_VERSION = 2.6
|
||||
MXML_SITE = http://ftp.easysw.com/pub/mxml/2.6
|
||||
MXML_VERSION = 2.7
|
||||
MXML_SITE = http://ftp.easysw.com/pub/mxml/$(MXML_VERSION)
|
||||
MXML_INSTALL_STAGING = YES
|
||||
|
||||
MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
NBD_VERSION = 3.0
|
||||
NBD_VERSION = 3.1
|
||||
NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
|
||||
NBD_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
|
||||
NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
|
||||
|
||||
@ -2,6 +2,7 @@ config BR2_PACKAGE_NFS_UTILS
|
||||
bool "nfs-utils"
|
||||
depends on BR2_INET_RPC
|
||||
depends on BR2_LARGEFILE
|
||||
select BR2_PACKAGE_PORTMAP
|
||||
help
|
||||
The NFS Linux kernel server.
|
||||
Warning: We do not force largefile support on here on purpose.
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
Use the strchr() function instead of the legacy index() function.
|
||||
|
||||
Signed-off-by: Frederik Pasch <fpasch@googlemail.com>
|
||||
--- 1/utils/mountd/fsloc.c
|
||||
+++ 2/utils/mountd/fsloc.c
|
||||
@@ -126,7 +126,7 @@
|
||||
struct servers *rv=NULL;
|
||||
|
||||
xlog(L_NOTICE, "method_list(%s)\n", data);
|
||||
- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
|
||||
+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
|
||||
ptr++;
|
||||
list = malloc(listsize * sizeof(char *));
|
||||
copy = strdup(data);
|
||||
--- 1/support/nfs/nfs_mntent.c
|
||||
+++ 2/support/nfs/nfs_mntent.c
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <string.h> /* for index */
|
||||
+#include <string.h> /* for strchr */
|
||||
#include <ctype.h> /* for isdigit */
|
||||
#include <sys/stat.h> /* for umask */
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
return NULL;
|
||||
|
||||
mfp->mntent_lineno++;
|
||||
- s = index (buf, '\n');
|
||||
+ s = strchr (buf, '\n');
|
||||
if (s == NULL) {
|
||||
/* Missing final newline? Otherwise extremely */
|
||||
/* long line - assume file was corrupted */
|
||||
@@ -171,7 +171,7 @@
|
||||
fprintf(stderr, _("[mntent]: warning: no final "
|
||||
"newline at the end of %s\n"),
|
||||
mfp->mntent_file);
|
||||
- s = index (buf, 0);
|
||||
+ s = strchr (buf, 0);
|
||||
} else {
|
||||
mfp->mntent_errs = 1;
|
||||
goto err;
|
||||
--- 1/utils/mount/error.c
|
||||
+++ 2/utils/mount/error.c
|
||||
@@ -62,7 +62,7 @@
|
||||
char *tmp;
|
||||
|
||||
if (estr) {
|
||||
- if ((ptr = index(estr, ':')))
|
||||
+ if ((ptr = strchr(estr, ':')))
|
||||
estr = ++ptr;
|
||||
|
||||
tmp = &errbuf[spos];
|
||||
58
package/nfs-utils/nfs-utils-conditionals.patch
Normal file
58
package/nfs-utils/nfs-utils-conditionals.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
|
||||
Date: Thu, 17 May 2012 16:26:44 -0700
|
||||
Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
|
||||
execution.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Automake does not support conditional AM_CONDITIONAL calls; what that
|
||||
means is that you always have to execute AM_CONDITIONAL one way or the
|
||||
other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
|
||||
executed only when NFSv4 is enabled, which breaks building with
|
||||
--disable-nfsv4.
|
||||
|
||||
Remove the SQLite3 conditional altogether as it's never used, and move
|
||||
the nfsdcld conditional outside of the conditional code.
|
||||
|
||||
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
|
||||
---
|
||||
aclocal/libsqlite3.m4 | 1 -
|
||||
configure.ac | 3 +--
|
||||
2 files changed, 1 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
|
||||
index 73d1e46..8c38993 100644
|
||||
--- a/aclocal/libsqlite3.m4
|
||||
+++ b/aclocal/libsqlite3.m4
|
||||
@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
|
||||
LIBS="$saved_LIBS"])
|
||||
|
||||
AC_MSG_RESULT($libsqlite3_cv_is_recent)
|
||||
- AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
|
||||
])dnl
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9ba53e2..b408f1b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
- AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
|
||||
-
|
||||
dnl librpcsecgss already has a dependency on libgssapi,
|
||||
dnl but we need to make sure we get the right version
|
||||
if test "$enable_gss" = yes; then
|
||||
@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
|
||||
fi
|
||||
|
||||
dnl enable nfsidmap when its support by libnfsidmap
|
||||
+AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
|
||||
AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
|
||||
|
||||
|
||||
--
|
||||
1.7.8.6
|
||||
|
||||
68
package/nfs-utils/nfs-utils-cross-build.patch
Normal file
68
package/nfs-utils/nfs-utils-cross-build.patch
Normal file
@ -0,0 +1,68 @@
|
||||
Patch taken from Gentoo.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
--- a/tools/locktest/Makefile.am
|
||||
+++ b/tools/locktest/Makefile.am
|
||||
@@ -1,12 +1,11 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
CC=$(CC_FOR_BUILD)
|
||||
-LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
noinst_PROGRAMS = testlk
|
||||
testlk_SOURCES = testlk.c
|
||||
-testlk_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
--- a/tools/rpcdebug/Makefile.am
|
||||
+++ b/tools/rpcdebug/Makefile.am
|
||||
@@ -1,15 +1,14 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
CC=$(CC_FOR_BUILD)
|
||||
-LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
man8_MANS = rpcdebug.man
|
||||
EXTRA_DIST = $(man8_MANS)
|
||||
|
||||
sbin_PROGRAMS = rpcdebug
|
||||
rpcdebug_SOURCES = rpcdebug.c
|
||||
-rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include
|
||||
-rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
--- a/tools/rpcgen/Makefile.am
|
||||
+++ b/tools/rpcgen/Makefile.am
|
||||
@@ -1,7 +1,9 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
CC=$(CC_FOR_BUILD)
|
||||
-LIBTOOL = @LIBTOOL@ --tag=CC
|
||||
+CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
+LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
|
||||
noinst_PROGRAMS = rpcgen
|
||||
rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
|
||||
@@ -9,10 +11,6 @@
|
||||
rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \
|
||||
rpc_scan.h rpc_util.h
|
||||
|
||||
-rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
|
||||
-rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
|
||||
-rpcgen_LDADD=$(LIBTIRPC)
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST = rpcgen.new.1
|
||||
59
package/nfs-utils/nfs-utils-susv3-legacy.patch
Normal file
59
package/nfs-utils/nfs-utils-susv3-legacy.patch
Normal file
@ -0,0 +1,59 @@
|
||||
Switch legacy index() in favour of strchr()
|
||||
Updated for 1.2.6 from the previous patch by Frederik Pasch.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c nfs-utils-1.2.6/support/nfs/nfs_mntent.c
|
||||
--- nfs-utils-1.2.6.orig/support/nfs/nfs_mntent.c 2012-05-29 10:06:37.901255998 -0300
|
||||
+++ nfs-utils-1.2.6/support/nfs/nfs_mntent.c 2012-05-29 10:06:45.726312410 -0300
|
||||
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
-#include <string.h> /* for index */
|
||||
+#include <string.h> /* for strchr */
|
||||
#include <ctype.h> /* for isdigit */
|
||||
#include <sys/stat.h> /* for umask */
|
||||
#include <unistd.h> /* for ftruncate */
|
||||
@@ -172,7 +172,7 @@
|
||||
return NULL;
|
||||
|
||||
mfp->mntent_lineno++;
|
||||
- s = index (buf, '\n');
|
||||
+ s = strchr (buf, '\n');
|
||||
if (s == NULL) {
|
||||
/* Missing final newline? Otherwise extremely */
|
||||
/* long line - assume file was corrupted */
|
||||
@@ -180,7 +180,7 @@
|
||||
fprintf(stderr, _("[mntent]: warning: no final "
|
||||
"newline at the end of %s\n"),
|
||||
mfp->mntent_file);
|
||||
- s = index (buf, 0);
|
||||
+ s = strchr (buf, 0);
|
||||
} else {
|
||||
mfp->mntent_errs = 1;
|
||||
goto err;
|
||||
diff -Nura nfs-utils-1.2.6.orig/utils/mount/error.c nfs-utils-1.2.6/utils/mount/error.c
|
||||
--- nfs-utils-1.2.6.orig/utils/mount/error.c 2012-05-29 10:06:37.946256325 -0300
|
||||
+++ nfs-utils-1.2.6/utils/mount/error.c 2012-05-29 10:06:45.727312416 -0300
|
||||
@@ -62,7 +62,7 @@
|
||||
char *tmp;
|
||||
|
||||
if (estr) {
|
||||
- if ((ptr = index(estr, ':')))
|
||||
+ if ((ptr = strchr(estr, ':')))
|
||||
estr = ++ptr;
|
||||
|
||||
tmp = &errbuf[spos];
|
||||
diff -Nura nfs-utils-1.2.6.orig/utils/mountd/fsloc.c nfs-utils-1.2.6/utils/mountd/fsloc.c
|
||||
--- nfs-utils-1.2.6.orig/utils/mountd/fsloc.c 2012-05-29 10:06:37.911256072 -0300
|
||||
+++ nfs-utils-1.2.6/utils/mountd/fsloc.c 2012-05-29 10:07:11.140322564 -0300
|
||||
@@ -127,7 +127,7 @@
|
||||
bool v6esc = false;
|
||||
|
||||
xlog(L_NOTICE, "method_list(%s)", data);
|
||||
- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++)
|
||||
+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++)
|
||||
ptr++;
|
||||
list = malloc(listsize * sizeof(char *));
|
||||
copy = strdup(data);
|
||||
@ -3,14 +3,17 @@
|
||||
# nfs-utils
|
||||
#
|
||||
#############################################################
|
||||
NFS_UTILS_VERSION = 1.2.3
|
||||
|
||||
NFS_UTILS_VERSION = 1.2.6
|
||||
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.bz2
|
||||
NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nfs/
|
||||
NFS_UTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/nfs/nfs-utils/$(NFS_UTILS_VERSION)
|
||||
NFS_UTILS_AUTORECONF = YES
|
||||
|
||||
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
|
||||
|
||||
NFS_UTILS_CONF_OPT = \
|
||||
--disable-nfsv4 \
|
||||
--disable-nfsv41 \
|
||||
--disable-gss \
|
||||
--disable-tirpc \
|
||||
--disable-uuid \
|
||||
@ -28,6 +31,13 @@ define NFS_UTILS_INSTALL_FIXUP
|
||||
rm -f $(NFS_UTILS_TARGETS_)
|
||||
endef
|
||||
|
||||
define NFS_UTILS_REMOVE_NFSIOSTAT
|
||||
rm -f $(TARGET_DIR)/usr/sbin/nfsiostat
|
||||
endef
|
||||
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP
|
||||
|
||||
# nfsiostat is interpreted python, so remove it unless it's in the target
|
||||
NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
|
||||
16
package/ofono/Config.in
Normal file
16
package/ofono/Config.in
Normal file
@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_OFONO
|
||||
bool "ofono"
|
||||
depends on BR2_USE_WCHAR # gettext/libglib2
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
|
||||
help
|
||||
oFono is a free, open source project for mobile telephony
|
||||
(GSM/UMTS) applications. It uses high-level D-Bus API for
|
||||
use by telephony applications. It uses 3GPP standard.
|
||||
|
||||
http://ofono.org/
|
||||
|
||||
comment "ofono requires a toolchain with WCHAR support"
|
||||
depends on !BR2_USE_WCHAR
|
||||
44
package/ofono/ofono-uclibc-backtrace.patch
Normal file
44
package/ofono/ofono-uclibc-backtrace.patch
Normal file
@ -0,0 +1,44 @@
|
||||
[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE
|
||||
|
||||
Backtrace support is only used for logging on signal errors, which
|
||||
isn't really critical, so simply remove backtrace info if not
|
||||
available in uClibc.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
---
|
||||
src/log.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
Index: ofono-1.5/src/log.c
|
||||
===================================================================
|
||||
--- ofono-1.5.orig/src/log.c
|
||||
+++ ofono-1.5/src/log.c
|
||||
@@ -30,7 +30,12 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
+#include <features.h>
|
||||
+/* backtrace support is optional on uClibc */
|
||||
+#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
|
||||
+#define HAVE_BACKTRACE
|
||||
#include <execinfo.h>
|
||||
+#endif
|
||||
#include <dlfcn.h>
|
||||
|
||||
#include "ofono.h"
|
||||
@@ -115,6 +120,7 @@
|
||||
|
||||
static void print_backtrace(unsigned int offset)
|
||||
{
|
||||
+#ifdef HAVE_BACKTRACE
|
||||
void *frames[99];
|
||||
size_t n_ptrs;
|
||||
unsigned int i;
|
||||
@@ -213,6 +219,7 @@
|
||||
|
||||
close(outfd[1]);
|
||||
close(infd[0]);
|
||||
+#endif /* HAVE_BACKTRACE */
|
||||
}
|
||||
|
||||
static void signal_handler(int signo)
|
||||
31
package/ofono/ofono.mk
Normal file
31
package/ofono/ofono.mk
Normal file
@ -0,0 +1,31 @@
|
||||
#############################################################
|
||||
#
|
||||
# ofono
|
||||
#
|
||||
#############################################################
|
||||
OFONO_VERSION = 1.6
|
||||
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
|
||||
OFONO_DEPENDENCIES = \
|
||||
host-pkg-config \
|
||||
dbus \
|
||||
libglib2 \
|
||||
libcap-ng \
|
||||
mobile-broadband-provider-info
|
||||
|
||||
OFONO_CONF_OPT = --disable-test
|
||||
|
||||
ifeq ($(BR2_PACKAGE_UDEV),y)
|
||||
OFONO_CONF_OPT += --enable-udev
|
||||
OFONO_DEPENDENCIES += udev
|
||||
else
|
||||
OFONO_CONF_OPT += --disable-udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
|
||||
OFONO_CONF_OPT += --enable-bluetooth
|
||||
OFONO_DEPENDENCIES += bluez_utils
|
||||
else
|
||||
OFONO_CONF_OPT += --disable-bluetooth
|
||||
endif
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
8
package/omap-u-boot-utils/Config.in.host
Normal file
8
package/omap-u-boot-utils/Config.in.host
Normal file
@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
|
||||
bool "host omap-u-boot-utils"
|
||||
help
|
||||
U-Boot Utilities for Texas Instrument's OMAP platforms.
|
||||
This is a set of tools to control U-Boot from scripts, generate
|
||||
OMAP-specific signed image files and more.
|
||||
|
||||
https://github.com/nmenon/omap-u-boot-utils
|
||||
21
package/omap-u-boot-utils/omap-u-boot-utils.mk
Normal file
21
package/omap-u-boot-utils/omap-u-boot-utils.mk
Normal file
@ -0,0 +1,21 @@
|
||||
#############################################################
|
||||
#
|
||||
# omap-u-boot-utils
|
||||
#
|
||||
#############################################################
|
||||
|
||||
OMAP_U_BOOT_UTILS_VERSION = 8aff852322
|
||||
OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils.git
|
||||
OMAP_U_BOOT_UTILS_SITE_METHOD = git
|
||||
|
||||
define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
|
||||
$(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
|
||||
for f in gpsign pserial tagger ucmd ukermit ; do \
|
||||
install -m 755 -D $(@D)/$$f $(HOST_DIR)/usr/bin/$$f ; \
|
||||
done
|
||||
endef
|
||||
|
||||
$(eval $(call GENTARGETS,host))
|
||||
13
package/opkg/Config.in
Normal file
13
package/opkg/Config.in
Normal file
@ -0,0 +1,13 @@
|
||||
config BR2_PACKAGE_OPKG
|
||||
bool "opkg"
|
||||
help
|
||||
Opkg is a lightweight package management system, based on ipkg. It is
|
||||
written in C and resembles apt/dpkg in operation. It is intended for
|
||||
use on embedded Linux devices.
|
||||
Opkg is maintained, stable, robust and conservative in its memory
|
||||
usage, despite its buggy ipkg ancestry. As best it can, opkg
|
||||
maintains backwards compatibility with ipkg and conforms to a subset
|
||||
of debian's policy manual regarding control files.
|
||||
|
||||
http://code.google.com/p/opkg/
|
||||
|
||||
127
package/opkg/opkg-build
Executable file
127
package/opkg/opkg-build
Executable file
@ -0,0 +1,127 @@
|
||||
#!/bin/sh
|
||||
|
||||
# opkg-build -- construct a .opk from a directory
|
||||
# Carl Worth <cworth@east.isi.edu>
|
||||
# based on a script by Steve Redler IV, steve@sr-tech.com 5-21-2001
|
||||
set -e
|
||||
|
||||
opkg_extract_value() {
|
||||
sed -e "s/^[^:]*:[[:space:]]*//"
|
||||
}
|
||||
|
||||
required_field() {
|
||||
field=$1
|
||||
|
||||
value=`grep "^$field:" < $CONTROL/control | opkg_extract_value`
|
||||
if [ -z "$value" ]; then
|
||||
echo "opkg-build: Error: $CONTROL/control is missing field $field" ;
|
||||
PKG_ERROR=1
|
||||
fi
|
||||
echo $value
|
||||
}
|
||||
|
||||
pkg_appears_sane() {
|
||||
local pkg_dir=$1
|
||||
|
||||
local owd=`pwd`
|
||||
cd $pkg_dir
|
||||
|
||||
PKG_ERROR=0
|
||||
if [ ! -f "$CONTROL/control" ]; then
|
||||
echo "opkg-build: Error: Control file $pkg_dir/$CONTROL/control not found."
|
||||
cd $owd
|
||||
return 1
|
||||
fi
|
||||
|
||||
pkg=`required_field Package`
|
||||
version=`required_field Version`
|
||||
arch=`required_field Architecture`
|
||||
required_field Maintainer >/dev/null
|
||||
required_field Description >/dev/null
|
||||
|
||||
if echo $pkg | grep '[^a-z0-9.+-]'; then
|
||||
echo "opkg-build: Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])"
|
||||
PKG_ERROR=1;
|
||||
fi
|
||||
|
||||
local bad_fields=`sed -ne 's/^\([^[:space:]][^:[:space:]]\+[[:space:]]\+\)[^:].*/\1/p' < $CONTROL/control | sed -e 's/\\n//'`
|
||||
if [ -n "$bad_fields" ]; then
|
||||
bad_fields=`echo $bad_fields`
|
||||
echo "opkg-build: Error: The following fields in $CONTROL/control are missing a ':'"
|
||||
echo " $bad_fields"
|
||||
echo "opkg-build: This may be due to a missing initial space for a multi-line field value"
|
||||
PKG_ERROR=1
|
||||
fi
|
||||
|
||||
for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
|
||||
if [ -f $script -a ! -x $script ]; then
|
||||
echo "opkg-build: Error: package script $script is not executable"
|
||||
PKG_ERROR=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -f $CONTROL/conffiles ]; then
|
||||
for cf in `cat $CONTROL/conffiles`; do
|
||||
if [ ! -f ./$cf ]; then
|
||||
echo "opkg-build: Error: $CONTROL/conffiles mentions conffile $cf which does not exist"
|
||||
PKG_ERROR=1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
cd $owd
|
||||
return $PKG_ERROR
|
||||
}
|
||||
|
||||
###
|
||||
# opkg-build "main"
|
||||
###
|
||||
|
||||
case $# in
|
||||
1)
|
||||
dest_dir=.
|
||||
;;
|
||||
2)
|
||||
dest_dir=$2
|
||||
;;
|
||||
*)
|
||||
echo "Usage: opkg-build <pkg_directory> [<destination_directory>]" ;
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
pkg_dir=$1
|
||||
|
||||
if [ ! -d $pkg_dir ]; then
|
||||
echo "opkg-build: Error: Directory $pkg_dir does not exist"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# CONTROL is second so that it takes precedence
|
||||
CONTROL=
|
||||
[ -d $pkg_dir/DEBIAN ] && CONTROL=DEBIAN
|
||||
[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL
|
||||
if [ -z "$CONTROL" ]; then
|
||||
echo "opkg-build: Error: Directory $pkg_dir has no CONTROL subdirectory."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! pkg_appears_sane $pkg_dir; then
|
||||
echo "Please fix the above errors and try again."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
tmp_dir=$dest_dir/OPKG_BUILD.$$
|
||||
mkdir $tmp_dir
|
||||
|
||||
tar -C $pkg_dir -czf $tmp_dir/data.tar.gz . --exclude=$CONTROL
|
||||
tar -C $pkg_dir/$CONTROL -czf $tmp_dir/control.tar.gz .
|
||||
|
||||
echo "2.0" > $tmp_dir/debian-binary
|
||||
|
||||
pkg_file=$dest_dir/${pkg}_${version}_${arch}.opk
|
||||
tar -C $tmp_dir -czf $pkg_file debian-binary data.tar.gz control.tar.gz
|
||||
rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
|
||||
rmdir $tmp_dir
|
||||
|
||||
echo "Packaged contents of $pkg_dir into $pkg_file"
|
||||
20
package/opkg/opkg.mk
Normal file
20
package/opkg/opkg.mk
Normal file
@ -0,0 +1,20 @@
|
||||
#############################################################
|
||||
#
|
||||
# opkg
|
||||
#
|
||||
#############################################################
|
||||
|
||||
OPKG_VERSION = 0.1.8
|
||||
OPKG_SOURCE = opkg-$(OPKG_VERSION).tar.gz
|
||||
OPKG_SITE = http://opkg.googlecode.com/files
|
||||
OPKG_INSTALL_STAGING = YES
|
||||
OPKG_CONF_OPT = --disable-curl --disable-gpg
|
||||
|
||||
# Ensure directory for lockfile exists
|
||||
define OPKG_CREATE_LOCKDIR
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/opkg
|
||||
endef
|
||||
|
||||
OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
|
||||
|
||||
$(eval $(call AUTOTARGETS))
|
||||
@ -1,28 +1,21 @@
|
||||
menu "PHP Extensions"
|
||||
menu "Extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_CONFIG
|
||||
string "PHP configuration file to use"
|
||||
default "$(PHP_DIR)/php.ini-dist"
|
||||
config BR2_PACKAGE_PHP_EXT_CALENDAR
|
||||
bool "Calendar"
|
||||
help
|
||||
If you want to use a different php.ini file define it here.
|
||||
Otherwise it'll just copy the default php.ini-dist from PHP.
|
||||
Calendar and event support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SOCKETS
|
||||
bool "socket"
|
||||
config BR2_PACKAGE_PHP_EXT_FILEINFO
|
||||
bool "Fileinfo"
|
||||
help
|
||||
Sockets support
|
||||
File Information support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_POSIX
|
||||
bool "posix"
|
||||
default y
|
||||
config BR2_PACKAGE_PHP_EXT_READLINE
|
||||
bool "Readline"
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_READLINE
|
||||
help
|
||||
POSIX support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SPL
|
||||
bool "SPL"
|
||||
default y
|
||||
help
|
||||
Standard PHP library support
|
||||
Readline support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SESSION
|
||||
bool "Session"
|
||||
@ -30,98 +23,13 @@ config BR2_PACKAGE_PHP_EXT_SESSION
|
||||
help
|
||||
Session support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_OPENSSL
|
||||
bool "openssl"
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
comment "Compression extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_BZIP2
|
||||
bool "bzip2"
|
||||
select BR2_PACKAGE_BZIP2
|
||||
help
|
||||
openssl support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
bool "xml2"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
libxml2 support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
|
||||
bool "simplexml"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
SimpleXML support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_ZLIB
|
||||
bool "zlib"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
default y
|
||||
help
|
||||
zlib support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_EXIF
|
||||
bool "EXIF"
|
||||
help
|
||||
EXIF support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_FTP
|
||||
bool "FTP"
|
||||
help
|
||||
FTP Support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_GETTEXT
|
||||
bool "gettext"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
gettext support
|
||||
|
||||
comment "gettext support requires a toolchain with WCHAR support"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_GMP
|
||||
bool "gmp"
|
||||
select BR2_PACKAGE_GMP
|
||||
help
|
||||
GMP support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_JSON
|
||||
bool "JSON"
|
||||
help
|
||||
JavaScript Object Serialization support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_READLINE
|
||||
bool "readline"
|
||||
depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
|
||||
help
|
||||
readline support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_NCURSES
|
||||
bool "ncurses"
|
||||
depends on (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_NCURSES
|
||||
help
|
||||
ncurses support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PCRE
|
||||
bool "PCRE"
|
||||
help
|
||||
Perl Compatible Regular Expressions support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PCNTL
|
||||
bool "PCNTL"
|
||||
help
|
||||
Process Control Support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVMSG
|
||||
bool "sysvmsg - System V Message queue"
|
||||
help
|
||||
System V Message queue support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVSEM
|
||||
bool "sysvsem - System V Semaphores"
|
||||
help
|
||||
System V Sempahore support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVSHM
|
||||
bool "sysvshm - System V Shared memory"
|
||||
help
|
||||
System V Shared memory support
|
||||
bzip2 read/write support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_ZIP
|
||||
bool "zip"
|
||||
@ -129,19 +37,60 @@ config BR2_PACKAGE_PHP_EXT_ZIP
|
||||
help
|
||||
Zip read/write support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_FILTER
|
||||
bool "filter"
|
||||
select BR2_PACKAGE_PHP_EXT_PCRE
|
||||
config BR2_PACKAGE_PHP_EXT_ZLIB
|
||||
bool "zlib"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
default y
|
||||
help
|
||||
Input filter support
|
||||
zlib support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_CALENDAR
|
||||
bool "calendar"
|
||||
comment "Cryptography extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_HASH
|
||||
bool "hash"
|
||||
help
|
||||
Calendar and event support
|
||||
HASH message digest framework
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_OPENSSL
|
||||
bool "openssl"
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
openssl support
|
||||
|
||||
comment "Database extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DBA
|
||||
bool "DBA"
|
||||
help
|
||||
Database Abstraction Layer
|
||||
|
||||
if BR2_PACKAGE_PHP_EXT_DBA
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DBA_CDB
|
||||
bool "cdb"
|
||||
help
|
||||
CDB handler
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DBA_DB4
|
||||
bool "db4/5"
|
||||
select BR2_PACKAGE_BERKELEYDB
|
||||
help
|
||||
BerkeleyDB version 4/5 handler
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DBA_FLAT
|
||||
bool "flat"
|
||||
default y
|
||||
help
|
||||
Flat file handler
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DBA_INI
|
||||
bool "ini"
|
||||
default y
|
||||
help
|
||||
INI file handler
|
||||
|
||||
endif
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SQLITE
|
||||
bool "SQLite"
|
||||
help
|
||||
@ -151,35 +100,243 @@ config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
|
||||
bool "sqlite UTF8 support"
|
||||
depends on BR2_PACKAGE_PHP_EXT_SQLITE
|
||||
help
|
||||
UTF8 Support for sqlite
|
||||
UTF8 support for sqlite
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_MYSQL
|
||||
bool "Mysql"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
help
|
||||
MySQL support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_MYSQLI
|
||||
bool "Mysqli"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_PHP_EXT_MYSQL
|
||||
help
|
||||
MySQL Improved extension support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO
|
||||
bool "PDO"
|
||||
help
|
||||
PHP Data Objects support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
||||
bool "PDO_SQLite"
|
||||
depends on BR2_PACKAGE_PHP_EXT_PDO
|
||||
help
|
||||
SQLite driver for PDO
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
|
||||
bool "PDO_SQLite external"
|
||||
depends on BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
||||
select BR2_PACKAGE_SQLITE
|
||||
help
|
||||
Use external sqlite3 library
|
||||
if BR2_PACKAGE_PHP_EXT_PDO
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
|
||||
bool "PDO_MySQL"
|
||||
depends on BR2_PACKAGE_PHP_EXT_PDO
|
||||
bool "MySQL"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
help
|
||||
PDO driver for MySQL
|
||||
|
||||
comment "PDO_MySQL requires a toolchain with C++ support"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_PHP_EXT_PDO
|
||||
comment "MySQL drivers require a toolchain with C++ support"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PDO_SQLITE
|
||||
bool "SQLite3"
|
||||
select BR2_PACKAGE_SQLITE
|
||||
help
|
||||
SQLite3 driver for PDO
|
||||
|
||||
endif
|
||||
|
||||
comment "Human language and character encoding support"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_GETTEXT
|
||||
bool "Gettext"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
Gettext support
|
||||
|
||||
comment "Gettext support requires a toolchain with WCHAR support"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_ICONV
|
||||
bool "iconv"
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
iconv character set conversion support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_INTL
|
||||
bool "intl"
|
||||
select BR2_PACKAGE_ICU
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
Internationalization support
|
||||
|
||||
comment "intl support requires a toolchain with C++ and WCHAR support"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
|
||||
|
||||
comment "Image processing"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_EXIF
|
||||
bool "EXIF"
|
||||
help
|
||||
EXIF support
|
||||
|
||||
comment "Mathematical extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_BCMATH
|
||||
bool "BC math"
|
||||
help
|
||||
BCMath arbitrary precision mathematics support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_GMP
|
||||
bool "GMP"
|
||||
select BR2_PACKAGE_GMP
|
||||
help
|
||||
GNU Multiple Precision support
|
||||
|
||||
comment "Other basic extensions"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_JSON
|
||||
bool "JSON"
|
||||
help
|
||||
JavaScript Object Serialization support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_TOKENIZER
|
||||
bool "Tokenizer"
|
||||
help
|
||||
Tokenizer functions support
|
||||
|
||||
comment "Other services"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_CURL
|
||||
bool "cURL"
|
||||
select BR2_PACKAGE_LIBCURL
|
||||
help
|
||||
cURL for URL streams
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_FTP
|
||||
bool "FTP"
|
||||
help
|
||||
FTP support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SNMP
|
||||
bool "SNMP"
|
||||
select BR2_PACKAGE_NETSNMP
|
||||
help
|
||||
SNMP support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SOCKETS
|
||||
bool "sockets"
|
||||
help
|
||||
Sockets support
|
||||
|
||||
comment "Process Control"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_PCNTL
|
||||
bool "PCNTL"
|
||||
help
|
||||
Process control support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_POSIX
|
||||
bool "Posix"
|
||||
default y
|
||||
help
|
||||
POSIX.1 (IEEE 1003.1) function support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SHMOP
|
||||
bool "shmop"
|
||||
help
|
||||
Shared memory support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVMSG
|
||||
bool "sysvmsg"
|
||||
help
|
||||
System V message queue support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVSEM
|
||||
bool "sysvsem"
|
||||
help
|
||||
System V semaphore support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SYSVSHM
|
||||
bool "sysvshm"
|
||||
help
|
||||
System V shared memory support
|
||||
|
||||
comment "Variable and Type related"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_CTYPE
|
||||
bool "Ctype"
|
||||
help
|
||||
Character type checking support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_FILTER
|
||||
bool "Filter"
|
||||
help
|
||||
Input filter support
|
||||
|
||||
comment "Web services"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SOAP
|
||||
bool "SOAP"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
SOAP support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_XMLRPC
|
||||
bool "XML-RPC"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
XML-RPC support
|
||||
|
||||
comment "XML manipulation"
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_DOM
|
||||
bool "DOM"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
Document Object Model support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
bool "libxml"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
libxml2 support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
|
||||
bool "SimpleXML"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
SimpleXML support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_WDDX
|
||||
bool "WDDX"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
WDDX support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_XML
|
||||
bool "XML Parser"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
XML Parser support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_XMLREADER
|
||||
bool "XMLReader"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
XMLReader support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_XMLWRITER
|
||||
bool "XMLWriter"
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
help
|
||||
XMLWriter support
|
||||
|
||||
config BR2_PACKAGE_PHP_EXT_XSL
|
||||
bool "XSL"
|
||||
select BR2_PACKAGE_PHP_EXT_DOM
|
||||
select BR2_PACKAGE_PHP_EXT_LIBXML2
|
||||
select BR2_PACKAGE_LIBXSLT
|
||||
help
|
||||
XSL transformation support
|
||||
|
||||
endmenu
|
||||
|
||||
@ -9,6 +9,8 @@ config BR2_PACKAGE_PHP
|
||||
|
||||
if BR2_PACKAGE_PHP
|
||||
|
||||
source "package/php/Config.ext"
|
||||
|
||||
config BR2_PACKAGE_PHP_CLI
|
||||
bool
|
||||
|
||||
@ -16,38 +18,30 @@ config BR2_PACKAGE_PHP_CGI
|
||||
bool
|
||||
|
||||
choice
|
||||
prompt "PHP interface"
|
||||
prompt "Interface"
|
||||
default BR2_PACKAGE_PHP_SAPI_CGI
|
||||
help
|
||||
Select the PHP interface(s).
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CGI
|
||||
bool "CGI"
|
||||
select BR2_PACKAGE_PHP_CGI
|
||||
help
|
||||
Common Gateway Interface
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CLI
|
||||
bool "cli interface"
|
||||
bool "CLI"
|
||||
select BR2_PACKAGE_PHP_CLI
|
||||
help
|
||||
Command line interface for PHP.
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CGI
|
||||
bool "cgi interface"
|
||||
select BR2_PACKAGE_PHP_CGI
|
||||
help
|
||||
CGI interface for PHP.
|
||||
Command Line Interface
|
||||
|
||||
config BR2_PACKAGE_PHP_SAPI_CLI_CGI
|
||||
bool "cli and cgi interfaces"
|
||||
bool "CGI and CLI"
|
||||
select BR2_PACKAGE_PHP_CLI
|
||||
select BR2_PACKAGE_PHP_CGI
|
||||
help
|
||||
Command line and CGI interfaces for PHP.
|
||||
Command line and Common gateway interfaces
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_PHP_FASTCGI
|
||||
bool "fastcgi"
|
||||
depends on BR2_PACKAGE_PHP_CGI
|
||||
default y
|
||||
help
|
||||
fast cgi interface for php
|
||||
|
||||
source "package/php/Config.ext"
|
||||
endif
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From e814fcac0599dbaae50ede1f9f78e20941e27877 Mon Sep 17 00:00:00 2001
|
||||
From: pajoye <pajoye@c90b9560-bf6c-de11-be94-00142212c4b1>
|
||||
Date: Tue, 23 Feb 2010 11:07:39 +0000
|
||||
Subject: [PATCH] - fix build when __GMP_BITS_PER_MP_LIMB is not defined but GMP_LIMB_BITS (no trace of this change in gmp's changelog...)
|
||||
|
||||
git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_3@295402 c90b9560-bf6c-de11-be94-00142212c4b1
|
||||
---
|
||||
ext/gmp/gmp.c | 5 ++++-
|
||||
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
|
||||
index a54ffe9..f53dcd6 100644
|
||||
--- a/ext/gmp/gmp.c
|
||||
+++ b/ext/gmp/gmp.c
|
||||
@@ -1374,8 +1374,11 @@ ZEND_FUNCTION(gmp_random)
|
||||
|
||||
GMPG(rand_initialized) = 1;
|
||||
}
|
||||
+#ifdef GMP_LIMB_BITS
|
||||
+ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
|
||||
+#else
|
||||
mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
|
||||
-
|
||||
+#endif
|
||||
ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
|
||||
}
|
||||
/* }}} */
|
||||
--
|
||||
1.7.1
|
||||
|
||||
21
package/php/php-no-iconv-search.patch
Normal file
21
package/php/php-no-iconv-search.patch
Normal file
@ -0,0 +1,21 @@
|
||||
Don't push LDFLAGS/CFLAGS for iconv.
|
||||
Just assume they're covered somewhere else.
|
||||
Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc
|
||||
internal iconv support, which breaks things.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure
|
||||
--- php-5.3.13/configure 2012-05-08 06:41:23.000000000 -0300
|
||||
+++ php-5.3.13-iconv/configure 2012-05-18 22:18:21.313975849 -0300
|
||||
@@ -47885,8 +47885,8 @@
|
||||
PHP_ICONV_PREFIX="$ICONV_DIR"
|
||||
fi
|
||||
|
||||
- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
|
||||
- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
|
||||
+ #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
|
||||
+ #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
|
||||
|
||||
if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
|
||||
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
|
||||
@ -4,53 +4,59 @@
|
||||
#
|
||||
#############################################################
|
||||
|
||||
PHP_VERSION = 5.2.17
|
||||
PHP_VERSION = 5.3.13
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
|
||||
PHP_SITE = http://www.php.net/distributions
|
||||
PHP_INSTALL_STAGING = YES
|
||||
PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
|
||||
PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
|
||||
PHP_LIBTOOL_PATCH = NO
|
||||
PHP_CONF_OPT = --mandir=/usr/share/man \
|
||||
--infodir=/usr/share/info \
|
||||
--disable-all \
|
||||
--without-pear \
|
||||
--with-config-file-path=/etc \
|
||||
--localstatedir=/var \
|
||||
--disable-rpath
|
||||
|
||||
PHP_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
ifneq ($(BR2_PACKAGE_PHP_CLI),y)
|
||||
PHP_CONF_OPT += --disable-cli
|
||||
else
|
||||
PHP_CONF_OPT += --enable-cli
|
||||
# Workaround for non-IPv6 uClibc toolchain
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
|
||||
ifneq ($(BR2_INET_IPV6),y)
|
||||
PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_PHP_CGI),y)
|
||||
PHP_CONF_OPT += --disable-cgi
|
||||
else
|
||||
PHP_CONF_OPT += --enable-cgi
|
||||
ifeq ($(BR2_PACKAGE_PHP_FASTCGI),y)
|
||||
PHP_CONF_OPT += --enable-fastcgi
|
||||
endif
|
||||
endif
|
||||
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
|
||||
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
|
||||
|
||||
### Extensions
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SOCKETS),y)
|
||||
PHP_CONF_OPT += --enable-sockets
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_POSIX),y)
|
||||
PHP_CONF_OPT += --enable-posix
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SPL),y)
|
||||
PHP_CONF_OPT += --enable-spl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SESSION),y)
|
||||
PHP_CONF_OPT += --enable-session
|
||||
endif
|
||||
PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_WDDX),--enable-wddx) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_FILENIFO),--enable-fileinfo) \
|
||||
$(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
|
||||
PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
|
||||
@ -58,16 +64,14 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
|
||||
PHP_CONF_OPT += --enable-libxml \
|
||||
--with-libxml-dir=${STAGING_DIR}/usr \
|
||||
--enable-xml \
|
||||
--enable-xmlreader \
|
||||
--enable-xmlwriter
|
||||
PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
|
||||
PHP_DEPENDENCIES += libxml2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
|
||||
PHP_CONF_OPT += --enable-simplexml
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
|
||||
PHP_CONF_OPT += --with-xmlrpc \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
|
||||
PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
|
||||
@ -75,70 +79,35 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
|
||||
PHP_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_EXIF),y)
|
||||
PHP_CONF_OPT += --enable-exif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_FTP),y)
|
||||
PHP_CONF_OPT += --enable-ftp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
|
||||
PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y)
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
PHP_CONF_OPT += --with-iconv=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += libiconv
|
||||
else
|
||||
PHP_CONF_OPT += --with-iconv
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
|
||||
PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += icu
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
|
||||
PHP_CONF_OPT += --with-gmp=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += gmp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_JSON),y)
|
||||
PHP_CONF_OPT += --enable-json
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
|
||||
PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += readline
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
|
||||
PHP_CONF_OPT += --with-ncurses=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += ncurses
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PCNTL),y)
|
||||
PHP_CONF_OPT += --enable-pcntl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
|
||||
PHP_CONF_OPT += --enable-sysvmsg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSEM),y)
|
||||
PHP_CONF_OPT += --enable-sysvsem
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVSHM),y)
|
||||
PHP_CONF_OPT += --enable-sysvshm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
|
||||
PHP_CONF_OPT += --enable-zip
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_FILTER),y)
|
||||
PHP_CONF_OPT += --enable-filter
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_CALENDAR),y)
|
||||
PHP_CONF_OPT += --enable-calendar
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PCRE),y)
|
||||
PHP_CONF_OPT += --with-pcre-regex
|
||||
endif
|
||||
|
||||
### Legacy sqlite2 support
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
|
||||
PHP_CONF_OPT += --with-sqlite
|
||||
@ -150,16 +119,22 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
|
||||
endif
|
||||
endif
|
||||
|
||||
### Native MySQL extensions
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
|
||||
PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += mysql_client
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
|
||||
PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
|
||||
PHP_DEPENDENCIES += mysql_client
|
||||
endif
|
||||
|
||||
### PDO
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
|
||||
PHP_CONF_OPT += --enable-pdo
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL),y)
|
||||
PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += sqlite
|
||||
else
|
||||
PHP_CONF_OPT += --with-pdo-sqlite
|
||||
endif
|
||||
PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
|
||||
ifneq ($(BR2_LARGEFILE),y)
|
||||
PHP_CFLAGS += -DSQLITE_DISABLE_LFS
|
||||
@ -171,6 +146,50 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
|
||||
endif
|
||||
endif
|
||||
|
||||
### Use external PCRE if it's available
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += pcre
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
|
||||
PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += libcurl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y)
|
||||
PHP_CONF_OPT += --with-xsl=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += libxslt
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y)
|
||||
PHP_CONF_OPT += --with-bz2=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += bzip2
|
||||
endif
|
||||
|
||||
### DBA
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y)
|
||||
PHP_CONF_OPT += --enable-dba
|
||||
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y)
|
||||
PHP_CONF_OPT += --without-cdb
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y)
|
||||
PHP_CONF_OPT += --without-flatfile
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y)
|
||||
PHP_CONF_OPT += --without-inifile
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y)
|
||||
PHP_CONF_OPT += --with-db4=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += berkeleydb
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y)
|
||||
PHP_CONF_OPT += --with-snmp=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += netsnmp
|
||||
endif
|
||||
|
||||
# Fixup prefix= and exec_prefix= in php-config
|
||||
define PHP_FIXUP_PHP_CONFIG
|
||||
$(SED) 's%^prefix="/usr"%prefix="$(STAGING_DIR)/usr"%' \
|
||||
@ -185,7 +204,9 @@ define PHP_INSTALL_FIXUP
|
||||
rm -f $(TARGET_DIR)/usr/bin/phpize
|
||||
rm -f $(TARGET_DIR)/usr/bin/php-config
|
||||
if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
|
||||
$(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini; fi
|
||||
$(INSTALL) -m 0755 $(PHP_DIR)/php.ini-production \
|
||||
$(TARGET_DIR)/etc/php.ini; \
|
||||
fi
|
||||
endef
|
||||
|
||||
PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP
|
||||
|
||||
9
package/python-id3/Config.in
Normal file
9
package/python-id3/Config.in
Normal file
@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_PYTHON_ID3
|
||||
bool "python-id3"
|
||||
depends on BR2_PACKAGE_PYTHON
|
||||
help
|
||||
This module allows one to read and manipulate so-called ID3
|
||||
informational tags on MP3 files through an object-oriented
|
||||
Python interface.
|
||||
|
||||
http://id3-py.sourceforge.net/
|
||||
21
package/python-id3/python-id3.mk
Normal file
21
package/python-id3/python-id3.mk
Normal file
@ -0,0 +1,21 @@
|
||||
#############################################################
|
||||
#
|
||||
# python-id3
|
||||
#
|
||||
#############################################################
|
||||
|
||||
PYTHON_ID3_VERSION = 1.2
|
||||
PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
|
||||
PYTHON_ID3_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/id3-py
|
||||
|
||||
PYTHON_ID3_DEPENDENCIES = python
|
||||
|
||||
define PYTHON_ID3_BUILD_CMDS
|
||||
(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
|
||||
endef
|
||||
|
||||
define PYTHON_ID3_INSTALL_TARGET_CMDS
|
||||
(cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
|
||||
endef
|
||||
|
||||
$(eval $(call GENTARGETS))
|
||||
@ -22,6 +22,11 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
|
||||
You'll want this enabled if zebra and the protocol daemon(s) run
|
||||
on different hosts.
|
||||
|
||||
config BR2_PACKAGE_QUAGGA_BABELD
|
||||
bool "BABEL protocol"
|
||||
help
|
||||
Build babeld daemon.
|
||||
|
||||
config BR2_PACKAGE_QUAGGA_BGPD
|
||||
bool "BPGv4+ protocol"
|
||||
help
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user