Changeset 5a470d5 in freewrt

Timestamp:

Nov 6, 2006, 12:10:09 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Children:

c144fe3

Parents:

e38f923

Message:

fix owfs build, sync alsa fix in trunk

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1075 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package

Files:

• Makefile (modified) (2 diffs)
• alsa/Makefile (modified) (2 diffs)
• owfs/Makefile (modified) (1 diff)

package/Makefile

@@ -191 +191 @@
 package-$(FWRT_PACKAGE_OPENVPN_WEBIF) += openvpn
 package-$(FWRT_COMPILE_OSIRIS) += osiris
-package-$(FWRT_COMPILE_OWFS) += owfs
+package-$(FWRT_PACKAGE_OWFS) += owfs
 package-$(FWRT_PACKAGE_P910ND) += p910nd
 package-$(FWRT_PACKAGE_PALANTIR) += palantir
@@ -298 +298 @@
 package-$(FWRT_PACKAGE_ZLIB) += zlib
 # kernel addon packages
+package-$(FWRT_PACKAGE_KMOD_ALSA) += alsa
 package-$(FWRT_PACKAGE_KMOD_BROADCOM_DIAG) += broadcom-diag
 package-$(FWRT_PACKAGE_KMOD_BROADCOM_MMC) += broadcom-mmc

package/alsa/Makefile

@@ -21 +21 @@
 include $(TOPDIR)/mk/package.mk
 
-ifeq ($(ARCH),i386)
+ifeq ($(CPU_ARCH),i386)
 KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default
 KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time
 endif
-ifeq ($(ARCH),mips)
+ifeq ($(CPU_ARCH),mipsel)
 KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic
 KERNEL_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
@@ -50 +50 @@
 $(WRKBUILD)/.built:
         $(MAKE) -C $(WRKBUILD) \
-                ARCH="$(ARCH)" \
+                ARCH="$(KERNEL_ARCH)" \
                 CROSS_COMPILE="$(TARGET_CROSS)" \
                 c_opts="$(KERNEL_C_OPTS)" \

package/owfs/Makefile

@@ -13 +13 @@
 
 PKG_SOURCE_URL:=        @SF/owfs/
-PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(TOPDIR)/mk/package.mk