[Buildroot] svn commit: trunk/buildroot/package/pcmcia

[Buildroot] svn commit: trunk/buildroot/package/pcmcia

[ulf at uclibc.org]

Author: ulf
Date: 2007-07-24 07:10:03 -0700 (Tue, 24 Jul 2007)
New Revision: 19248

Log:
Use known Buildroot symbols for linux in pcmcia

Modified:
   trunk/buildroot/package/pcmcia/pcmcia.mk


Changeset:
Modified: trunk/buildroot/package/pcmcia/pcmcia.mk
===================================================================
--- trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-24 14:08:02 UTC (rev 19247)
+++ trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-24 14:10:03 UTC (rev 19248)
@@ -40,7 +40,7 @@
 	touch $(PCMCIA_DIR)/.patched
 
 $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
-	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX_SOURCE_DIR) --noprompt \
+	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX26_DIR) --noprompt \
 		--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
 		--sysv --kcc=$(KERNEL_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
 		--target=$(TARGET_DIR))
@@ -88,11 +88,11 @@
 
 # use busybox depmod.pl so we need the sources unpacked
 $(PCMCIA_DIR)/.modules.dep: $(BUSYBOX_DIR)/.configured $(TARGET_DIR)/lib/modules
-	[ -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) ] && \
+	[ -d $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION) ] && \
 	$(BUSYBOX_DIR)/examples/depmod.pl \
-		-b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
-		-F $(LINUX_DIR)/System.map \
-		> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+		-b $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/ \
+		-F $(LINUX26_DIR)/System.map \
+		> $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
 	touch $(PCMCIA_DIR)/.modules.dep
 
 pcmcia: uclibc linux26 $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep

[Buildroot] svn commit: trunk/buildroot/package/pcmcia

[Bernhard Fischer]

On Tue, Jul 24, 2007 at 07:10:04AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-07-24 07:10:03 -0700 (Tue, 24 Jul 2007)
>New Revision: 19248
>
>Log:
>Use known Buildroot symbols for linux in pcmcia
>
>Modified:
>   trunk/buildroot/package/pcmcia/pcmcia.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/pcmcia/pcmcia.mk
>===================================================================
>--- trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-24 14:08:02 UTC (rev 19247)
>+++ trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-24 14:10:03 UTC (rev 19248)
>@@ -40,7 +40,7 @@
> 	touch $(PCMCIA_DIR)/.patched
> 
> $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
>-	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX_SOURCE_DIR) --noprompt \
>+	( cd $(PCMCIA_DIR) ; ./Configure --kernel=$(LINUX26_DIR) --noprompt \
> 		--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
> 		--sysv --kcc=$(KERNEL_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
> 		--target=$(TARGET_DIR))
>@@ -88,11 +88,11 @@
> 
> # use busybox depmod.pl so we need the sources unpacked
> $(PCMCIA_DIR)/.modules.dep: $(BUSYBOX_DIR)/.configured $(TARGET_DIR)/lib/modules
>-	[ -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) ] && \
>+	[ -d $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION) ] && \

Shouldn't LINUX_VERSION point to either LINUX26_VERSION (for a 2.6
kernel) or come from a 2.4 kernel? Using LINUX26_VERSION here sounds
wrong to me..

> 	$(BUSYBOX_DIR)/examples/depmod.pl \
>-		-b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
>-		-F $(LINUX_DIR)/System.map \
>-		> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
>+		-b $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/ \
>+		-F $(LINUX26_DIR)/System.map \
>+		> $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep

likewise.

-> 	touch $(PCMCIA_DIR)/.modules.dep
+ 	touch $@

[Buildroot] svn commit: trunk/buildroot/package/pcmcia

[ulf at uclibc.org]

Author: ulf
Date: 2007-07-15 15:01:33 -0700 (Sun, 15 Jul 2007)
New Revision: 19103

Log:
Make package/pcmcia depend on 'linux26' (which is defined) instead of 'linux'

Modified:
   trunk/buildroot/package/pcmcia/pcmcia.mk


Changeset:
Modified: trunk/buildroot/package/pcmcia/pcmcia.mk
===================================================================
--- trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-15 21:54:11 UTC (rev 19102)
+++ trunk/buildroot/package/pcmcia/pcmcia.mk	2007-07-15 22:01:33 UTC (rev 19103)
@@ -95,7 +95,7 @@
 		> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 	touch $(PCMCIA_DIR)/.modules.dep
 
-pcmcia: uclibc linux $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep
+pcmcia: uclibc linux26 $(TARGET_DIR)/sbin/cardmgr $(PCMCIA_DIR)/.modules.dep
 
 pcmcia-clean:
 	rm -f $(TARGET_DIR)/sbin/cardmgr

[Buildroot] svn commit: trunk/buildroot/package/pcmcia

[andersen at uclibc.org]

Author: andersen
Date: 2006-08-24 19:43:15 -0700 (Thu, 24 Aug 2006)
New Revision: 15991

Log:
Don Reid writes:
It looks like the linux binary is just used if a system map file cannot
be found.  So I changed the make file to remove it.


Modified:
   trunk/buildroot/package/pcmcia/pcmcia.mk


Changeset:
Modified: trunk/buildroot/package/pcmcia/pcmcia.mk
===================================================================
--- trunk/buildroot/package/pcmcia/pcmcia.mk	2006-08-25 02:13:46 UTC (rev 15990)
+++ trunk/buildroot/package/pcmcia/pcmcia.mk	2006-08-25 02:43:15 UTC (rev 15991)
@@ -91,7 +91,6 @@
 	[ -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION) ] && \
 	$(BUSYBOX_DIR)/examples/depmod.pl \
 		-b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
-		-k $(LINUX_DIR)/vmlinux \
 		-F $(LINUX_DIR)/System.map \
 		> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 	touch $(PCMCIA_DIR)/.modules.dep