Changeset 3864


Ignore:
Timestamp:
2006-05-31T18:01:46+02:00 (12 years ago)
Author:
nbd
Message:

move target/linux/package/switch to package/, fix a bug in the ipkg dependency handling

Location:
branches/buildroot-ng/openwrt/package
Files:
2 deleted
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/package/rules.mk

    r3858 r3864  
    135135        ( \ 
    136136                DEPENDS=; \ 
    137                 for depend in $$(IDEPEND_$(1)); do \ 
    138                         [ "$$$${depend%%%%%%%%[A-Za-z]*}" = "@" ] && continue; \ 
     137                for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ 
    139138                        DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ 
    140139                done; \ 
  • branches/buildroot-ng/openwrt/package/switch/Makefile

    r3112 r3864  
    22 
    33include $(TOPDIR)/rules.mk 
    4 include ../../rules.mk 
     4include $(TOPDIR)/package/kernel.mk 
    55 
    66PKG_NAME := kmod-switch 
    77PKG_RELEASE := 1 
    8 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) 
     8PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME) 
    99 
    1010include $(TOPDIR)/package/rules.mk 
    1111 
    12 $(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) 
    1312 
    14 $(PKG_BUILD_DIR)/.prepared: 
     13define Build/Prepare 
    1514        mkdir -p $(PKG_BUILD_DIR) 
    1615        $(CP) ./src/* $(PKG_BUILD_DIR)/ 
    17         touch $@ 
     16endef 
    1817 
    19 $(PKG_BUILD_DIR)/.configured: 
    20         touch $@ 
    21  
    22 $(PKG_BUILD_DIR)/.built: 
     18define Build/Compile 
    2319        $(MAKE) -C "$(LINUX_DIR)" \ 
    2420                CROSS_COMPILE="$(TARGET_CROSS)" \ 
     
    2824                EXTRA_CFLAGS="-DBCMGPIO2" \ 
    2925                modules 
    30         touch $@ 
     26endef 
    3127         
    32 $(IPKG_KMOD_SWITCH): 
    33         install -m0755 -d $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) 
     28define Package/kmod-switch 
     29 SECTION:=drivers 
     30 CATEGORY:=Drivers 
     31 DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM 
     32 DEFAULT:=y 
     33 TITLE:=Switch drivers 
     34 DESCRIPTION:=Switch drivers for ADM6996L and BCM53XX RoboSwitch 
     35 VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) 
     36endef 
     37 
     38define Package/kmod-switch/install 
     39        install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION) 
    3440        $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ 
    35                 $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) 
    36         $(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR) 
     41                $(1)/lib/modules/$(LINUX_VERSION) 
     42endef 
    3743 
     44$(eval $(call BuildPackage,kmod-switch)) 
Note: See TracChangeset for help on using the changeset viewer.