From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- .gitignore | 3 +- BSDmakefile | 2 +- BUGS | 2 +- GNUmakefile | 2 +- mk/build.mk | 48 +- mk/buildhlp.mk | 2 +- mk/package.mk | 12 +- mk/pkg-bottom.mk | 60 +- mk/split-cfg.mk | 3 +- mk/vars.mk | 11 +- package/.template/Makefile | 20 +- package/6tunnel/Makefile | 15 +- package/6tunnel/patches/patch-Makefile_in | 27 + package/6tunnel/patches/patch-Makefile_in.orig | 18 + package/Config.in | 10 +- package/adkinstall/Makefile | 1 + package/aiccu/Makefile | 4 +- package/aiccu/extra/common/dn_skipname.c | 51 - package/aiccu/src/common/dn_skipname.c | 51 + package/aircrack-ng/Makefile | 31 +- package/alsa-lib/Makefile | 10 +- package/alsa-utils/Makefile | 3 - package/apr-util/Makefile | 5 +- package/apr/Makefile | 21 +- package/arpd/Makefile | 4 +- package/arpwatch/Makefile | 8 +- package/asterisk/Makefile | 8 +- package/asterisk/patches/patch-Makefile | 13 + package/atftp/Makefile | 10 +- package/atk/Makefile | 4 - package/aufs2-util/Makefile | 3 +- package/autoconf/Makefile | 4 - package/automake/Makefile | 10 +- package/autossh/Makefile | 6 +- package/autossh/patches/patch-Makefile_in | 36 + package/avahi/Makefile | 3 - package/axtls/Makefile | 12 +- package/base-files/Makefile | 4 +- package/base-files/extra/etc/banner | 1 - package/base-files/extra/etc/functions.sh | 79 - package/base-files/extra/etc/group | 2 - package/base-files/extra/etc/hosts | 2 - package/base-files/extra/etc/init.d/boot | 27 - package/base-files/extra/etc/init.d/done | 4 - package/base-files/extra/etc/init.d/rcK | 21 - package/base-files/extra/etc/init.d/rcS | 10 - package/base-files/extra/etc/inittab | 4 - package/base-files/extra/etc/ipkg.conf | 3 - package/base-files/extra/etc/mdev.conf | 11 - package/base-files/extra/etc/modules | 1 - .../extra/etc/network/if-post-down.d/01-bridge | 26 - .../extra/etc/network/if-post-down.d/02-vlan | 10 - .../extra/etc/network/if-pre-up.d/01-atm | 41 - .../extra/etc/network/if-pre-up.d/02-vlan | 36 - .../extra/etc/network/if-pre-up.d/03-bridge | 29 - .../base-files/extra/etc/network/if-up.d/01-bridge | 4 - package/base-files/extra/etc/network/interfaces | 2 - package/base-files/extra/etc/passwd | 2 - package/base-files/extra/etc/profile | 12 - package/base-files/extra/etc/protocols | 45 - package/base-files/extra/etc/rc.conf | 3 - package/base-files/extra/etc/shadow | 3 - package/base-files/extra/etc/sysctl.conf | 17 - package/base-files/extra/init | 22 - package/base-files/extra/lib/mdev/init | 21 - package/base-files/extra/sbin/update | 75 - .../extra/usr/share/udhcpc/default.script | 38 - package/base-files/src/etc/banner | 1 + package/base-files/src/etc/functions.sh | 79 + package/base-files/src/etc/group | 2 + package/base-files/src/etc/hosts | 2 + package/base-files/src/etc/init.d/boot | 27 + package/base-files/src/etc/init.d/done | 4 + package/base-files/src/etc/init.d/rcK | 21 + package/base-files/src/etc/init.d/rcS | 10 + package/base-files/src/etc/inittab | 4 + package/base-files/src/etc/ipkg.conf | 3 + package/base-files/src/etc/mdev.conf | 11 + package/base-files/src/etc/modules | 1 + .../src/etc/network/if-post-down.d/01-bridge | 26 + .../src/etc/network/if-post-down.d/02-vlan | 10 + .../base-files/src/etc/network/if-pre-up.d/01-atm | 41 + .../base-files/src/etc/network/if-pre-up.d/02-vlan | 36 + .../src/etc/network/if-pre-up.d/03-bridge | 29 + .../base-files/src/etc/network/if-up.d/01-bridge | 4 + package/base-files/src/etc/network/interfaces | 2 + package/base-files/src/etc/passwd | 2 + package/base-files/src/etc/profile | 12 + package/base-files/src/etc/protocols | 45 + package/base-files/src/etc/rc.conf | 3 + package/base-files/src/etc/shadow | 3 + package/base-files/src/etc/sysctl.conf | 17 + package/base-files/src/init | 22 + package/base-files/src/lib/mdev/init | 21 + package/base-files/src/sbin/update | 75 + .../base-files/src/usr/share/udhcpc/default.script | 38 + package/bash/Makefile | 3 - package/bc/Makefile | 4 - package/bigreqsproto/Makefile | 5 - package/bind/Makefile | 5 - package/binutils/Makefile | 3 - package/bison/Makefile | 4 - package/bitlbee/Makefile | 36 +- package/bitlbee/patches/patch-Makefile | 22 - package/bitlbee/patches/patch-configure | 1 - package/bitlbee/patches/patch-lib_Makefile | 24 - package/bitlbee/patches/patch-protocols_Makefile | 24 - .../patches/patch-protocols_jabber_Makefile | 22 - .../bitlbee/patches/patch-protocols_msn_Makefile | 24 - .../bitlbee/patches/patch-protocols_oscar_Makefile | 22 - .../bitlbee/patches/patch-protocols_yahoo_Makefile | 22 - package/bluez-firmware/Makefile | 5 +- package/bluez/Makefile | 3 - package/bogofilter/Makefile | 7 +- package/bridge-utils/Makefile | 7 +- package/busybox/Makefile | 4 + package/busybox/config/findutils/Config.in | 1 + package/busybox/config/networking/Config.in | 1 + package/busybox/files/busybox.postinst | 2 +- package/bwm/Makefile | 4 + package/bzip2/Makefile | 4 +- package/ca-certificates/Makefile | 4 +- .../ca-certificates/extra/update-ca-certificates | 80 - package/ca-certificates/src/update-ca-certificates | 80 + package/cairo/Makefile | 3 - package/cbtt/Makefile | 15 +- package/cfgfs/Makefile | 7 +- package/cgilib/Makefile | 4 - package/cgilib/extra/m4/libtool.m4 | 7370 ------------ package/cgilib/extra/m4/ltoptions.m4 | 368 - package/cgilib/extra/m4/ltsugar.m4 | 123 - package/cgilib/extra/m4/ltversion.m4 | 23 - package/cgilib/extra/m4/lt~obsolete.m4 | 92 - package/cgilib/src/m4/libtool.m4 | 7370 ++++++++++++ package/cgilib/src/m4/ltoptions.m4 | 368 + package/cgilib/src/m4/ltsugar.m4 | 123 + package/cgilib/src/m4/ltversion.m4 | 23 + package/cgilib/src/m4/lt~obsolete.m4 | 92 + package/chillispot/Makefile | 6 +- package/collectd/Makefile | 22 +- package/collectd/files/collectd.conf | 847 ++ package/comgt/Makefile | 6 +- package/compositeproto/Makefile | 5 - package/cpio/Makefile | 4 - package/cpufrequtils/Makefile | 6 +- package/cpufrequtils/patches/patch-Makefile | 4 +- package/cryptinit/Makefile | 6 +- package/cryptsetup/Makefile | 29 +- package/cryptsetup/patches/patch-configure_in | 31 + package/cryptsetup/patches/patch-lib_setup_c | 17 - package/ctorrent/Makefile | 10 - package/cups/Makefile | 14 +- package/curl/Makefile | 22 +- package/cutter/Makefile | 7 +- package/cxxtools/Makefile | 18 +- package/cyrus-sasl/Makefile | 11 +- package/damageproto/Makefile | 5 - package/dansguardian/Makefile | 9 +- package/davfs2/Makefile | 3 - package/dbus/Makefile | 7 +- package/deco/Makefile | 5 +- package/dhcp-forwarder/Makefile | 6 +- package/dhcp/Makefile | 3 - package/dialog/Makefile | 3 - package/diffutils/Makefile | 3 - package/digitemp/Makefile | 4 +- package/dnsmasq/Makefile | 3 +- package/dosfstools/Makefile | 10 +- package/dovecot/Makefile | 17 +- package/dovecot/patches/patch-configure | 41 - .../patch-src_lib-sql_sql-drivers-register_c | 13 - .../patches/patch-src_plugins_quota_Makefile_in | 70 - package/dropbear/Makefile | 13 +- package/dsniff/Makefile | 6 +- package/e2fsprogs/Makefile | 4 +- package/ebtables/Makefile | 3 +- package/eglibc/Makefile | 4 + package/elinks/Makefile | 10 +- package/elinks/patches/patch-Makefile_lib | 17 - package/esound/Makefile | 8 +- package/ether-wake/Makefile | 9 +- package/ether-wake/extra/ether-wake.c | 386 - package/ether-wake/src/ether-wake.c | 386 + package/ethtool/Makefile | 4 - package/evieext/Makefile | 5 - package/evilwm/Makefile | 4 +- package/exmap/Makefile | 4 +- package/expat/Makefile | 5 +- package/ez-ipupdate/Makefile | 3 +- package/faad2/Makefile | 5 +- package/fakeidentd/Makefile | 7 +- package/fbset/Makefile | 1 + package/fetchmail/Makefile | 8 +- package/ffmpeg/Makefile | 52 +- package/file/Makefile | 4 - package/findutils/Makefile | 12 +- package/fixesproto/Makefile | 5 - package/flac/Makefile | 3 - package/flex/Makefile | 4 - package/font-adobe-100dpi/Makefile | 4 - package/font-adobe-75dpi/Makefile | 4 - package/font-bh-100dpi/Makefile | 4 - package/font-bh-75dpi/Makefile | 4 - package/font-bh-lucidatypewriter-100dpi/Makefile | 4 - package/font-bh-lucidatypewriter-75dpi/Makefile | 4 - package/font-bh-ttf/Makefile | 4 - package/font-bh-type1/Makefile | 4 - package/font-bitstream-100dpi/Makefile | 4 - package/font-bitstream-75dpi/Makefile | 4 - package/font-bitstream-type1/Makefile | 4 - package/font-misc-misc/Makefile | 4 - package/font-util/Makefile | 4 - package/font-xfree86-type1/Makefile | 4 - package/fontcacheproto/Makefile | 5 - package/fontconfig/Makefile | 3 - package/fontsproto/Makefile | 5 - package/fping/Makefile | 11 +- package/fprobe-ulog/Makefile | 3 - package/fprobe/Makefile | 5 +- package/freeradius-client/Makefile | 3 - package/freeradius-server/Makefile | 57 +- .../files/freeradius-server.conffiles | 2 + .../files/freeradius-server.postinst | 6 + .../freeradius-server/files/freeradius.conffiles | 2 - .../freeradius-server/files/freeradius.postinst | 6 - .../patches/patch-share_dictionary | 440 - .../patches/patch-src_main_event_c | 10 +- .../patches/patch-src_main_modules_c | 11 + .../patches/patch-src_modules_rlm_eap_Makefile_in | 4 +- package/freetype/Makefile | 6 +- package/frickin/Makefile | 3 +- package/frickin/patches/patch-Makefile | 9 + package/frickin/patches/patch-src_Makefile | 9 + package/frickin/patches/patch-src_main_c | 20 + package/fuse/Makefile | 3 - package/gatling/Makefile | 4 +- package/gawk/Makefile | 3 - package/gcc/Makefile | 3 - package/gdb/Makefile | 3 - package/gdbm/Makefile | 7 +- package/gdbserver/Makefile | 4 - package/gettext/Makefile | 4 +- package/git/Makefile | 5 +- package/gkrellmd/Makefile | 5 +- package/glib/Makefile | 12 +- package/glibc/Makefile | 4 + package/gmediaserver/Makefile | 8 +- package/gmp/Makefile | 6 +- package/gnupg/Makefile | 11 +- package/gnutls/Makefile | 3 - package/gperf/Makefile | 4 - package/gpm/Makefile | 3 - package/gpsd/Makefile | 3 - package/grub-bin/Makefile | 2 + package/grub/Makefile | 3 - package/gsm/Makefile | 6 +- package/gtk+/Makefile | 10 +- package/haserl/Makefile | 3 - package/hdparm/Makefile | 5 +- package/hdparm/patches/patch-Makefile | 19 + package/heimdal/Makefile | 6 +- package/heyu/Makefile | 8 +- package/hostapd/Makefile | 3 +- package/htpdate/Makefile | 11 +- package/htpdate/patches/patch-Makefile | 33 +- package/htpdate/patches/patch-htpdate_c | 20 +- package/httping/Makefile | 15 +- package/httping/patches/patch-Makefile | 14 - package/httping/patches/patch-io_c | 12 - package/httping/patches/patch-str_c | 16 - package/httping/patches/patch-str_h | 12 - package/httptunnel/Makefile | 4 - package/icecast/Makefile | 11 +- package/icecast/patches/patch-m4_xiph_curl_m4 | 1 - package/id3lib/Makefile | 9 +- package/iftop/Makefile | 6 +- package/igmpproxy/Makefile | 9 +- package/inputproto/Makefile | 5 - package/ipcad/Makefile | 6 +- package/iperf/Makefile | 8 +- package/iproute2/Makefile | 6 +- package/ipsec-tools/Makefile | 8 +- package/ipset/Makefile | 4 +- package/iptables-snmp/Makefile | 3 - package/iptables/Makefile | 9 +- package/iptraf/Makefile | 6 +- package/irssi/Makefile | 10 +- package/iw/Makefile | 4 +- package/jamvm/Makefile | 7 +- package/jpeg/Makefile | 4 - package/kbproto/Makefile | 5 - package/kismet/Makefile | 4 +- package/knock/Makefile | 5 +- package/krb5/Makefile | 3 - package/l2tpns/Makefile | 3 +- package/lame/Makefile | 8 +- package/less/Makefile | 9 +- package/libICE/Makefile | 4 - package/libSM/Makefile | 4 - package/libX11/Makefile | 5 +- package/libXau/Makefile | 4 - package/libXaw/Makefile | 3 - package/libXdmcp/Makefile | 4 - package/libXext/Makefile | 3 - package/libXfont/Makefile | 3 - package/libXmu/Makefile | 6 +- package/libXpm/Makefile | 3 - package/libXrender/Makefile | 3 - package/libXt/Makefile | 5 +- package/libXt/patches/patch-util_Makefile_in | 30 +- package/libXv/Makefile | 3 - package/libXxf86dga/Makefile | 5 +- package/libao/Makefile | 5 +- package/libart/Makefile | 6 +- package/libaudiofile/Makefile | 5 +- package/libc/Makefile | 4 + package/libcli/Makefile | 5 +- package/libdaemon/Makefile | 3 - package/libdb/Makefile | 66 +- package/libdnet/Makefile | 8 +- package/libelf/Makefile | 7 +- package/libevent/Makefile | 8 +- package/libffi/Makefile | 8 +- package/libfontenc/Makefile | 7 +- package/libgcrypt/Makefile | 3 - package/libgd/Makefile | 6 +- package/libgpg-error/Makefile | 4 - package/libgssglue/Makefile | 6 +- package/libiconv/Makefile | 4 +- package/libid3tag/Makefile | 5 +- package/liblzo/Makefile | 5 +- package/libmad/Makefile | 3 - package/libmms/Makefile | 4 - package/libnet/Makefile | 5 +- package/libnetfilter_queue/Makefile | 6 +- package/libnfnetlink/Makefile | 4 - package/libnfsidmap/Makefile | 4 - package/libnids/Makefile | 7 +- package/libnl/Makefile | 6 +- package/libogg/Makefile | 6 +- package/libol/Makefile | 7 +- package/libosip2/Makefile | 9 +- package/libowfat/Makefile | 4 +- package/libp11/Makefile | 8 +- package/libpcap/Makefile | 8 +- package/libpciaccess/Makefile | 9 +- package/libpng/Makefile | 8 +- package/libpri/Makefile | 6 +- package/libpthread/Makefile | 6 +- package/librpcsecgss/Makefile | 4 - package/libshout/Makefile | 7 +- package/libsigc++/Makefile | 20 +- package/libstdcxx/Makefile | 4 + package/libtasn1/Makefile | 4 - package/libthread_db/Makefile | 4 + package/libtiff/Makefile | 3 - package/libtirpc/Makefile | 5 - package/libtool/Makefile | 4 - package/libtorrent/Makefile | 19 +- package/libupnp/Makefile | 8 +- package/libusb-compat/Makefile | 6 +- package/libusb/Makefile | 5 +- package/libvirt/Makefile | 3 - package/libvorbis/Makefile | 5 +- package/libvorbisidec/Makefile | 11 +- package/libxkbfile/Makefile | 4 - package/libxml2/Makefile | 8 +- package/libxslt/Makefile | 7 +- package/lighttpd/Makefile | 3 - package/links/Makefile | 3 - package/linux-atm/Makefile | 4 - .../linux-atm/patches/patch-src_qgen_Makefile_in | 20 +- package/logrotate/Makefile | 22 +- package/logrotate/patches/patch-Makefile | 41 +- package/logrotate/patches/patch-config_c | 59 - package/logrotate/patches/patch-logrotate_8 | 28 - package/logrotate/patches/patch-logrotate_c | 429 - package/logrotate/patches/patch-logrotate_h | 19 - package/lrzsz/Makefile | 5 +- package/lua/Makefile | 4 + package/lvm/Makefile | 3 - package/lynx/Makefile | 7 +- package/m4/Makefile | 3 - package/macchanger/Makefile | 4 - package/madplay/Makefile | 3 - package/make/Makefile | 4 - package/maradns/Makefile | 17 +- package/maradns/patches/cross-compile-fix.patch | 6 +- package/maradns/patches/patch-Makefile | 94 + package/maradns/patches/patch-build_Makefile_linux | 32 + package/maradns/patches/patch-configure | 19 + package/maradns/patches/patch-dns_Makefile | 11 + package/maradns/patches/patch-qual_Makefile | 12 + .../maradns/patches/patch-rng_rng-32bit-tables_h | 655 ++ package/maradns/patches/patch-server_Makefile | 28 + package/maradns/patches/patch-tcp_Makefile | 24 + package/mc/Makefile | 37 +- package/mc/patches/patch-Makefile_in | 11 + package/mc/patches/patch-lib_mc_ext_in | 92 - package/mc/patches/patch-lib_mc_lib | 378 - package/mc/patches/patch-lib_mc_menu | 17 - package/mc/patches/patch-src_key_c | 13 - package/mc/patches/patch-src_main_c | 13 - package/mc/patches/patch-vfs_extfs_iso9660_in | 31 - package/mdadm/Makefile | 10 +- package/mdadm/patches/patch-Makefile | 17 +- package/mdadm/patches/patch-platform-intel_c | 8 +- package/mgetty/Makefile | 4 + package/miau/Makefile | 4 +- package/miax/Makefile | 4 +- package/microperl/Makefile | 4 +- package/mini_httpd/Makefile | 30 +- package/mini_sendmail/Makefile | 7 +- package/miredo/Makefile | 13 +- package/mksh/Makefile | 4 + package/moc/Makefile | 8 +- package/moc/patches/patch-configure | 20 + package/monit/Makefile | 14 +- package/motion/Makefile | 7 +- package/mpd/Makefile | 55 +- package/mpfr/Makefile | 6 +- package/mplayer/Makefile | 11 +- package/mrd6/Makefile | 10 +- package/mt-daapd/Makefile | 20 +- package/mtd/Makefile | 8 +- package/mtr/Makefile | 5 +- package/mutt/Makefile | 11 +- package/mysql/Makefile | 4 +- package/nand/Makefile | 2 +- package/nano/Makefile | 10 +- package/ncurses/Makefile | 11 +- package/ndisc/Makefile | 6 +- package/ndisc/extra/rdnssd/strverscmp.c | 131 - package/ndisc/src/rdnssd/strverscmp.c | 131 + package/neon/Makefile | 7 +- package/net-snmp/Makefile | 5 +- package/netperf/Makefile | 3 - package/netstat-nat/Makefile | 7 +- package/nfs-utils/Makefile | 6 - package/nmap/Makefile | 3 - package/nmap/extra/sctp.h | 109 - package/nmap/src/sctp.h | 109 + package/nspr/Makefile | 3 - .../patch-mozilla_nsprpub_config_Makefile_in | 11 + package/nss/Makefile | 12 +- package/ntfs-3g/Makefile | 3 - package/ntpclient/Makefile | 6 +- package/nut/Makefile | 3 - package/obexftp/Makefile | 8 +- package/olsrd/Makefile | 4 + package/opencdk/Makefile | 3 - package/openct/Makefile | 5 - package/openldap/Makefile | 58 +- package/openntpd/Makefile | 4 +- package/openntpd/extra/openbsd-compat/port-linux.c | 107 - package/openntpd/src/openbsd-compat/port-linux.c | 107 + package/openobex/Makefile | 6 +- package/opensc/Makefile | 10 +- package/opensips/Makefile | 9 +- package/opensips/files/opensips.cfg | 16 +- package/openssh/Makefile | 3 - package/openssl-pkcs11/Makefile | 5 +- package/openssl/Makefile | 14 +- package/openswan/Makefile | 7 +- package/openvpn/Makefile | 33 +- package/oprofile/Makefile | 5 +- package/osiris/Makefile | 5 +- package/owfs/Makefile | 9 +- package/p910nd/Makefile | 4 +- package/p910nd/files/p910nd.init | 2 +- package/palantir/Makefile | 6 +- package/pango/Makefile | 4 - package/parprouted/Makefile | 4 +- package/parted/Makefile | 4 - package/patch/Makefile | 6 +- package/pciutils/Makefile | 7 +- package/pcre/Makefile | 3 - package/pdnsd/Makefile | 4 - package/perl/Makefile | 3 +- package/php/Makefile | 7 +- package/picocom/Makefile | 4 +- package/pipacs/Makefile | 9 +- package/pixman/Makefile | 4 - package/pmacct/Makefile | 12 +- package/popt/Makefile | 9 +- package/portmap/Makefile | 15 +- package/portsentry/Makefile | 4 +- package/postgresql/Makefile | 6 +- package/ppp/Makefile | 8 +- package/pptp/Makefile | 4 +- package/pptpd/Makefile | 3 - package/privoxy/Makefile | 3 - package/privoxy/extra/config.h.in | 664 -- package/privoxy/extra/configure | 11272 ------------------- package/privoxy/src/config.h.in | 664 ++ package/privoxy/src/configure | 11272 +++++++++++++++++++ package/procmail/Makefile | 4 + package/procmail/extra/Makefile.new | 19 - package/procmail/src/Makefile.new | 19 + package/procps/Makefile | 5 +- package/proftpd/Makefile | 4 +- package/ptunnel/Makefile | 5 +- package/python/Makefile | 4 - package/quagga/Makefile | 3 - package/raddump/Makefile | 5 +- package/radvd/Makefile | 3 - package/randrproto/Makefile | 5 - package/rarpd/Makefile | 3 - package/rdate/Makefile | 7 +- package/rdate/patches/patch-GNUmakefile | 12 + package/readline/Makefile | 5 +- package/reaim/Makefile | 3 +- package/renderproto/Makefile | 5 - package/resourceproto/Makefile | 5 - package/rng-tools/Makefile | 4 - package/rp-pppoe/Makefile | 24 +- package/rpcbind/Makefile | 3 - package/rpcbind/patches/patch-config_h_in | 12 + package/rpcbind/patches/patch-src_rpcbind_c | 14 + package/rpcbind/patches/patch-src_security_c | 41 + package/rpm/Makefile | 3 - package/rrdcollect/Makefile | 14 +- package/rrdtool/Makefile | 5 +- package/rrs/Makefile | 14 +- package/rsync/Makefile | 6 +- package/rtorrent/Makefile | 13 +- package/ruby/Makefile | 10 +- package/rxvt-unicode/Makefile | 3 - package/samba/Makefile | 12 +- package/sane-backends/Makefile | 3 - package/sangam-atm/Makefile | 5 +- package/scanlogd/Makefile | 9 +- package/screen/Makefile | 6 +- package/scrnsaverproto/Makefile | 5 - package/scsi-spin/Makefile | 8 +- package/scsi-spin/files/scsi-spin.c | 420 - package/scsi-spin/src/scsi-spin.c | 420 + package/sdl-image/Makefile | 3 - package/sdl/Makefile | 3 - package/ser2net/Makefile | 3 - package/serdisplib/Makefile | 6 +- package/setpwc/Makefile | 7 +- package/setserial/Makefile | 3 +- package/shat/Makefile | 4 + package/shorewall-common/Makefile | 45 +- package/shorewall-shell/Makefile | 20 +- package/siproxd/Makefile | 9 +- package/sipsak/Makefile | 5 +- package/sispmctl/Makefile | 4 - package/snort/Makefile | 18 +- package/socat/Makefile | 5 +- package/speex/Makefile | 5 +- package/sqlite/Makefile | 5 +- package/sqlite/extra/sqlite3.h | 5772 ---------- package/sqlite/src/sqlite3.h | 5772 ++++++++++ package/squid/Makefile | 12 +- package/srelay/Makefile | 4 +- package/ssltunnel/Makefile | 16 +- package/ssmtp/Makefile | 4 +- package/strace/Makefile | 5 +- package/stress/Makefile | 3 - package/subversion/Makefile | 18 +- package/swconfig/Makefile | 13 +- package/syslog-ng/Makefile | 14 +- package/sysstat/Makefile | 3 +- package/tar/Makefile | 3 - package/tcl/Makefile | 3 - package/tcp_wrappers/Makefile | 10 +- package/tcpdump/Makefile | 6 +- package/tinc/Makefile | 9 +- package/tinyproxy/Makefile | 19 +- package/tmsnc/Makefile | 3 - package/tntnet/Makefile | 13 +- package/tor/Makefile | 9 +- package/tptest/Makefile | 4 + package/traceroute/Makefile | 4 +- package/trafshow/Makefile | 19 +- package/trafshow/patches/patch-Makefile_in | 24 + package/trafshow/patches/patch-session_c | 11 + package/tslib/Makefile | 4 +- package/ttcp/Makefile | 8 +- package/ttcp/src/ttcp.c | 2374 ++++ package/ttcp/ttcp.c | 2374 ---- package/uclibc++/Makefile | 4 +- package/uclibc/Makefile | 5 + package/udev/Makefile | 9 +- package/udp-broadcast-relay/Makefile | 10 +- package/ulogd/Makefile | 6 +- package/updatedd/Makefile | 3 - package/usbutils/Makefile | 6 +- package/ussp-push/Makefile | 5 +- package/ustl/Makefile | 4 +- package/util-linux-ng/Makefile | 3 - package/valgrind/Makefile | 3 - package/vgp/Makefile | 3 - package/videoproto/Makefile | 5 - package/vilistextum/Makefile | 7 +- package/vim/Makefile | 3 - package/vnc-reflector/Makefile | 6 +- package/vnstat/Makefile | 4 +- package/vpnc/Makefile | 12 +- package/vpnc/patches/patch-Makefile | 65 +- package/vpnc/patches/patch-config_c | 7 +- package/vrrpd/Makefile | 4 +- package/vsftpd/Makefile | 4 +- package/vtun/Makefile | 8 +- package/watchdog/Makefile | 4 - package/watchdog/patches/patch-src_mntent_c | 11 + package/watchdog/patches/patch-src_umount_c | 11 + package/wccpd/Makefile | 3 - package/wdfs/Makefile | 4 - package/weechat/Makefile | 20 +- package/wget/Makefile | 4 - package/wifidog/Makefile | 6 +- package/wireless-firmware/Makefile | 4 +- package/wol/Makefile | 3 - package/wondershaper/Makefile | 7 +- package/wpa_supplicant/Makefile | 19 +- package/wput/Makefile | 7 +- package/wput/patches/patch-Makefile | 21 + package/wput/patches/patch-Makefile_in | 12 + package/wput/patches/patch-Makefile_in.orig | 13 + package/wput/patches/patch-config_status | 160 + package/wput/patches/patch-po_Makefile | 50 + package/wput/patches/patch-po_Makefile_in | 50 + package/wput/patches/patch-src_Makefile | 19 + package/wput/patches/patch-src_config_h | 27 + package/xauth/Makefile | 4 - package/xcmiscproto/Makefile | 5 - package/xextproto/Makefile | 5 - package/xf86-input-evtouch/Makefile | 6 +- package/xf86-input-keyboard/Makefile | 5 - package/xf86-input-mouse/Makefile | 4 - package/xf86-video-cirrus/Makefile | 4 - package/xf86-video-geode/Makefile | 6 +- package/xf86dga/Makefile | 5 - package/xf86dgaproto/Makefile | 5 - package/xfsprogs/Makefile | 4 +- package/xinetd/Makefile | 3 - package/xkbcomp/Makefile | 4 - package/xkeyboard-config/Makefile | 7 +- package/xlsfonts/Makefile | 4 - package/xorg-server/Makefile | 18 +- package/xproto/Makefile | 4 - package/xtrans/Makefile | 5 +- package/xz/Makefile | 4 - package/zlib/Makefile | 4 +- package/zsh/Makefile | 10 +- scripts/create-image.sh | 8 +- scripts/tarpkg | 5 +- target/Config.in | 1 + target/qemu-x86/kernel.config | 122 +- target/qemu-x86/uclibc.config | 2 +- 653 files changed, 33870 insertions(+), 34210 deletions(-) create mode 100644 package/6tunnel/patches/patch-Makefile_in create mode 100644 package/6tunnel/patches/patch-Makefile_in.orig delete mode 100644 package/aiccu/extra/common/dn_skipname.c create mode 100644 package/aiccu/src/common/dn_skipname.c create mode 100644 package/asterisk/patches/patch-Makefile create mode 100644 package/autossh/patches/patch-Makefile_in delete mode 100644 package/base-files/extra/etc/banner delete mode 100644 package/base-files/extra/etc/functions.sh delete mode 100644 package/base-files/extra/etc/group delete mode 100644 package/base-files/extra/etc/hosts delete mode 100644 package/base-files/extra/etc/init.d/boot delete mode 100644 package/base-files/extra/etc/init.d/done delete mode 100755 package/base-files/extra/etc/init.d/rcK delete mode 100755 package/base-files/extra/etc/init.d/rcS delete mode 100644 package/base-files/extra/etc/inittab delete mode 100644 package/base-files/extra/etc/ipkg.conf delete mode 100644 package/base-files/extra/etc/mdev.conf delete mode 100644 package/base-files/extra/etc/modules delete mode 100755 package/base-files/extra/etc/network/if-post-down.d/01-bridge delete mode 100755 package/base-files/extra/etc/network/if-post-down.d/02-vlan delete mode 100755 package/base-files/extra/etc/network/if-pre-up.d/01-atm delete mode 100755 package/base-files/extra/etc/network/if-pre-up.d/02-vlan delete mode 100755 package/base-files/extra/etc/network/if-pre-up.d/03-bridge delete mode 100755 package/base-files/extra/etc/network/if-up.d/01-bridge delete mode 100644 package/base-files/extra/etc/network/interfaces delete mode 100644 package/base-files/extra/etc/passwd delete mode 100644 package/base-files/extra/etc/profile delete mode 100644 package/base-files/extra/etc/protocols delete mode 100644 package/base-files/extra/etc/rc.conf delete mode 100644 package/base-files/extra/etc/shadow delete mode 100644 package/base-files/extra/etc/sysctl.conf delete mode 100755 package/base-files/extra/init delete mode 100644 package/base-files/extra/lib/mdev/init delete mode 100755 package/base-files/extra/sbin/update delete mode 100755 package/base-files/extra/usr/share/udhcpc/default.script create mode 100644 package/base-files/src/etc/banner create mode 100644 package/base-files/src/etc/functions.sh create mode 100644 package/base-files/src/etc/group create mode 100644 package/base-files/src/etc/hosts create mode 100644 package/base-files/src/etc/init.d/boot create mode 100644 package/base-files/src/etc/init.d/done create mode 100755 package/base-files/src/etc/init.d/rcK create mode 100755 package/base-files/src/etc/init.d/rcS create mode 100644 package/base-files/src/etc/inittab create mode 100644 package/base-files/src/etc/ipkg.conf create mode 100644 package/base-files/src/etc/mdev.conf create mode 100644 package/base-files/src/etc/modules create mode 100755 package/base-files/src/etc/network/if-post-down.d/01-bridge create mode 100755 package/base-files/src/etc/network/if-post-down.d/02-vlan create mode 100755 package/base-files/src/etc/network/if-pre-up.d/01-atm create mode 100755 package/base-files/src/etc/network/if-pre-up.d/02-vlan create mode 100755 package/base-files/src/etc/network/if-pre-up.d/03-bridge create mode 100755 package/base-files/src/etc/network/if-up.d/01-bridge create mode 100644 package/base-files/src/etc/network/interfaces create mode 100644 package/base-files/src/etc/passwd create mode 100644 package/base-files/src/etc/profile create mode 100644 package/base-files/src/etc/protocols create mode 100644 package/base-files/src/etc/rc.conf create mode 100644 package/base-files/src/etc/shadow create mode 100644 package/base-files/src/etc/sysctl.conf create mode 100755 package/base-files/src/init create mode 100644 package/base-files/src/lib/mdev/init create mode 100755 package/base-files/src/sbin/update create mode 100755 package/base-files/src/usr/share/udhcpc/default.script delete mode 100644 package/bitlbee/patches/patch-Makefile delete mode 100644 package/bitlbee/patches/patch-lib_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_jabber_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_msn_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_oscar_Makefile delete mode 100644 package/bitlbee/patches/patch-protocols_yahoo_Makefile delete mode 100644 package/ca-certificates/extra/update-ca-certificates create mode 100644 package/ca-certificates/src/update-ca-certificates delete mode 100644 package/cgilib/extra/m4/libtool.m4 delete mode 100644 package/cgilib/extra/m4/ltoptions.m4 delete mode 100644 package/cgilib/extra/m4/ltsugar.m4 delete mode 100644 package/cgilib/extra/m4/ltversion.m4 delete mode 100644 package/cgilib/extra/m4/lt~obsolete.m4 create mode 100644 package/cgilib/src/m4/libtool.m4 create mode 100644 package/cgilib/src/m4/ltoptions.m4 create mode 100644 package/cgilib/src/m4/ltsugar.m4 create mode 100644 package/cgilib/src/m4/ltversion.m4 create mode 100644 package/cgilib/src/m4/lt~obsolete.m4 create mode 100644 package/collectd/files/collectd.conf create mode 100644 package/cryptsetup/patches/patch-configure_in delete mode 100644 package/cryptsetup/patches/patch-lib_setup_c delete mode 100644 package/dovecot/patches/patch-configure delete mode 100644 package/dovecot/patches/patch-src_lib-sql_sql-drivers-register_c delete mode 100644 package/dovecot/patches/patch-src_plugins_quota_Makefile_in delete mode 100644 package/elinks/patches/patch-Makefile_lib delete mode 100644 package/ether-wake/extra/ether-wake.c create mode 100644 package/ether-wake/src/ether-wake.c create mode 100644 package/freeradius-server/files/freeradius-server.conffiles create mode 100644 package/freeradius-server/files/freeradius-server.postinst delete mode 100644 package/freeradius-server/files/freeradius.conffiles delete mode 100644 package/freeradius-server/files/freeradius.postinst delete mode 100644 package/freeradius-server/patches/patch-share_dictionary create mode 100644 package/freeradius-server/patches/patch-src_main_modules_c create mode 100644 package/frickin/patches/patch-Makefile create mode 100644 package/frickin/patches/patch-src_Makefile create mode 100644 package/frickin/patches/patch-src_main_c create mode 100644 package/hdparm/patches/patch-Makefile delete mode 100644 package/httping/patches/patch-Makefile delete mode 100644 package/httping/patches/patch-io_c delete mode 100644 package/httping/patches/patch-str_c delete mode 100644 package/httping/patches/patch-str_h delete mode 100644 package/logrotate/patches/patch-config_c delete mode 100644 package/logrotate/patches/patch-logrotate_8 delete mode 100644 package/logrotate/patches/patch-logrotate_c delete mode 100644 package/logrotate/patches/patch-logrotate_h create mode 100644 package/maradns/patches/patch-Makefile create mode 100644 package/maradns/patches/patch-build_Makefile_linux create mode 100644 package/maradns/patches/patch-configure create mode 100644 package/maradns/patches/patch-dns_Makefile create mode 100644 package/maradns/patches/patch-qual_Makefile create mode 100644 package/maradns/patches/patch-rng_rng-32bit-tables_h create mode 100644 package/maradns/patches/patch-server_Makefile create mode 100644 package/maradns/patches/patch-tcp_Makefile create mode 100644 package/mc/patches/patch-Makefile_in delete mode 100644 package/mc/patches/patch-lib_mc_ext_in delete mode 100644 package/mc/patches/patch-lib_mc_lib delete mode 100644 package/mc/patches/patch-lib_mc_menu delete mode 100644 package/mc/patches/patch-src_key_c delete mode 100644 package/mc/patches/patch-src_main_c delete mode 100644 package/mc/patches/patch-vfs_extfs_iso9660_in create mode 100644 package/moc/patches/patch-configure delete mode 100644 package/ndisc/extra/rdnssd/strverscmp.c create mode 100644 package/ndisc/src/rdnssd/strverscmp.c delete mode 100644 package/nmap/extra/sctp.h create mode 100644 package/nmap/src/sctp.h create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in delete mode 100644 package/openntpd/extra/openbsd-compat/port-linux.c create mode 100644 package/openntpd/src/openbsd-compat/port-linux.c delete mode 100644 package/privoxy/extra/config.h.in delete mode 100644 package/privoxy/extra/configure create mode 100644 package/privoxy/src/config.h.in create mode 100644 package/privoxy/src/configure delete mode 100644 package/procmail/extra/Makefile.new create mode 100644 package/procmail/src/Makefile.new create mode 100644 package/rdate/patches/patch-GNUmakefile create mode 100644 package/rpcbind/patches/patch-config_h_in create mode 100644 package/rpcbind/patches/patch-src_rpcbind_c create mode 100644 package/rpcbind/patches/patch-src_security_c delete mode 100644 package/scsi-spin/files/scsi-spin.c create mode 100644 package/scsi-spin/src/scsi-spin.c delete mode 100644 package/sqlite/extra/sqlite3.h create mode 100644 package/sqlite/src/sqlite3.h create mode 100644 package/trafshow/patches/patch-Makefile_in create mode 100644 package/trafshow/patches/patch-session_c create mode 100644 package/ttcp/src/ttcp.c delete mode 100644 package/ttcp/ttcp.c create mode 100644 package/watchdog/patches/patch-src_mntent_c create mode 100644 package/watchdog/patches/patch-src_umount_c create mode 100644 package/wput/patches/patch-Makefile create mode 100644 package/wput/patches/patch-Makefile_in create mode 100644 package/wput/patches/patch-Makefile_in.orig create mode 100644 package/wput/patches/patch-config_status create mode 100644 package/wput/patches/patch-po_Makefile create mode 100644 package/wput/patches/patch-po_Makefile_in create mode 100644 package/wput/patches/patch-src_Makefile create mode 100644 package/wput/patches/patch-src_config_h diff --git a/.gitignore b/.gitignore index 957033da2..3ead4eac4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,13 @@ config/zconf.tab.c config/zconf.tab.h prereq.mk toolchain_build_*/ +.ADK_HAVE_DOT_CONFIG .tmpconfig.h .prereq_done .config* .busyboxcfg .defconfig all.config -.cfg/ .cfg_*/ cross_*/ root_*/ @@ -33,5 +33,4 @@ package/*/Config.in package/*/Config.in.lib tools_build/ extra/ -bulkdir/ .menu diff --git a/BSDmakefile b/BSDmakefile index 86b674100..760d123d6 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -12,7 +12,7 @@ GMAKE_ENV+= ADKVERSION=${ADKVERSION:Q} .if defined(package) && !empty(package) subdir:= package/${package} . if !make(clean) -_subdir_dep:= ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG +_subdir_dep:= ${TOPDIR}/.ADK_HAVE_DOT_CONFIG . endif .endif diff --git a/BUGS b/BUGS index 540386220..37d132b2b 100644 --- a/BUGS +++ b/BUGS @@ -1,4 +1,4 @@ +- ruby package need a equal ruby host interpreter - packages with subpackages get recompiled - openssh on amd64 does not work, ssh-keygen endless loop - uclibc on lemote mips64 target does not work (only uclibc-trunk with patches) -- qemu-mips64* targets does not boot, kernel problem? diff --git a/GNUmakefile b/GNUmakefile index 83d4f4386..63c2d4592 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -11,7 +11,7 @@ export ADKVERSION ifneq (${package},) subdir:= package/${package} -_subdir_dep:= ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG +_subdir_dep:= ${TOPDIR}/.ADK_HAVE_DOT_CONFIG endif ifneq (${subdir},) diff --git a/mk/build.mk b/mk/build.mk index a9d493924..19388ad89 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -21,8 +21,8 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_COMPILE_HEIMDAL=n \ ADK_PACKAGE_HEIMDAL_PKINIT=n \ ADK_PACKAGE_HEIMDAL_SERVER=n \ - ADK_PACKAGE_HEIMDAL_LIBS=n \ - ADK_PACKAGE_HEIMDAL_CLIENT_LIBS=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ + ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ BUSYBOX_SELINUX=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ @@ -58,37 +58,11 @@ noconfig_targets:= menuconfig \ defconfig \ tags -MAKECLEANDIR_SYMBOLS= ADK_DEBUG - -MAKECLEAN_SYMBOLS= ADK_TARGET_PACKAGE_IPKG \ - ADK_TARGET_PACKAGE_RPM \ - ADK_TARGET_PACKAGE_TGZ - POSTCONFIG= -@ \ if [ -f .config.old ];then \ - if [ -d .cfg ];then \ - what=cleantarget; \ - for symbol in ${MAKECLEANDIR_SYMBOLS}; do \ - newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ - oldval=$$(cat .cfg/"$$symbol" 2>&-); \ - [[ $$newval = $$oldval ]] && continue; \ - echo; \ - echo >&2 "WARNING: Toolchain related options have changed, 'make" \ - "$$what' might be required!"; \ - break; \ - done; \ - what=clean; \ - for symbol in ${MAKECLEAN_SYMBOLS}; do \ - newval=$$(grep -e "^$$symbol=" -e "^\# $$symbol " .config); \ - oldval=$$(cat .cfg/"$$symbol" 2>&-); \ - [[ $$newval = $$oldval ]] && continue; \ - echo; \ - echo >&2 "WARNING: Package backend related options have changed, 'make" \ - "$$what' might be required!"; \ - break; \ - done; \ - if [ -f .busyboxcfg ];then rm .busyboxcfg;fi; \ - fi; \ + if [ -f .busyboxcfg ];then \ + rm .busyboxcfg; \ + fi; \ fi # Pull in the user's configuration file @@ -108,7 +82,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean -world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG +world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ifeq ($(ADK_NATIVE),y) $(MAKE) -f mk/build.mk toolchain/kernel-headers-prepare target/config-prepare target/compile package/compile root_clean package/install package_index target/install @@ -148,10 +122,10 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf endif -package/%: ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk +package/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) -target/%: ${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG +target/%: ${TOPDIR}/.ADK_HAVE_DOT_CONFIG $(MAKE) -C target $(patsubst target/%,%,$@) toolchain/%: ${STAGING_DIR} @@ -164,10 +138,8 @@ switch: echo "Saving configuration for target: ${ADK_TARGET}" cp -p .config .config.${ADK_TARGET} if [ -f .config.old ];then cp -p .config.old .config.old.${ADK_TARGET};fi - mv .cfg .cfg.${ADK_TARGET} if [ -f .config.${TARGET} ];then cp -p .config.${TARGET} .config; \ cp -p .config.old.${TARGET} .config.old; \ - mv .cfg.${TARGET} .cfg; \ echo "Setting configuration to target: ${TARGET}"; \ else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi @@ -251,7 +223,7 @@ distclean: $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk \ - .busyboxcfg + .busyboxcfg .ADK_HAVE_DOT_CONFIG else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -427,7 +399,7 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ - .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 684801617..e45504697 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -58,7 +58,7 @@ post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) - [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ + [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) touch $@ diff --git a/mk/package.mk b/mk/package.mk index 50f5ecb61..dbf383c8b 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -54,7 +54,6 @@ CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ else CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \ ${HOST_CONFIGURE_OPTS} \ - CC='${TARGET_CC}' CXX='${TARGET_CXX}' \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ @@ -65,6 +64,7 @@ CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \ ac_cv_func_realloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes endif +CONFIGURE_PROG?= configure MAKE_FILE?= Makefile # this is environment for 'make all' and 'make install' MAKE_ENV?= @@ -91,15 +91,19 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \ PKG_CONFIG_LIBDIR=/dev/null \ - CC='${TARGET_CC}' CXX='${TARGET_CXX}' \ - AR='${TARGET_CROSS}ar' RANLIB='${TARGET_CROSS}ranlib' \ + CC='${TARGET_CC}' \ + CXX='${TARGET_CXX}' \ + AR='${TARGET_CROSS}ar' \ + RANLIB='${TARGET_CROSS}ranlib' \ NM='${TARGET_CROSS}nm' \ + STRIP='${TARGET_CROSS}strip' \ + CROSS="$(TARGET_CROSS)" \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ LDFLAGS='$(strip ${TLDFLAGS})' endif -MAKE_FLAGS+= ${XAKE_FLAGS} +MAKE_FLAGS+= ${XAKE_FLAGS} V=1 FAKE_FLAGS+= ${XAKE_FLAGS} ifeq ($(strip ${WRKDIR_BSD}),) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 0dc830b28..e136392d7 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -5,11 +5,11 @@ # that we can call it (BSD make has .if target(foo) but GNU not) # and it won't error out. # * ${_foo_COOKIE} are the actual targets -# * default is "manual" -> define a do-foo: target in the Makefile +# * default is "auto" +# * define "manual" if you need your own method +# -> define a do-foo: target in the Makefile # * if you have a style -> define a pre-foo: and post-foo: if they # are required, but the do-foo: magic is done here -# * we want to use styles (configure:gnu, build/install:auto), for -# making the Makefiles of the packages more clear pre-configure: do-configure: @@ -18,21 +18,42 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} mkdir -p ${WRKBUILD} @${MAKE} pre-configure $(MAKE_TRACE) -ifneq ($(filter autogen,${CONFIGURE_STYLE}),) +ifneq ($(filter autogen,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ ./autogen.sh $(MAKE_TRACE) endif -ifneq ($(filter autotool,${CONFIGURE_STYLE}),) +ifneq ($(filter autotool,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 \ AUTOMAKE_VERSION=1.9 \ autoreconf -vif $(MAKE_TRACE) endif -ifneq ($(filter autoconf,${CONFIGURE_STYLE}),) +ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),) cd ${WRKBUILD}; \ env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE) endif -ifneq ($(filter gnu,${CONFIGURE_STYLE}),) +ifneq ($(filter manual,${CONFIG_STYLE}),) + env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE) +else ifneq ($(filter minimal,${CONFIG_STYLE}),) + @$(CMD_TRACE) "configuring... " + @cd ${WRKBUILD}; \ + for i in $$(find . -name config.sub);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.sub $$i; \ + fi; \ + done; \ + for i in $$(find . -name config.guess);do \ + if [ -f $$i ]; then \ + ${CP} $$i $$i.bak; \ + ${CP} ${SCRIPT_DIR}/config.guess $$i; \ + fi; \ + done; + cd ${WRKBUILD}; rm -f config.{cache,status}; \ + env ${CONFIGURE_ENV} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ + ${CONFIGURE_ARGS} $(MAKE_TRACE) +else ifeq ($(strip ${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring... " @cd ${WRKBUILD}; \ for i in $$(find . -name config.sub);do \ @@ -49,7 +70,7 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),) done; cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${CONFIGURE_ENV} \ - ${BASH} ${WRKSRC}/configure \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ --build=${GNU_HOST_NAME} \ --host=${GNU_TARGET_NAME} \ --target=${GNU_TARGET_NAME} \ @@ -67,10 +88,8 @@ ifneq ($(filter gnu,${CONFIGURE_STYLE}),) --disable-dependency-tracking \ --disable-libtool-lock \ ${CONFIGURE_ARGS} $(MAKE_TRACE) -else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),) - env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE) else - @echo "Invalid CONFIGURE_STYLE '${CONFIGURE_STYLE}'" >&2 + @echo "Invalid CONFIG_STYLE '${CONFIG_STYLE}'" >&2 @exit 1 endif @${MAKE} post-configure $(MAKE_TRACE) @@ -89,13 +108,12 @@ post-build: ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling... " -ifneq ($(filter auto,${BUILD_STYLE}),) - cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE) -else ifneq ($(filter manual,${BUILD_STYLE}),) + +ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) - env ${MAKE_ENV} ${MAKE} do-build $(MAKE_TRACE) + cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + ${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE) else @echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2 @exit 1 @@ -109,15 +127,15 @@ post-install: ${_FAKE_COOKIE}: ${_BUILD_COOKIE} -rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PARENT}/pkg' ${WRKINST} '${STAGING_DIR}/scripts' + @mkdir -p ${WRKINST}/{sbin,bin,etc,lib} + @mkdir -p ${WRKINST}/usr/{sbin,bin,etc,lib} @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) -ifneq ($(filter auto,${INSTALL_STYLE}),) - cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE) -else ifneq ($(filter manual,${INSTALL_STYLE}),) +ifneq ($(filter manual,${INSTALL_STYLE}),) env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE) else ifeq ($(strip ${INSTALL_STYLE}),) - env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE) + cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE) else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 diff --git a/mk/split-cfg.mk b/mk/split-cfg.mk index a5c59b682..e9521c259 100644 --- a/mk/split-cfg.mk +++ b/mk/split-cfg.mk @@ -2,7 +2,8 @@ # material, please see the LICENCE file in the top-level directory. # must work with both BSD and GNU make -${TOPDIR}/.cfg_${ADK_TARGET}_${ADK_LIBC}/ADK_HAVE_DOT_CONFIG: \ +${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/mk/vars.mk b/mk/vars.mk index 53755266e..3f8f86884 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -46,6 +46,7 @@ TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)- endif TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ +TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld TARGET_CPPFLAG