From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Sep 2010 19:04:46 +0200 Subject: replace mksh scripts with faster C programs depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable. --- Makefile | 9 - README | 1 - mk/build.mk | 27 +- mk/package.mk | 1 - mk/split-cfg.mk | 9 - package/DirectFB/Makefile | 2 +- package/MesaLib/Makefile | 21 +- package/adkinstall/Makefile | 1 + package/aiccu/Makefile | 2 +- package/aircrack-ng/Makefile | 4 +- package/alix-switch/Makefile | 4 +- package/alsa-utils/Makefile | 11 +- package/apr-util/Makefile | 12 +- package/apr/Makefile | 2 +- package/arpd/Makefile | 2 +- package/arpwatch/Makefile | 4 +- package/asterisk/Makefile | 39 +- package/atftp/Makefile | 9 +- package/atk/Makefile | 4 +- package/aufs2-util/Makefile | 1 + package/autossh/Makefile | 2 +- package/avahi/Makefile | 16 +- package/axtls/Makefile | 9 +- package/bc/Makefile | 4 +- package/bigreqsproto/Makefile | 1 + package/bind/Makefile | 34 +- package/binutils/Makefile | 9 +- package/bitlbee/Makefile | 4 +- package/bluez-firmware/Makefile | 2 +- package/bluez/Makefile | 4 +- package/bogofilter/Makefile | 2 +- package/busybox/Makefile | 7 +- package/bwm/Makefile | 6 +- package/bzip2/Makefile | 2 +- package/bzr/Makefile | 2 +- package/cairo/Makefile | 2 +- package/ccid/Makefile | 2 +- package/cfgfs/Makefile | 13 +- package/cgilib/Makefile | 2 +- package/chillispot/Makefile | 2 +- package/collectd/Makefile | 2 +- package/compositeproto/Makefile | 1 + package/conntrack-tools/Makefile | 5 +- package/coreutils/Makefile | 7 +- package/cpufrequtils/Makefile | 3 +- package/cryptinit/Makefile | 6 +- package/cryptsetup/Makefile | 8 +- package/ctorrent/Makefile | 2 +- package/cups/Makefile | 5 +- package/curl/Makefile | 17 +- package/cvs/Makefile | 8 - package/cxxtools/Makefile | 4 +- package/cyrus-sasl/Makefile | 7 +- package/damageproto/Makefile | 1 + package/dansguardian/Makefile | 6 +- package/davfs2/Makefile | 18 +- package/dbus-glib/Makefile | 2 +- package/dbus/Makefile | 4 +- package/deco/Makefile | 2 +- package/depmaker | 38 -- package/dhcp-forwarder/Makefile | 5 +- package/dhcp/Makefile | 8 +- package/dialog/Makefile | 2 +- package/digitemp/Makefile | 4 +- package/dillo/Makefile | 8 +- package/dnsmasq/Makefile | 2 +- package/dosfstools/Makefile | 2 +- package/dovecot/Makefile | 2 +- package/dri2proto/Makefile | 1 + package/dropbear/Makefile | 11 +- package/dsniff/Makefile | 4 +- package/e2fsprogs/Makefile | 28 +- package/eglibc/Makefile | 5 +- package/elinks/Makefile | 2 +- package/esound/Makefile | 2 +- package/ethtool/Makefile | 2 +- package/evieext/Makefile | 1 + package/evilwm/Makefile | 2 +- package/exmap/Makefile | 19 +- package/expat/Makefile | 2 + package/ez-ipupdate/Makefile | 7 +- package/faad2/Makefile | 2 + package/fetchmail/Makefile | 4 +- package/ffmpeg/Makefile | 14 +- package/firefox/Makefile | 8 +- package/fixesproto/Makefile | 1 + package/flac/Makefile | 2 + package/fltk/Makefile | 9 +- package/fluxbox/Makefile | 6 +- package/font-adobe-100dpi/Makefile | 2 +- package/font-adobe-75dpi/Makefile | 2 +- package/font-misc-misc/Makefile | 2 +- package/fontcacheproto/Makefile | 1 + package/fontconfig/Makefile | 4 +- package/fontsproto/Makefile | 1 + package/fping/Makefile | 2 +- package/fprobe/Makefile | 2 +- package/freeglut/Makefile | 4 +- package/freeradius-client/Makefile | 9 +- package/freeradius-server/Makefile | 86 ++-- package/freetype/Makefile | 6 +- package/fuse/Makefile | 4 +- package/gatling/Makefile | 2 +- package/gcc/Makefile | 4 +- package/gdb/Makefile | 6 +- package/gdbm/Makefile | 4 +- package/gdbserver/Makefile | 7 +- package/gettext/Makefile | 10 +- package/git/Makefile | 4 +- package/gkrellmd/Makefile | 2 +- package/glib/Makefile | 2 +- package/glibc/Makefile | 5 +- package/glproto/Makefile | 2 + package/gmediaserver/Makefile | 2 +- package/gmp/Makefile | 4 +- package/gnupg/Makefile | 4 +- package/gnutls/Makefile | 21 +- package/gpsd/Makefile | 9 +- package/grub-bin/Makefile | 7 +- package/grub/Makefile | 2 +- package/gsm/Makefile | 10 +- package/gtk+/Makefile | 4 +- package/haserl/Makefile | 2 +- package/heimdal/Makefile | 48 +- package/heyu/Makefile | 2 +- package/hostapd/Makefile | 21 +- package/httping/Makefile | 2 +- package/httptunnel/Makefile | 2 +- package/icecast/Makefile | 2 +- package/id3lib/Makefile | 6 +- package/iftop/Makefile | 4 +- package/igmpproxy/Makefile | 3 +- package/inputproto/Makefile | 1 + package/ipcad/Makefile | 2 +- package/iperf/Makefile | 2 +- package/iproute2/Makefile | 37 +- package/ipsec-tools/Makefile | 4 +- package/ipset/Makefile | 12 +- package/iptables-snmp/Makefile | 2 +- package/iptables/Makefile | 2 + package/iptraf/Makefile | 7 +- package/irssi/Makefile | 12 +- package/iw/Makefile | 2 +- package/jamvm/Makefile | 2 +- package/jpeg/Makefile | 5 +- package/kbproto/Makefile | 1 + package/kismet/Makefile | 17 +- package/knock/Makefile | 9 +- package/krb5/Makefile | 12 +- package/l2tpns/Makefile | 2 +- package/lame/Makefile | 9 +- package/less/Makefile | 6 +- package/libICE/Makefile | 2 +- package/libIDL/Makefile | 2 +- package/libSM/Makefile | 2 +- package/libX11/Makefile | 4 +- package/libXaw/Makefile | 2 +- package/libXdamage/Makefile | 2 +- package/libXext/Makefile | 2 +- package/libXfixes/Makefile | 2 +- package/libXfont/Makefile | 2 +- package/libXft/Makefile | 2 +- package/libXi/Makefile | 2 +- package/libXmu/Makefile | 2 +- package/libXrender/Makefile | 2 +- package/libXt/Makefile | 2 +- package/libXv/Makefile | 2 +- package/libXxf86dga/Makefile | 2 +- package/libXxf86vm/Makefile | 2 +- package/libao/Makefile | 2 +- package/libc/Makefile | 1 + package/libdrm/Makefile | 2 +- package/libfontenc/Makefile | 2 +- package/libgcrypt/Makefile | 2 +- package/libgd/Makefile | 6 +- package/libgpg-error/Makefile | 2 +- package/libiconv/Makefile | 2 +- package/libid3tag/Makefile | 2 +- package/liblzo/Makefile | 2 + package/libmpc/Makefile | 4 +- package/libnet/Makefile | 2 +- package/libnetfilter_conntrack/Makefile | 2 +- package/libnetfilter_log/Makefile | 2 +- package/libnetfilter_queue/Makefile | 2 +- package/libnids/Makefile | 2 +- package/libol/Makefile | 2 +- package/libowfat/Makefile | 1 + package/libp11/Makefile | 2 +- package/libpng/Makefile | 2 +- package/libpri/Makefile | 2 +- package/libpthread-stubs/Makefile | 2 + package/libpthread/Makefile | 1 + package/librpcsecgss/Makefile | 2 +- package/libshout/Makefile | 2 +- package/libstdcxx/Makefile | 1 + package/libtasn1/Makefile | 2 +- package/libthread_db/Makefile | 1 + package/libtiff/Makefile | 2 +- package/libtirpc/Makefile | 4 +- package/libtool/Makefile | 7 +- package/libtorrent/Makefile | 4 +- package/libupnp/Makefile | 2 +- package/libusb-compat/Makefile | 2 +- package/libusb/Makefile | 2 +- package/libvirt/Makefile | 2 +- package/libvorbis/Makefile | 4 +- package/libxkbfile/Makefile | 2 +- package/libxml2/Makefile | 2 +- package/libxslt/Makefile | 5 +- package/lighttpd/Makefile | 24 +- package/links/Makefile | 4 +- package/linux-atm/Makefile | 15 +- package/logrotate/Makefile | 2 +- package/lua/Makefile | 13 +- package/lvm/Makefile | 12 +- package/lynx/Makefile | 12 +- package/madplay/Makefile | 2 +- package/mc/Makefile | 14 +- package/miau/Makefile | 2 +- package/miax/Makefile | 2 +- package/microperl/Makefile | 7 +- package/mini_httpd/Makefile | 39 +- package/mini_sendmail/Makefile | 2 +- package/miredo/Makefile | 13 +- package/mksh/Makefile | 8 +- package/moc/Makefile | 4 +- package/monit/Makefile | 17 +- package/monit/patches/patch-configure | 86 ---- package/motion/Makefile | 2 +- package/mpc/Makefile | 2 +- package/mpd/Makefile | 57 +-- package/mpg123/Makefile | 2 +- package/mplayer/Makefile | 10 +- package/mrd6/Makefile | 2 +- package/mt-daapd/Makefile | 8 +- package/mtd/Makefile | 3 +- package/mtr/Makefile | 4 +- package/mutt/Makefile | 4 +- package/mysql/Makefile | 3 +- package/nand/Makefile | 3 +- package/nano/Makefile | 5 +- package/ncurses/Makefile | 7 +- package/ndisc/Makefile | 4 +- package/neon/Makefile | 2 +- package/net-snmp/Makefile | 19 +- package/netperf/Makefile | 3 +- package/nfs-utils/Makefile | 17 +- package/nmap/Makefile | 6 +- package/nss/Makefile | 6 +- package/ntfs-3g/Makefile | 10 +- package/ntpclient/Makefile | 2 +- package/nut/Makefile | 18 +- package/obexftp/Makefile | 11 +- package/olsrd/Makefile | 10 +- package/opencdk/Makefile | 4 +- package/openct/Makefile | 4 +- package/openldap/Makefile | 19 +- package/openntpd/Makefile | 7 +- package/openobex/Makefile | 2 +- package/opensc/Makefile | 4 +- package/opensips/Makefile | 17 +- package/openssh/Makefile | 49 +- package/openssl-pkcs11/Makefile | 2 +- package/openssl/Makefile | 19 +- package/openswan/Makefile | 3 +- package/openvpn/Makefile | 12 +- package/oprofile/Makefile | 6 +- package/osiris/Makefile | 4 +- package/owfs/Makefile | 2 +- package/p910nd/Makefile | 2 +- package/palantir/Makefile | 4 +- package/pango/Makefile | 2 +- package/parprouted/Makefile | 2 +- package/parted/Makefile | 2 +- package/patch/Makefile | 2 +- package/pciutils/Makefile | 7 +- package/pcmciautils/Makefile | 2 +- package/pcre/Makefile | 4 +- package/pcsc-lite/Makefile | 2 +- package/perl/Makefile | 9 +- package/php/Makefile | 53 +- package/picocom/Makefile | 2 +- package/pkg-config/Makefile | 2 +- package/pkgmaker | 354 ------------- package/pmacct/Makefile | 17 +- package/popt/Makefile | 6 +- package/portmap/Makefile | 6 +- package/postgresql/Makefile | 9 +- package/ppp/Makefile | 7 +- package/pptpd/Makefile | 2 +- package/privoxy/Makefile | 4 +- package/procmail/Makefile | 2 +- package/procps/Makefile | 4 +- package/proftpd/Makefile | 2 +- package/ptunnel/Makefile | 2 +- package/python/Makefile | 2 +- package/python2/Makefile | 2 +- package/qingy/Makefile | 2 +- package/quagga/Makefile | 33 +- package/raddump/Makefile | 2 +- package/radvd/Makefile | 5 +- package/randrproto/Makefile | 1 + package/rarpd/Makefile | 2 +- package/rdate/Makefile | 10 +- package/readline/Makefile | 4 +- package/reaim/Makefile | 2 +- package/renderproto/Makefile | 1 + package/resourceproto/Makefile | 1 + package/rng-tools/Makefile | 2 +- package/rp-pppoe/Makefile | 4 +- package/rpcbind/Makefile | 2 +- package/rpm/Makefile | 10 +- package/rrdcollect/Makefile | 4 +- package/rrdtool/Makefile | 3 +- package/rrs/Makefile | 53 +- package/rsync/Makefile | 4 +- package/rtorrent/Makefile | 4 +- package/ruby/Makefile | 5 +- package/rxvt-unicode/Makefile | 2 +- package/samba/Makefile | 4 +- package/sane-backends/Makefile | 26 +- package/sangam-atm/Makefile | 2 +- package/scanlogd/Makefile | 8 +- package/screen/Makefile | 4 +- package/scrnsaverproto/Makefile | 1 + package/sdl-image/Makefile | 10 +- package/sdl/Makefile | 12 +- package/section.lst | 46 ++ package/sections.lst | 53 -- package/serdisplib/Makefile | 2 +- package/siproxd/Makefile | 2 +- package/sipsak/Makefile | 7 +- package/sispmctl/Makefile | 4 +- package/snort/Makefile | 4 +- package/socat/Makefile | 4 +- package/speex/Makefile | 4 +- package/sqlite/Makefile | 4 +- package/squid/Makefile | 22 +- package/ssltunnel/Makefile | 2 +- package/strace/Makefile | 4 +- package/strongswan/Makefile | 14 +- package/subversion/Makefile | 2 +- package/syslog-ng/Makefile | 4 +- package/tcp_wrappers/Makefile | 4 +- package/tcpdump/Makefile | 2 +- package/tcsh/Makefile | 2 +- package/tinc/Makefile | 4 +- package/tinyproxy/Makefile | 2 +- package/tmsnc/Makefile | 2 +- package/tntnet/Makefile | 41 +- package/tor/Makefile | 6 +- package/trafshow/Makefile | 1 - package/tslib/Makefile | 3 +- package/twm/Makefile | 4 +- package/uclibc++/Makefile | 4 +- package/uclibc/Makefile | 8 +- package/udev/Makefile | 4 +- package/udp-broadcast-relay/Makefile | 2 +- package/ulogd/Makefile | 22 +- package/updatedd/Makefile | 6 +- package/usbutils/Makefile | 4 +- package/ussp-push/Makefile | 2 +- package/util-linux-ng/Makefile | 29 +- package/uvd/Makefile | 2 +- package/valgrind/Makefile | 2 +- package/vgp/Makefile | 2 +- package/videoproto/Makefile | 1 + package/vilistextum/Makefile | 2 +- package/vim/Makefile | 12 +- package/vnc-reflector/Makefile | 2 +- package/vpnc/Makefile | 2 +- package/vsftpd/Makefile | 2 +- package/vtun/Makefile | 2 +- package/wdfs/Makefile | 12 +- package/weechat/Makefile | 2 +- package/wifidog/Makefile | 2 +- package/wondershaper/Makefile | 2 +- package/wpa_supplicant/Makefile | 10 +- package/xauth/Makefile | 2 +- package/xcb-proto/Makefile | 1 + package/xcmiscproto/Makefile | 1 + package/xextproto/Makefile | 1 + package/xf86-input-evtouch/Makefile | 6 +- package/xf86-input-keyboard/Makefile | 2 +- package/xf86-input-mouse/Makefile | 2 +- package/xf86-video-cirrus/Makefile | 2 +- package/xf86-video-fbdev/Makefile | 2 +- package/xf86-video-geode/Makefile | 2 +- package/xf86-video-intel/Makefile | 2 +- package/xf86-video-siliconmotion/Makefile | 2 +- package/xf86dga/Makefile | 3 +- package/xf86dgaproto/Makefile | 1 + package/xf86driproto/Makefile | 2 + package/xf86vidmodeproto/Makefile | 1 + package/xfsprogs/Makefile | 2 +- package/xinetd/Makefile | 2 +- package/xinit/Makefile | 4 +- package/xkeyboard-config/Makefile | 2 +- package/xorg-server/Makefile | 25 +- package/xproto/Makefile | 1 + package/xterm/Makefile | 3 +- package/xtrans/Makefile | 1 + package/xvinfo/Makefile | 2 +- package/zlib/Makefile | 11 +- scripts/split-cfg.sh | 1 + target/target.lst | 36 +- tools/Makefile | 2 +- tools/adk/Makefile | 11 + tools/adk/depmaker.c | 233 +++++++++ tools/adk/pkgmaker.c | 797 ++++++++++++++++++++++++++++++ tools/adk/sortfile.c | 153 ++++++ tools/adk/sortfile.h | 1 + tools/adk/strmap.c | 510 +++++++++++++++++++ tools/adk/strmap.h | 350 +++++++++++++ 414 files changed, 3318 insertions(+), 1843 deletions(-) delete mode 100644 mk/split-cfg.mk delete mode 100644 package/depmaker delete mode 100644 package/monit/patches/patch-configure delete mode 100644 package/pkgmaker create mode 100644 package/section.lst delete mode 100644 package/sections.lst create mode 100644 tools/adk/Makefile create mode 100644 tools/adk/depmaker.c create mode 100644 tools/adk/pkgmaker.c create mode 100644 tools/adk/sortfile.c create mode 100644 tools/adk/sortfile.h create mode 100644 tools/adk/strmap.c create mode 100644 tools/adk/strmap.h diff --git a/Makefile b/Makefile index bfa10b106..bc5184b65 100644 --- a/Makefile +++ b/Makefile @@ -180,15 +180,6 @@ NO_ERROR=0 echo "GNU bash needs to be installed."; \ exit 1; \ fi - @if ! mksh -c 'echo $$KSH_VERSION' 2>&1 | grep -F 'MIRBSD' >/dev/null 2>&1; then \ - echo "MirBSD ksh (mksh) needs to be installed."; \ - exit 1; \ - else \ - if [ $$(mksh -c 'echo $$KSH_VERSION' |cut -d ' ' -f 3|sed "s#R##") -le 34 ]; then \ - echo "MirBSD ksh is too old. R35 or higher needed."; \ - exit 1; \ - fi \ - fi @if test x"$$(umask 2>/dev/null | sed 's/00*22/OK/')" != x"OK"; then \ echo >&2 Error: you must build with umask 022, sorry.; \ exit 1; \ diff --git a/README b/README index 04b6b441e..284c4664e 100644 --- a/README +++ b/README @@ -5,7 +5,6 @@ This is a menu based buildsystem for your home made embedded Linux system. Before you can start you need to install some tools: - bash -- mksh - gcc - binutils - GNU make diff --git a/mk/build.mk b/mk/build.mk index f71808b3f..c3ab05dcd 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -87,17 +87,17 @@ endif ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) include $(TOPDIR)/rules.mk -include ${TOPDIR}/mk/split-cfg.mk all: world ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile) - mksh ${TOPDIR}/package/depmaker + $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk + .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean -world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG +world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ifeq ($(ADK_NATIVE),y) $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare tools/install target/config-prepare target/compile package/compile root_clean package/install package_index target/install @@ -137,10 +137,10 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf endif -package/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk +package/%: ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) -target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG +target/%: $(MAKE) -C target $(patsubst target/%,%,$@) toolchain/%: ${STAGING_DIR} @@ -179,11 +179,6 @@ newpackage: @echo "Edit package/$(PKG)/Makefile to complete" @echo "choose PKG_SECTION to add it to an existent submenu" -############################################################# -# -# Cleanup and misc junk -# -############################################################# root_clean: @$(TRACE) root_clean rm -rf $(TARGET_DIR) @@ -411,7 +406,7 @@ ifneq (,$(filter wrap%,${TARGET})) @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config endif -menuconfig: $(CONFIG)/mconf defconfig .menu +menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @@ -495,14 +490,18 @@ bulkallmod: ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \ done <${TOPDIR}/target/bulk.lst -menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) +${TOPDIR}/bin/tools/pkgmaker: + @$(HOSTCC) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c + +package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker @echo "Generating menu structure ..." - mksh $(TOPDIR)/package/pkgmaker + @mkdir -p $(TOPDIR)/bin/tools + @$(TOPDIR)/bin/tools/pkgmaker @:>.menu dep: @echo "Generating dependencies ..." - mksh $(TOPDIR)/package/depmaker + $(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk .PHONY: menu dep diff --git a/mk/package.mk b/mk/package.mk index 30965e17b..1f582b3d1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -108,7 +108,6 @@ _IPKGS_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk --include info.mk # defined in buildhlp.mk ('extract' can fail, use 'patch' then) extract: ${_EXTRACT_COOKIE} diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk deleted file mode 100644 index e9521c259..000000000 --- a/mk/split-cfg.mk +++ /dev/null @@ -1,9 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. -# must work with both BSD and GNU make - -${TOPDIR}/.ADK_HAVE_DOT_CONFIG: \ - ${TOPDIR}/.config ${TOPDIR}/mk/split-cfg.mk \ - ${TOPDIR}/scripts/split-cfg.sh - mksh ${TOPDIR}/scripts/split-cfg.sh '${TOPDIR}' '${ADK_TARGET}' '${ADK_LIBC}' - touch ${TOPDIR}/.ADK_HAVE_DOT_CONFIG diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index f96d888ec..ba0b69a03 100644 --- a/package/DirectFB/Makefile +++ b/package/DirectFB/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 223e036da906ceb4bd44708026839ff1 PKG_DESCR:= Thin library on top of the Linux framebuffer devices PKG_SECTION:= libs -PKG_BUILDDEP:= libpng libX11 libXext PKG_DEPENDS:= libpng +PKG_BUILDDEP:= libpng libX11 libXext PKG_URL:= http://www.directfb.org/ PKG_SITES:= http://directfb.org/downloads/Core/DirectFB-1.4/ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 4d82687ee..6d70a1798 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -10,26 +10,27 @@ PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP:= libXdamage libXfixes libXxf86vm libdrm PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ -PKG_DESCR_GLXINFO:= Display various GLX information -PKG_SECT_GLXINFO:= x11/apps -PKG_DESCR_GLXGEARS:= Nice little OpenGL demo application -PKG_SECT_GLXGEARS:= x11/apps +PKG_SUBPKGS:= MESALIB GLXINFO GLXGEARS +PKGSD_GLXINFO:= Display various GLX information +PKGSC_GLXINFO:= x11/apps +PKGSD_GLXGEARS:= Nice little OpenGL demo application +PKGSC_GLXGEARS:= x11/apps -WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} - -PKG_TARGET_DEPENDS:= ibmx40 lemote PKG_HOST_DEPENDS:= !cygwin +PKG_TARGET_DEPENDS:= ibmx40 lemote + +WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_GLXINFO},${PKG_SECT_GLXINFO})) -$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_GLXGEARS},${PKG_SECT_GLXGEARS})) +$(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) +$(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) ifeq (${ADK_LINUX_X86_IBMX40},y) DRI_DRIVERS:=i810 diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index 65745cd08..5a64ae14d 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 5 PKG_DESCR:= openadk installer PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix wrap routerboard foxg20 diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 0a6d706ed..5eeeac943 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 PKG_DEPENDS:= kmod-ipv6 libpthread -PKG_URL:= http://www.sixxs.net +PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ DISTFILES:= $(PKG_NAME)_$(PKG_VERSION).tar.gz diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile index b9c9470bf..7bc5ec29e 100644 --- a/package/aircrack-ng/Makefile +++ b/package/aircrack-ng/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= f7a24ed8fad122c4187d06bfd6f998b4 PKG_DESCR:= set of tools for auditing wireless networks PKG_SECTION:= wifi PKG_DEPENDS:= libpthread libopenssl libpcap -PKG_BUILDDEP+= openssl libpcap -PKG_URL:= http://www.aircrack-ng.org +PKG_BUILDDEP:= openssl libpcap +PKG_URL:= http://www.aircrack-ng.org/ PKG_SITES:= http://download.aircrack-ng.org/ include $(TOPDIR)/mk/package.mk diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 493a73053..79b72b1e1 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -8,8 +8,10 @@ PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= daemon listening on button events PKG_SECTION:= base +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix +PKG_DFLT_ALIX_SWITCH:= y NO_DISTFILES:= 1 @@ -17,8 +19,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ALIX_SWITCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_ALIX_SWITCH= y - CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index e1668520c..288faafdf 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -10,17 +10,14 @@ PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libpthread -PKG_BUILDDEP+= alsa-lib -ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) -PKG_BUILDDEP+= ncurses -endif -PKG_URL:= http://www.alsa-project.org -PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ - ftp://ftp.alsa-project.org/pub/utils/ +PKG_BUILDDEP:= alsa-lib +PKG_URL:= http://www.alsa-project.org/ +PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ PKG_FLAVOURS:= WITH_ALSAMIXER PKGFS_WITH_ALSAMIXER:= libncurses PKGFD_WITH_ALSAMIXER:= include alsamixer ncurses applet +PKGFB_WITH_ALSAMIXER:= ncurses DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile index 2c0afd8bf..86ddd34ca 100644 --- a/package/apr-util/Makefile +++ b/package/apr-util/Makefile @@ -3,15 +3,15 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= apr-util -PKG_VERSION:= 1.3.9 -PKG_RELEASE:= 1 -PKG_MD5SUM:= cc2ec0ba4f01d88375f1170f762518fa +PKG_NAME:= apr-util +PKG_VERSION:= 1.3.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= cc2ec0ba4f01d88375f1170f762518fa PKG_DESCR:= Apache Portable Runtime utility library PKG_SECTION:= libs PKG_DEPENDS:= libexpat apr -PKG_BUILDDEP+= expat apr -PKG_URL:= http://apr.apache.org +PKG_BUILDDEP:= expat apr +PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://apache.mirror.clusters.cc/apr/ include ${TOPDIR}/mk/package.mk diff --git a/package/apr/Makefile b/package/apr/Makefile index 7da0bf8b5..08faf55d9 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= fc80cb54f158c2674f9eeb47a1f672cd PKG_DESCR:= Apache Portable Runtime library PKG_SECTION:= libs PKG_DEPENDS:= libpthread -PKG_URL:= http://apr.apache.org +PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ PKG_FLAVOURS:= WITH_IPV6 diff --git a/package/arpd/Makefile b/package/arpd/Makefile index 249f4b8eb..071e4eb7d 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= e2911fa9de1b92ef50deda1489ae944d PKG_DESCR:= Generates ARP responses for IP address ranges PKG_SECTION:= route PKG_DEPENDS:= libpcap libdnet libevent -PKG_BUILDDEP+= libpcap libdnet libevent +PKG_BUILDDEP:= libpcap libdnet libevent PKG_URL:= http://niels.xtdnet.nl/honeyd/ PKG_SITES:= http://niels.xtdnet.nl/honeyd/ diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 83584fb1e..a3e437f64 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= cebfeb99c4a7c2a6cee2564770415fe7 PKG_DESCR:= Ethernet monitor program PKG_SECTION:= net/security PKG_DEPENDS:= libpcap -PKG_BUILDDEP+= libpcap -PKG_URL:= http://www-nrg.ee.lbl.gov +PKG_BUILDDEP:= libpcap +PKG_URL:= http://www-nrg.ee.lbl.gov/ PKG_SITES:= ftp://ftp.ee.lbl.gov/ include $(TOPDIR)/mk/package.mk diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index a6025ce43..3083656f4 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -9,38 +9,37 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 50412a90942ae7306fb8dcc31a05c2ce PKG_DESCR:= Open Source PBX PKG_SECTION:= phone -PKG_MULTI:= 1 -PKG_NOPARALLEL:= 1 PKG_DEPENDS:= libncurses libpthread libopenssl libcurl -PKG_BUILDDEP+= ncurses openssl zlib curl popt -ifneq ($(ADK_PACKAGE_ASTERISK_CODEC_SPEEX),) -PKG_BUILDDEP+= speex -endif -ifneq ($(ADK_PACKAGE_ASTERISK_PGSQL),) -PKG_BUILDDEP+= postgresql -endif +PKG_BUILDDEP:= ncurses openssl zlib curl popt PKG_URL:= http://www.asterisk.org/ PKG_SITES:= http://downloads.asterisk.org/pub/telephony/asterisk/releases/ +PKG_MULTI:= 1 +PKG_NOPARALLEL:= 1 PKG_TARGET_DEPENDS:= !foxboard -PKG_DESCR_CHAN_MGCP:= Media Gateway Control Protocol implementation -PKG_DESCR_CHAN_SKINNY:= Skinny Client Control Protocol implementation -PKG_DESCR_CHAN_IAX2:= Support for the Inter Asterisk Protocol -PKG_DESCR_CODEC_SPEEX:= Speex/PCM16 Codec Translator -PKG_DESCR_SOUNDS:= Various soundfiles in GSM format -PKG_DEPENDS_SOUNDS:= ${PKG_DEPENDS} asterisk-codec-gsm +PKG_SUBPKGS:= ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS ASTERISK_CHAN_MGCP +PKG_SUBPKGS+= ASTERISK_CHAN_SKINNY ASTERISK_CHAN_IAX2 ASTERISK_CODEC_SPEEX ASTERISK_CODEC_GSM +PKG_SUBPKGS+= ASTERISK_PBX_DUNDI ASTERISK_RES_AGI +PKGSB_ASTERISK_CODEC_SPEEX:= speex +PKGSB_ASTERISK_PQSQL:= postgresql +PKGSD_ASTERISK_CHAN_MGCP:= Media Gateway Control Protocol implementation +PKGSD_ASTERISK_CHAN_SKINNY:= Skinny Client Control Protocol implementation +PKGSD_ASTERISK_CHAN_IAX2:= Support for the Inter Asterisk Protocol +PKGSD_ASTERISK_CODEC_SPEEX:= Speex/PCM16 Codec Translator +PKGSD_ASTERISK_SOUNDS:= Various soundfiles in GSM format +PKGSS_ASTERISK_SOUNDS:= asterisk-codec-gsm include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ASTERISK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_SOUNDS},${PKG_DESCR_SOUNDS},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_MGCP},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_SKINNY},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CHAN_IAX2},${PKG_SECTION})) -$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS_MAIN},${PKG_DESCR_CODEC_SPEEX},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_ASTERISK_SOUNDS},${PKGSD_ASTERISK_SOUNDS},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_MGCP},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_SKINNY},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CHAN_IAX2},${PKG_SECTION})) +$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_CODEC_SPEEX},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_CODEC_GSM,asterisk-codec-gsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/atftp/Makefile b/package/atftp/Makefile index e009111fa..601e9aba3 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -10,16 +10,17 @@ PKG_MD5SUM:= 3b27365772d918050b2251d98a9c7c82 PKG_DESCR:= TFTP client PKG_SECTION:= dhcp PKG_DEPENDS:= libreadline libncurses -PKG_BUILDDEP+= readline ncurses -PKG_URL:= http://freshmeat.net/projects/atftp +PKG_BUILDDEP:= readline ncurses +PKG_URL:= http://freshmeat.net/projects/atftp/ PKG_SITES:= ftp://ftp.mamalinux.com/pub/atftp/ -PKG_DESCR_TFTP_SERVER:= TFTP server +PKG_SUBPKGS:= ATFTP ATFTPD +PKGSD_ATFTPD:= TFTP server include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TFTP_SERVER},${PKG_SECTION})) +$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ATFTPD},${PKG_SECTION})) MAKE_FLAGS+= CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline" diff --git a/package/atk/Makefile b/package/atk/Makefile index 2b3437450..cb33d1f30 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= f587d9285b2d0ac35ea95acef673517c PKG_DESCR:= atk library PKG_SECTION:= libs -PKG_BUILDDEP+= glib -PKG_URL:= http://www.gnome.org +PKG_BUILDDEP:= glib +PKG_URL:= http://www.gnome.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=/atk/1.29/} ifeq ($(ADK_STATIC),y) diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile index d757e9c98..4078fa8e1 100644 --- a/package/aufs2-util/Makefile +++ b/package/aufs2-util/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= aufs2 utilities PKG_SECTION:= fs PKG_URL:= http://aufs.sf.net/ + PKG_HOST_DEPENDS:= !cygwin !freebsd !openbsd !netbsd NO_DISTFILES:= 1 diff --git a/package/autossh/Makefile b/package/autossh/Makefile index 8f7a776b2..19fc3216d 100644 --- a/package/autossh/Makefile +++ b/package/autossh/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 8f9aa006f6f69e912d3c2f504622d6f7 PKG_DESCR:= Automatically restart SSH sessions and tunnels PKG_SECTION:= net/security PKG_DEPENDS:= openssh-client -PKG_URL:= http://www.harding.motd.ca/autossh +PKG_URL:= http://www.harding.motd.ca/autossh/ PKG_SITES:= http://www.harding.motd.ca/autossh/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz diff --git a/package/avahi/Makefile b/package/avahi/Makefile index ba55ad05a..ebd811ca9 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -10,19 +10,21 @@ PKG_MD5SUM:= a83155a6e29e3988f07e5eea3287b21e PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp PKG_DEPENDS:= libavahi libdaemon libexpat gettext -PKG_BUILDDEP+= libdaemon expat gdbm glib gettext -PKG_URL:= http://avahi.org +PKG_BUILDDEP:= libdaemon expat gdbm glib gettext +PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ -PKG_DEPENDS_DNSCONFD:= libavahi libdaemon avahi-daemon -PKG_DESCR_DNSCONFD:= DNS server from mDNS configuration daemon -PKG_DESCR_LIB:= DNS-SD over mDNS library +PKG_SUBPKGS:= AVAHI_DAEMON AVAHI_DNSCONFD LIBAVAHI +PKGSS_AVAHI_DNSCONFD:= libavahi libdaemon avahi-daemon +PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon +PKGSD_LIBAVAHI:= DNS-SD over mDNS library +PKGSC_LIBAVAHI:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DNSCONFD},${PKG_DESCR_DNSCONFD},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs)) +$(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) +$(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI})) TLDFLAGS+= -lintl CONFIGURE_ARGS+= --enable-glib \ diff --git a/package/axtls/Makefile b/package/axtls/Makefile index 0b2e60d97..c3c659666 100644 --- a/package/axtls/Makefile +++ b/package/axtls/Makefile @@ -10,11 +10,12 @@ PKG_MD5SUM:= 03471b5a5874e2ce86025f24b3fa0958 PKG_DESCR:= small embedded webserver PKG_SECTION:= net/security PKG_DEPENDS:= libaxtls -PKG_URL:= http://axtls.sourceforge.net +PKG_URL:= http://axtls.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=axtls/} -PKG_DESCR_LIB:= small tls library -PKG_SECTION_LIB:= libs +PKG_SUBPKGS:= AXHTTPD LIBAXTLS +PKGSD_LIBAXTLS:= small tls library +PKGSC_LIBAXTLS:= libs DISTFILES:= axTLS-${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/axTLS @@ -22,7 +23,7 @@ WRKDIST= ${WRKDIR}/axTLS include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB})) +$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAXTLS},${PKGSC_LIBAXTLS})) CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/bc/Makefile b/package/bc/Makefile index 8912693c0..3ee37411b 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -9,9 +9,11 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 PKG_DESCR:= An arbitrary precision calculator language PKG_SECTION:= utils -PKG_URL:= http://www.gnu.org/software/bc +PKG_URL:= http://www.gnu.org/software/bc/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ +PKG_SUBPKGS:= BC DC + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile index 52b61b367..05488be69 100644 --- a/package/bigreqsproto/Makefile +++ b/package/bigreqsproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 1.1.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 882d49cc3bb591dbdccdf9e680bd2e4b PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/bind/Makefile b/package/bind/Makefile index 2ad76e560..9adff33fd 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -10,17 +10,19 @@ PKG_MD5SUM:= c245b5d1aa0a4f53d9538faa1efe2c3f PKG_DESCR:= popular DNS server PKG_SECTION:= dns PKG_DEPENDS:= libopenssl libbind libxml2 -PKG_BUILDDEP+= openssl libxml2 -PKG_URL:= https://www.isc.org/software/bind +PKG_BUILDDEP:= openssl libxml2 +PKG_URL:= https://www.isc.org/software/bind/ PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ -PKG_DESCR_1:= dynamic dns client (nsupdate utility) -PKG_DESCR_2:= library for the bind software suite -PKG_DESCR_3:= rndc & rndc-confgen utilities -PKG_DESCR_4:= check utilities -PKG_DESCR_5:= dnssec utilities -PKG_DESCR_6:= host utility -PKG_DESCR_7:= dig utility +PKG_SUBPKGS:= BIND_SERVER BIND_CLIENT LIBBIND BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG +PKGSD_LIBBIND:= library for the bind software suite +PKGSC_LIBBIND:= libs +PKGSD_BIND_CLIENT:= dynamic dns client (nsupdate utility) +PKGSD_BIND_RNDC:= rndc & rndc-confgen utilities +PKGSD_BIND_CHECK:= check utilities +PKGSD_BIND_DNSSEC:= dnssec utilities +PKGSD_BIND_HOST:= host utility +PKGSD_BIND_DIG:= dig utility PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -28,13 +30,13 @@ PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},libs)) -$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION})) -$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND})) +$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_RNDC},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CHECK},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DNSSEC},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_HOST},${PKG_SECTION})) +$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DIG},${PKG_SECTION})) CONFIGURE_ARGS+= --with-randomdev=/dev/urandom \ --disable-threads \ diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 6959e8e96..b076323d5 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -8,17 +8,16 @@ PKG_DESCR:= binary utilities (nm, objdump, as, ..) PKG_SECTION:= lang PKG_DEPENDS:= libbfd -# subpackage -PKG_NAME_LIBBFD:= libbfd -PKG_DESCR_LIBBFD:= bfd library -PKG_SECTION_LIBBFD:= libs +PKG_SUBPKGS:= BINUTILS LIBBFD +PKGSD_LIBBFD:= Binary File Descriptor library +PKGSC_LIBBFD:= libs PKG_HOST_DEPENDS:= !cygwin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBBFD,${PKG_NAME_LIBBFD},${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIBBFD},${PKG_SECTION_LIBBFD})) +$(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) TCFLAGS+= -fPIC CONFIGURE_ARGS+= --disable-werror \ diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index 223fdd654..41319a738 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 26b9bfc5446bdf0e932e8074d117be67 PKG_DESCR:= IRC gateway to IM chat networks PKG_SECTION:= chat PKG_DEPENDS:= glib libiconv libopenssl -PKG_BUILDDEP+= glib libiconv openssl -PKG_URL:= http://www.bitlbee.org +PKG_BUILDDEP:= glib libiconv openssl +PKG_URL:= http://www.bitlbee.org/ PKG_SITES:= http://get.bitlbee.org/src/ include ${TOPDIR}/mk/package.mk diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile index 50961a2d7..56ce5d5ed 100644 --- a/package/bluez-firmware/Makefile +++ b/package/bluez-firmware/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 1cc3cefad872e937e05de5a0a2b390dd PKG_DESCR:= Bluez firmware for BCM2033 PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt bluez -PKG_URL:= http://www.bluez.org +PKG_URL:= http://www.bluez.org/ PKG_SITES:= http://bluez.sourceforge.net/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/bluez/Makefile b/package/bluez/Makefile index 34c8e7b7c..eb72b47f7 100644 --- a/package/bluez/Makefile +++ b/package/bluez/Makefile @@ -10,8 +10,8 @@ PKG_MD5SUM:= 1c7cee215bc84656b1edee019cee78f5 PKG_DESCR:= bluetooth libraries and applications PKG_SECTION:= bluetooth PKG_DEPENDS:= kmod-bt libusb glib dbus -PKG_BUILDDEP+= libusb dbus glib -PKG_URL:= http://www.bluez.org +PKG_BUILDDEP:= libusb dbus glib +PKG_URL:= http://www.bluez.org/ PKG_SITES:= ${MASTER_SITE_KERNEL:=bluetooth/} include ${TOPDIR}/mk/package.mk diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index c923305b2..103f95c68 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= a12a16d88d6d565dacf2a5e6259a3337 PKG_DESCR:= mail filter PKG_SECTION:= mail PKG_DEPENDS:= libiconv libdb -PKG_BUILDDEP+= libiconv libdb +PKG_BUILDDEP:= libiconv libdb PKG_URL:= http://bogofilter.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} diff --git a/package/busybox/Makefile b/package/busybox/Makefile index cdd0d8538..35007df31 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -14,13 +14,14 @@ PKG_SITES:= http://www.busybox.net/downloads/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DESCR_UDHCPD:= uDHCPD meta package -PKG_SECTION_UDHCPD:= net +PKG_SUBPKGS:= BUSYBOX UDHCPD +PKGSD_UDHCPD:= uDHCPD meta package +PKGSC_UDHCPD:= net include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKG_DESCR_UDHCPD},${PKG_SECTION_UDHCPD})) +$(eval $(call PKG_template,UDHCPD,udhcpd,${PKG_VERSION}-${PKG_RELEASE},busybox,${PKGSD_UDHCPD},${PKGSC_UDHCPD})) SUB_INSTALLS-y:= SUB_INSTALLS-m:= diff --git a/package/bwm/Makefile b/package/bwm/Makefile index c26ae51ec..119f23c11 100644 --- a/package/bwm/Makefile +++ b/package/bwm/Makefile @@ -18,9 +18,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual do-build: ${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index fc15ee0ab..b94a29059 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 3c15a0c8d1d3ee1c46a1634d00617b1a PKG_DESCR:= bzip2 compression utility PKG_SECTION:= archive -PKG_URL:= http://www.bzip.org +PKG_URL:= http://www.bzip.org/ PKG_SITES:= http://www.bzip.org/1.0.5/ include ${TOPDIR}/mk/package.mk diff --git a/package/bzr/Makefile b/package/bzr/Makefile index d67497c22..7b6836cae 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 0b253f59601ebc9ee5975c612fc65f43 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_DEPENDS:= python2 -PKG_BUILDDEP+= python2 +PKG_BUILDDEP:= python2 PKG_URL:= http://bazaar.canonical.com/en/ PKG_SITES:= http://launchpad.net/bzr/2.0/${PKG_VERSION}/+download/ diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 4b6f40c7b..5c2a6f96c 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= b60a82f405f9400bbfdcf850b1728d25 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman -PKG_BUILDDEP+= libpng pixman freetype fontconfig libX11 +PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ diff --git a/package/ccid/Makefile b/package/ccid/Makefile index bd3223d77..87f48c483 100644 --- a/package/ccid/Makefile +++ b/package/ccid/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7fcdbacacd955659286f988fa9b6e0be PKG_DESCR:= a generic USB CCID and ICCD driver PKG_SECTION:= crypto -PKG_BUILDDEP+= pcsc-lite +PKG_BUILDDEP:= pcsc-lite PKG_URL:= http://pcsclite.alioth.debian.org/ccid.html PKG_SITES:= https://alioth.debian.org/frs/download.php/3281/ diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index a67ad4329..77ec839e3 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,20 +8,25 @@ PKG_VERSION:= 1.0.7 PKG_RELEASE:= 3 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base +PKG_URL:= http://www.openadk.org/ PKG_TARGET_DEPENDS:= alix wrap foxboard ag241 foxg20 routerboard +PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ +PKG_CFLINE_CFGFS+= select BUSYBOX_MD5SUM@ +PKG_CFLINE_CFGFS+= select BUSYBOX_XARGS@ +PKG_CFLINE_CFGFS+= select BUSYBOX_FEATURE_SORT_BIG@ +PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ +PKG_CFLINE_CFGFS+= depends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS +PKG_DFLT_CFGFS:= y + WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CFGFS:= select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tselect BUSYBOX_DIFF\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT && !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_CFGFS= y - CONFIG_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 316b5e143..7fd1dc97a 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 2c7053f58dfb06f7a80a112797ed7e86 PKG_DESCR:= Simple CGI Library PKG_SECTION:= libs -PKG_URL:= http://www.infodrom.org/projects/cgilib +PKG_URL:= http://www.infodrom.org/projects/cgilib/ PKG_SITES:= http://www.infodrom.org/projects/cgilib/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index d7bbad374..2b5e15872 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 9d2597756af3fa14d7331b4a3651fc9b PKG_DESCR:= Wireless LAN Access Point Controller PKG_SECTION:= wifi PKG_DEPENDS:= kmod-tun -PKG_URL:= http://www.chillispot.info +PKG_URL:= http://www.chillispot.info/ PKG_SITES= http://www.chillispot.info/download/ include ${TOPDIR}/mk/package.mk diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 07f54226e..52e6e6ab5 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436 PKG_DESCR:= System statistics collection daemon PKG_SECTION:= misc PKG_DEPENDS:= libpthread -PKG_URL:= http://collectd.org +PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ PKG_FLAVOURS:= CPU LOAD MEMORY PING diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile index 6f7572f55..3b5abb435 100644 --- a/package/compositeproto/Makefile +++ b/package/compositeproto/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 0.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 6994a209774fe7877fd8e0c9fafe2466 PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= include $(TOPDIR)/mk/package.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile index 3e22262f7..1e8971ecd 100644 --- a/package/conntrack-tools/Makefile +++ b/package/conntrack-tools/Makefile @@ -10,9 +10,10 @@ PKG_MD5SUM:= 35b0ab9cde069b4ec8a493daae82d67b PKG_DESCR:= Connection tracking userspace tools PKG_SECTION:= firewall PKG_DEPENDS:= libnetfilter-conntrack -PKG_BUILDDEP+= libnetfilter_conntrack -PKG_URL:= http://conntrack-tools.netfilter.org +PKG_BUILDDEP:= libnetfilter_conntrack +PKG_URL:= http://conntrack-tools.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/conntrack-tools/files/ + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index bd7a621af..39ab9fddf 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -12,13 +12,14 @@ PKG_SECTION:= base PKG_URL:= http://www.gnu.org/software/coreutils/ PKG_SITES:= http://ftp.gnu.org/gnu/coreutils/ -PKG_DESCR_TSORT:= topological sort utility -PKG_SECTION_TSORT:= misc +PKG_SUBPKGS:= TSORT +PKGSD_TSORT:= topological sort utility +PKGSC_TSORT:= misc include $(TOPDIR)/mk/package.mk #$(eval $(call PKG_template,COREUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TSORT},${PKG_SECTION_TSORT})) +$(eval $(call PKG_template,TSORT,tsort,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_TSORT},${PKGSC_TSORT})) post-install: $(INSTALL_DIR) $(IDIR_TSORT)/usr/bin diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile index 1962dd729..19ceff96a 100644 --- a/package/cpufrequtils/Makefile +++ b/package/cpufrequtils/Makefile @@ -11,7 +11,8 @@ PKG_DESCR:= utilities for the Linux kernel cpufreq subsystem PKG_SECTION:= utils PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html PKG_SITES:= http://www.kernel.org/pub/linux/utils/kernel/cpufreq/ -PKG_TARGET_DEPENDS:= !foxboard !foxg20 !ag241 + +PKG_TARGET_DEPENDS:= !ag241 !foxboard !foxg20 include $(TOPDIR)/mk/package.mk diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index b82e67e51..e3204b615 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -6,15 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cryptinit PKG_VERSION:= 1.0.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= cryptsetup lvm PKG_DESCR:= init for encrypted rootfilesystem PKG_SECTION:= base +PKG_BUILDDEP:= cryptsetup lvm + +PKG_CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 -CFLINE_CRYPTINIT:= depends on ADK_TARGET_ROOTFS_ENCRYPTED - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CRYPTINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 3daa946da..893f431b9 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 318a64470861ea5b92a52f2014f1e7c1 PKG_DESCR:= LUKS cryptsetup tools PKG_SECTION:= crypto -PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt \ - kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \ - kmod-crypto-sha256 kmod-blk-dev-dm -PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm +PKG_DEPENDS:= libgcrypt device-mapper libuuid libpopt +PKG_DEPENDS+= kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc +PKG_DEPENDS+= kmod-crypto-sha256 kmod-blk-dev-dm +PKG_BUILDDEP:= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com/ PKG_SITES:= http://cryptsetup.googlecode.com/files/ diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile index c21c89d66..ea39d0d64 100755 --- a/package/ctorrent/Makefile +++ b/package/ctorrent/Makefile @@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ctorrent PKG_VERSION:= dnh3.3.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= openssl PKG_MD5SUM:= 59b23dd05ff70791cd6449effa7fc3b6 PKG_DESCR:= console-based BitTorrent client PKG_SECTION:= p2p +PKG_BUILDDEP:= openssl PKG_URL:= http://www.rahul.net/dholmes/ctorrent PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=dtorrent/} diff --git a/package/cups/Makefile b/package/cups/Makefile index 24fcfa408..635638767 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -6,13 +6,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.4.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= zlib PKG_MD5SUM:= d95e2d588e3d36e563027a963b117b1b PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libpthread -PKG_BUILDDEP+= zlib -PKG_URL:= http://www.cups.org +PKG_BUILDDEP:= zlib +PKG_URL:= http://www.cups.org/ PKG_SITES:= ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-source.tar.bz2 diff --git a/package/curl/Makefile b/package/curl/Makefile index 41c271e22..781adb27e 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -10,15 +10,16 @@ PKG_MD5SUM:= 6dfb911a254a1b5ca8b534b98f2196aa PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= www PKG_DEPENDS:= libcurl -PKG_BUILDDEP+= openssl zlib +PKG_BUILDDEP:= openssl zlib PKG_URL:= http://curl.haxx.se/ PKG_SITES:= http://curl.haxx.se/download/ -PKG_DESCR_LIB:= a client-side URL transfer library -PKG_SECTION_LIB:= libs -PKG_DEPENDS_LIB:= libopenssl zlib -PKG_DESCR_LIB_DEV:= development files for libcurl -PKG_SECTION_LIB_DEV:= devel +PKG_SUBPKGS:= CURL LIBCURL LIBCURL_DEV +PKGSD_LIBCURL:= a client-side URL transfer library +PKGSC_LIBCURL:= libs +PKGSS_LIBCURL:= libopenssl zlib +PKGSD_LIBCURL_DEV:= development files for libcurl +PKGSC_LIBCURL_DEV:= devel PKG_FLAVOURS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support @@ -26,8 +27,8 @@ PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB})) -$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))