Changeset 1075

Show
Ignore:
Timestamp:
11/06/06 00:10:09 (2 years ago)
Author:
wbx
Message:

fix owfs build, sync alsa fix in trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/freewrt_1_0/package/Makefile

    r1074 r1075  
    191191package-$(FWRT_PACKAGE_OPENVPN_WEBIF) += openvpn 
    192192package-$(FWRT_COMPILE_OSIRIS) += osiris 
    193 package-$(FWRT_COMPILE_OWFS) += owfs 
     193package-$(FWRT_PACKAGE_OWFS) += owfs 
    194194package-$(FWRT_PACKAGE_P910ND) += p910nd 
    195195package-$(FWRT_PACKAGE_PALANTIR) += palantir 

  • branches/freewrt_1_0/package/owfs/Config.in

    r495 r1075  
    22        prompt "owfs.............................. 1-wire filesystem to map sensors to a directory" 
    33        tristate 
    4         default m if CONFIG_DEVEL 
     4        default n 
    55        select FWRT_PACKAGE_FUSE_UTILS 
    66        help 

  • branches/freewrt_1_0/package/owfs/Makefile

    r600 r1075  
    1313 
    1414PKG_SOURCE_URL:=        @SF/owfs/ 
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1615 
    1716include $(TOPDIR)/mk/package.mk 

  • trunk/freewrt/package/Makefile

    r1072 r1075  
    191191package-$(FWRT_PACKAGE_OPENVPN_WEBIF) += openvpn 
    192192package-$(FWRT_COMPILE_OSIRIS) += osiris 
    193 package-$(FWRT_COMPILE_OWFS) += owfs 
     193package-$(FWRT_PACKAGE_OWFS) += owfs 
    194194package-$(FWRT_PACKAGE_P910ND) += p910nd 
    195195package-$(FWRT_PACKAGE_PALANTIR) += palantir 
    …… 
    298298package-$(FWRT_PACKAGE_ZLIB) += zlib 
    299299# kernel addon packages 
     300package-$(FWRT_PACKAGE_KMOD_ALSA) += alsa 
    300301package-$(FWRT_PACKAGE_KMOD_BROADCOM_DIAG) += broadcom-diag 
    301302package-$(FWRT_PACKAGE_KMOD_BROADCOM_MMC) += broadcom-mmc 

  • trunk/freewrt/package/alsa/Makefile

    r600 r1075  
    2121include $(TOPDIR)/mk/package.mk 
    2222 
    23 ifeq ($(ARCH),i386) 
     23ifeq ($(CPU_ARCH),i386) 
    2424KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default 
    2525KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time 
    2626endif 
    27 ifeq ($(ARCH),mips) 
     27ifeq ($(CPU_ARCH),mipsel) 
    2828KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic 
    2929KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap 
    …… 
    5050$(WRKBUILD)/.built: 
    5151        $(MAKE) -C $(WRKBUILD) \ 
    52                 ARCH="$(ARCH)" \ 
     52                ARCH="$(KERNEL_ARCH)" \ 
    5353                CROSS_COMPILE="$(TARGET_CROSS)" \ 
    5454                c_opts="$(KERNEL_C_OPTS)" \ 

  • trunk/freewrt/package/owfs/Makefile

    r600 r1075  
    1313 
    1414PKG_SOURCE_URL:=        @SF/owfs/ 
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1615 
    1716include $(TOPDIR)/mk/package.mk