Commit 1860bdae authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2010.11/remove-oldstyle-hooks' of git://git.busybox.net/~tpetazzoni/git/buildroot 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parents c106fdbd ae2be8db

CHANGES

+14 −2
Original line number Diff line number Diff line
@@ -7,8 +7,20 @@ 


	Toolchain: ARM cortex A9 support



	Updated/fixed packages: berkeleydb, busybox, dropbear,

	iptables, kismet, openvpn, qt, strace, usbutils

	Old-style package hooks (*_HOOK_POST_*) removed. Use the more

	generic new-style ones instead.



	Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,

	bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,

	e2fsprogs, expat, freetype, gawk, gvfs, haserl, hostapd,

	ifplugd, iptables, jpeg, kexec, kismet, less, libcurl,

	libdnet, libevent, libglade, libgtk2, libiconv, libidn, libnl,

	liboil, libpcap, libpng, libungif, libxml2, libxslt, lighttpd,

	lite, mdadm, metacity, mysql_client, nano, nbd, ncftp, neon,

	netperf, ntfsprogs, openntpd, openssh, openvpn, oprofile,

	pango, pcre, php, prboom, radvd, qt, samba, sdl_sound,

	shared-mime-info, speex, sqlite, strace, taglib, tcpdump,

	tiff, tn5250, udpcast, usbutils, which, xlib_libX11



	Removed packages: dillo, libglib12, libgtk12, microwin,

	pcmcia

package/Makefile.package.in

+6 −27
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ $(2)_TARGET_UNINSTALL = $$($(2)_DIR)/.stamp_uninstalled 
$(2)_TARGET_CLEAN =		$$($(2)_DIR)/.stamp_cleaned

$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned



# new-style hooks

# post-steps hooks

$(2)_POST_EXTRACT_HOOKS         ?=

$(2)_POST_PATCH_HOOKS           ?=

$(2)_POST_CONFIGURE_HOOKS       ?=
@@ -306,20 +306,13 @@ $(2)_POST_INSTALL_HOOKS ?= 
$(2)_POST_INSTALL_STAGING_HOOKS ?=

$(2)_POST_INSTALL_TARGET_HOOKS  ?=



# old-style hooks

$(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract

$(2)_HOOK_POST_CONFIGURE =	$$($(2)_DIR)/.stamp_hook_post_configure

$(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build

$(2)_HOOK_POST_INSTALL =	$$($(2)_DIR)/.stamp_hook_post_install



# human-friendly targets and target sequencing

$(1):			$(1)-install



ifeq ($$($(2)_TYPE),host)

$(1)-install:	        $(1)-install-host $$($(2)_HOOK_POST_INSTALL)

$(1)-install:	        $(1)-install-host

else

$(1)-install:		$(1)-install-staging $(1)-install-target \

			$$($(2)_HOOK_POST_INSTALL)

$(1)-install:		$(1)-install-staging $(1)-install-target

endif



ifeq ($$($(2)_INSTALL_TARGET),YES)
@@ -339,18 +332,15 @@ endif 
$(1)-install-host:      $(1)-build $$($(2)_TARGET_INSTALL_HOST)



$(1)-build:		$(1)-configure \

			$$($(2)_TARGET_BUILD) \

			$$($(2)_HOOK_POST_BUILD)

			$$($(2)_TARGET_BUILD)



$(1)-configure:		$(1)-patch \

			$$($(2)_TARGET_CONFIGURE) \

			$$($(2)_HOOK_POST_CONFIGURE)

			$$($(2)_TARGET_CONFIGURE)



$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)



$(1)-extract:		$(1)-depends \

			$$($(2)_TARGET_EXTRACT) \

			$$($(2)_HOOK_POST_EXTRACT)

			$$($(2)_TARGET_EXTRACT)



$(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
@@ -380,17 +370,6 @@ $$($(2)_TARGET_SOURCE): PKG=$(2) 
$$($(2)_TARGET_UNINSTALL):		PKG=$(2)

$$($(2)_TARGET_CLEAN):			PKG=$(2)

$$($(2)_TARGET_DIRCLEAN):		PKG=$(2)

$$($(2)_HOOK_POST_EXTRACT):		PKG=$(2)

$$($(2)_HOOK_POST_CONFIGURE):		PKG=$(2)

$$($(2)_HOOK_POST_BUILD):		PKG=$(2)

$$($(2)_HOOK_POST_INSTALL):		PKG=$(2)



# define hook targets

# default hook behaviour: do nothing

$$($(2)_HOOK_POST_EXTRACT):

$$($(2)_HOOK_POST_CONFIGURE):

$$($(2)_HOOK_POST_BUILD):

$$($(2)_HOOK_POST_INSTALL):



# add package to the general list of targets if requested by the buildroot

# configuration

package/at/at.mk

+8 −7
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ AT_CONF_OPT = \ 
        --with-daemon_groupname=root \

	SENDMAIL=/usr/sbin/sendmail



$(eval $(call AUTOTARGETS,package,at))



$(AT_HOOK_POST_INSTALL): $(AT_TARGET_INSTALL_TARGET)

define AT_INSTALL_INITSCRIPT

	$(INSTALL) -m 0755 package/at/S99at $(TARGET_DIR)/etc/init.d/S99at

	touch $@

endef



AT_POST_INSTALL_TARGET_HOOKS += AT_INSTALL_INITSCRIPT



$(AT_TARGET_UNINSTALL):

	$(call MESSAGE,"Uninstalling")

define AT_UNINSTALL_TARGET_CMDS

	rm -rf $(addprefix $(TARGET_DIR),/usr/lib/atspool \

					 /usr/lib/atjobs \

					 /etc/at.deny \
@@ -40,4 +39,6 @@ $(AT_TARGET_UNINSTALL): 
					 /usr/sbin/atrun)

	rm -f $(addprefix $(TARGET_DIR)/usr/man/man*/, \

		at.1 atq.1 atrm.1 batch.1 at_allow.5 at_deny.5 atd.8 atrun.8)

	rm -f $(AT_TARGET_INSTALL_TARGET) $(AT_HOOK_POST_INSTALL)
 
endef



$(eval $(call AUTOTARGETS,package,at))

package/avahi/avahi.mk

+18 −6
Original line number Diff line number Diff line
@@ -137,19 +137,31 @@ AVAHI_DEPENDENCIES += libintl 
AVAHI_MAKE_OPT = LIBS=-lintl

endif



$(eval $(call AUTOTARGETS,package,avahi))



$(AVAHI_HOOK_POST_INSTALL):

define AVAHI_REMOVE_INITSCRIPT

	rm -rf $(TARGET_DIR)/etc/init.d/avahi-*

ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)

endef



AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT



define AVAHI_INSTALL_AUTOIPD

	rm -rf $(TARGET_DIR)/etc/dhcp3/

	$(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script

	$(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/

	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib

	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd

endef



ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)

AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_AUTOIPD

endif

ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)



define AVAHI_INSTALL_DAEMON_INITSCRIPT

	$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/

endef



ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)

AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INITSCRIPT

endif

	touch $@
 


$(eval $(call AUTOTARGETS,package,avahi))

package/bind/bind.mk

+14 −9
Original line number Diff line number Diff line
@@ -27,21 +27,26 @@ BIND_CONF_OPT = \ 
		--disable-epoll \

		--disable-threads



$(eval $(call AUTOTARGETS,package,bind))



$(BIND_HOOK_POST_INSTALL):

define BIND_TARGET_INSTALL_FIXES

	rm -f $(TARGET_DIR)/usr/bin/isc-config.sh

ifneq ($(BR2_PACKAGE_BIND_TOOLS),y)

	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named

endef



BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_INSTALL_FIXES



define BIND_TARGET_REMOVE_TOOLS

	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))

endef



ifneq ($(BR2_PACKAGE_BIND_TOOLS),y)

BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_TOOLS

endif

	$(INSTALL) -m 0755 -D package/bind/bind.sysvinit $(TARGET_DIR)/etc/init.d/S81named

	touch $@



$(BIND_TARGET_UNINSTALL):

	$(call MESSAGE,"Uninstalling")

define BIND_UNINSTALL_TARGET_CMDS

	rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SBINS))

	rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_BINS))

	rm -rf $(addprefix $(TARGET_DIR)/usr/lib/, $(BIND_TARGET_LIBS))

	rm -f $(TARGET_DIR)/etc/init.d/S81named

	rm -f $(BIND_TARGET_INSTALL_TARGET) $(BIND_HOOK_POST_INSTALL)

endef



$(eval $(call AUTOTARGETS,package,bind))