Changeset 3262

Show
Ignore:
Timestamp:
07/18/07 13:27:46 (1 year ago)
Author:
tg
Message:

make dependency handling easier and fix some grave bugs in freeradius deps

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/kernel.mk

    r2678 r3262  
    7474define KMOD_template 
    7575 
    76 IDEPEND_$(1):=kernel ($(BOARD)-$(KERNEL)-$(LINUX_VERSION)) $(foreach pkg,$(5),", $(pkg)") 
     76IDEPENDK_$(1):=kernel ($(BOARD)-$(KERNEL)-$(LINUX_VERSION)) $(foreach pkg,$(5),", $(pkg)") 
    7777 
    7878PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk 
    …… 
    9696            $(BUILD_DIR)/kmod-control/kmod-$(2).control \ 
    9797            $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) 
    98         echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control 
     98        echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control 
    9999ifneq ($(strip $(3)),) 
    100100        mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) 

  • trunk/freewrt/mk/package.mk

    r3113 r3262  
    104104$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} 
    105105        ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) $(4) 
    106         [ -z "$$(IDEPEND_$(1))" ] || echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control 
     106        if [[ -n "$${IDEPEND_$(1)}" ]]; then \ 
     107                comma=; \ 
     108                deps=; \ 
     109                last=; \ 
     110                for dep in $${IDEPEND_$(1)}; do \ 
     111                        if [[ $$$$last = kernel && $$$$dep = \(* ]]; then \ 
     112                                deps="$$$$deps $$$$dep"; \ 
     113                        else \ 
     114                                deps="$$$$deps$$$$comma$$$$dep"; \ 
     115                        fi; \ 
     116                        comma=", "; \ 
     117                done; \ 
     118                echo "Depends: $$$$deps" >>$${IDIR_$(1)}/CONTROL/control; \ 
     119        fi 
    107120        for file in conffiles preinst postinst prerm postrm; do \ 
    108121                [ ! -f ./ipkg/$(2).$$$$file ] || cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ 

  • trunk/freewrt/package/freeradius/Makefile

    r3239 r3262  
    6767$(eval $(call PKG_template,FREERADIUS_MOD_CHAP,freeradius-mod-chap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    6868$(eval $(call PKG_template,FREERADIUS_MOD_DETAIL,freeradius-mod-detail,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    69 $(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${ARCH},eap.conf)) 
     69$(eval $(call PKG_template,FREERADIUS_MOD_EAP,freeradius-mod-eap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    7070$(eval $(call PKG_template,FREERADIUS_MOD_EAP_GTC,freeradius-mod-eap-gtc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    7171$(eval $(call PKG_template,FREERADIUS_MOD_EAP_MD5,freeradius-mod-eap-md5,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    …… 
    7474$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TLS,freeradius-mod-eap-tls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    7575$(eval $(call PKG_template,FREERADIUS_MOD_EAP_TTLS,freeradius-mod-eap-ttls,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    76 $(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${ARCH},acct_users preproxy_users users)) 
     76$(eval $(call PKG_template,FREERADIUS_MOD_FILES,freeradius-mod-files,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    7777#$(eval $(call PKG_template,FREERADIUS_MOD_LDAP,freeradius-mod-ldap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    7878$(eval $(call PKG_template,FREERADIUS_MOD_MSCHAP,freeradius-mod-mschap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 

  • trunk/freewrt/package/weechat/Makefile

    r2678 r3262  
    1616include ${TOPDIR}/mk/package.mk 
    1717 
    18 PKG_DEPEND:=            libncurses, libiconv 
     18PKG_DEPEND:=            libncurses libiconv 
    1919 
    2020ifeq (${FWRT_COMPILE_WEECHAT_WITH_TLS},y) 
    2121ENABLE_TLS:=            --with-libgnutls-prefix=${STAGING_DIR}/usr 
    22 PKG_DEPEND+=            , gnutls 
     22PKG_DEPEND+=            gnutls 
    2323else 
    2424ENABLE_TLS:=            --disable-gnutls 
    …… 
    2828DISABLE_LUA:=           --disable-lua 
    2929else 
    30 PKG_DEPEND+=            , liblua 
     30PKG_DEPEND+=            liblua 
    3131endif 
    3232