* [Buildroot] svn commit: trunk/buildroot/package/hotplug
@ 2006-08-10 20:08 andersen at uclibc.org
2006-08-11 5:01 ` Ulf Samuelsson
0 siblings, 1 reply; 11+ messages in thread
From: andersen at uclibc.org @ 2006-08-10 20:08 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-08-10 13:08:31 -0700 (Thu, 10 Aug 2006)
New Revision: 15796
Log:
rework hotplug with a customized version not dependant on kernel sources
Added:
trunk/buildroot/package/hotplug/diethotplug-0.5.tar
Removed:
trunk/buildroot/package/hotplug/hotplug.patch
Modified:
trunk/buildroot/package/hotplug/hotplug.mk
Changeset:
Added: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
===================================================================
(Binary files differ)
Property changes on: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/buildroot/package/hotplug/hotplug.mk
===================================================================
--- trunk/buildroot/package/hotplug/hotplug.mk 2006-08-10 01:09:37 UTC (rev 15795)
+++ trunk/buildroot/package/hotplug/hotplug.mk 2006-08-10 20:08:31 UTC (rev 15796)
@@ -3,15 +3,13 @@
# hotplug support
#
#############################################################
-HOTPLUG_SOURCE=diethotplug-0.4.tar.gz
+HOTPLUG_SOURCE=package/hotplug/diethotplug-0.5.tar
HOTPLUG_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
-HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4
+HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.5
+HOTPLUG_CAT=cat
-$(DL_DIR)/$(HOTPLUG_SOURCE):
- $(WGET) -P $(DL_DIR) $(HOTPLUG_SITE)/$(HOTPLUG_SOURCE)
-
-$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE)
- zcat $(DL_DIR)/$(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+$(HOTPLUG_DIR): $(HOTPLUG_SOURCE)
+ $(HOTPLUG_CAT) $(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(HOTPLUG_DIR) package/hotplug/ hotplug\*.patch
$(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
Deleted: trunk/buildroot/package/hotplug/hotplug.patch
===================================================================
--- trunk/buildroot/package/hotplug/hotplug.patch 2006-08-10 01:09:37 UTC (rev 15795)
+++ trunk/buildroot/package/hotplug/hotplug.patch 2006-08-10 20:08:31 UTC (rev 15796)
@@ -1,33 +0,0 @@
-diff -urN diethotplug-0.4.orig/pci.c diethotplug-0.4/pci.c
---- diethotplug-0.4.orig/pci.c Wed Jan 9 13:57:29 2002
-+++ diethotplug-0.4/pci.c Wed Jan 30 22:35:24 2002
-@@ -68,8 +68,8 @@
- }
-
- /* check that the class matches */
-- class_temp = pci_module_map[i].class_mask & pci_class;
-- if (pci_module_map[i].class != class_temp) {
-+ class_temp = (pci_module_map[i].class ^ pci_class) & pci_module_map[i].class_mask;
-+ if (class_temp != 0) {
- dbg ("class mask check failed %x != %x",
- pci_module_map[i].class, class_temp);
- continue;
---- diethotplug-0.4/Makefile.orig Wed Jan 9 14:28:05 2002
-+++ diethotplug-0.4/Makefile Mon Jul 8 07:29:00 2002
-@@ -135,13 +135,13 @@
-
- # Rules on how to create the generated header files
- usb_modules.h:
-- perl convert_usb.pl < /lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@
-+ perl convert_usb.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@
-
- pci_modules.h:
-- perl convert_pci.pl < /lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@
-+ perl convert_pci.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@
-
- ieee1394_modules.h:
-- perl convert_ieee1394.pl < /lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@
-+ perl convert_ieee1394.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@
-
- hotplug_version.h:
- @echo \#define HOTPLUG_VERSION \"$(VERSION)\" > $@
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2006-08-10 20:08 [Buildroot] svn commit: trunk/buildroot/package/hotplug andersen at uclibc.org
@ 2006-08-11 5:01 ` Ulf Samuelsson
2006-08-14 16:45 ` Erik Andersen
0 siblings, 1 reply; 11+ messages in thread
From: Ulf Samuelsson @ 2006-08-11 5:01 UTC (permalink / raw)
To: buildroot
This patch does not work, since the "diethotplug-0.5.tar" file is missing
> Changeset:
> Added: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
> ===================================================================
> (Binary files differ)
>
Best Regards
Ulf Samuelsson
> Author: andersen
> Date: 2006-08-10 13:08:31 -0700 (Thu, 10 Aug 2006)
> New Revision: 15796
>
> Log:
> rework hotplug with a customized version not dependant on kernel sources
>
>
> Added:
> trunk/buildroot/package/hotplug/diethotplug-0.5.tar
>
> Removed:
> trunk/buildroot/package/hotplug/hotplug.patch
>
> Modified:
> trunk/buildroot/package/hotplug/hotplug.mk
>
>
> Changeset:
> Added: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
> ===================================================================
> (Binary files differ)
>
>
> Property changes on: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
> ___________________________________________________________________
> Name: svn:mime-type
> + application/octet-stream
>
> Modified: trunk/buildroot/package/hotplug/hotplug.mk
> ===================================================================
> --- trunk/buildroot/package/hotplug/hotplug.mk 2006-08-10 01:09:37 UTC (rev 15795)
> +++ trunk/buildroot/package/hotplug/hotplug.mk 2006-08-10 20:08:31 UTC (rev 15796)
> @@ -3,15 +3,13 @@
> # hotplug support
> #
> #############################################################
> -HOTPLUG_SOURCE=diethotplug-0.4.tar.gz
> +HOTPLUG_SOURCE=package/hotplug/diethotplug-0.5.tar
> HOTPLUG_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/
> -HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4
> +HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.5
> +HOTPLUG_CAT=cat
>
> -$(DL_DIR)/$(HOTPLUG_SOURCE):
> - $(WGET) -P $(DL_DIR) $(HOTPLUG_SITE)/$(HOTPLUG_SOURCE)
> -
> -$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE)
> - zcat $(DL_DIR)/$(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> +$(HOTPLUG_DIR): $(HOTPLUG_SOURCE)
> + $(HOTPLUG_CAT) $(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> toolchain/patch-kernel.sh $(HOTPLUG_DIR) package/hotplug/ hotplug\*.patch
>
> $(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR)
>
> Deleted: trunk/buildroot/package/hotplug/hotplug.patch
> ===================================================================
> --- trunk/buildroot/package/hotplug/hotplug.patch 2006-08-10 01:09:37 UTC (rev 15795)
> +++ trunk/buildroot/package/hotplug/hotplug.patch 2006-08-10 20:08:31 UTC (rev 15796)
> @@ -1,33 +0,0 @@
> -diff -urN diethotplug-0.4.orig/pci.c diethotplug-0.4/pci.c
> ---- diethotplug-0.4.orig/pci.c Wed Jan 9 13:57:29 2002
> -+++ diethotplug-0.4/pci.c Wed Jan 30 22:35:24 2002
> -@@ -68,8 +68,8 @@
> - }
> -
> - /* check that the class matches */
> -- class_temp = pci_module_map[i].class_mask & pci_class;
> -- if (pci_module_map[i].class != class_temp) {
> -+ class_temp = (pci_module_map[i].class ^ pci_class) & pci_module_map[i].class_mask;
> -+ if (class_temp != 0) {
> - dbg ("class mask check failed %x != %x",
> - pci_module_map[i].class, class_temp);
> - continue;
> ---- diethotplug-0.4/Makefile.orig Wed Jan 9 14:28:05 2002
> -+++ diethotplug-0.4/Makefile Mon Jul 8 07:29:00 2002
> -@@ -135,13 +135,13 @@
> -
> - # Rules on how to create the generated header files
> - usb_modules.h:
> -- perl convert_usb.pl < /lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@
> -+ perl convert_usb.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@
> -
> - pci_modules.h:
> -- perl convert_pci.pl < /lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@
> -+ perl convert_pci.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@
> -
> - ieee1394_modules.h:
> -- perl convert_ieee1394.pl < /lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@
> -+ perl convert_ieee1394.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@
> -
> - hotplug_version.h:
> - @echo \#define HOTPLUG_VERSION \"$(VERSION)\" > $@
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 11+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2006-08-11 5:01 ` Ulf Samuelsson
@ 2006-08-14 16:45 ` Erik Andersen
2006-08-14 21:22 ` Ulf Samuelsson
0 siblings, 1 reply; 11+ messages in thread
From: Erik Andersen @ 2006-08-14 16:45 UTC (permalink / raw)
To: buildroot
On Fri Aug 11, 2006 at 07:01:31AM +0200, Ulf Samuelsson wrote:
> This patch does not work, since the "diethotplug-0.5.tar" file is missing
It worked fine for me...
-Erik
--
Erik B. Andersen http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2006-08-14 16:45 ` Erik Andersen
@ 2006-08-14 21:22 ` Ulf Samuelsson
2006-08-15 21:31 ` Rob Landley
2006-08-16 18:23 ` Erik Andersen
0 siblings, 2 replies; 11+ messages in thread
From: Ulf Samuelsson @ 2006-08-14 21:22 UTC (permalink / raw)
To: buildroot
----- Original Message -----
From: "Erik Andersen" <andersen@codepoet.org>
To: "Ulf Samuelsson" <ulfs@dof.se>
Cc: <buildroot@uclibc.org>
Sent: Monday, August 14, 2006 6:45 PM
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/hotplug
> On Fri Aug 11, 2006 at 07:01:31AM +0200, Ulf Samuelsson wrote:
>> This patch does not work, since the "diethotplug-0.5.tar" file is missing
>
> It worked fine for me...
>
> -Erik
Yes because you may have the file already, but the patch sent on the distribution list did only contain a comment
that it was a binary file, but not the file itself.
Best Regards
Ulf Samuelsson
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2006-08-14 21:22 ` Ulf Samuelsson
@ 2006-08-15 21:31 ` Rob Landley
2006-08-16 18:23 ` Erik Andersen
1 sibling, 0 replies; 11+ messages in thread
From: Rob Landley @ 2006-08-15 21:31 UTC (permalink / raw)
To: buildroot
On Monday 14 August 2006 5:22 pm, Ulf Samuelsson wrote:
>
> ----- Original Message -----
> From: "Erik Andersen" <andersen@codepoet.org>
> To: "Ulf Samuelsson" <ulfs@dof.se>
> Cc: <buildroot@uclibc.org>
> Sent: Monday, August 14, 2006 6:45 PM
> Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/hotplug
>
>
> > On Fri Aug 11, 2006 at 07:01:31AM +0200, Ulf Samuelsson wrote:
> >> This patch does not work, since the "diethotplug-0.5.tar" file is missing
> >
> > It worked fine for me...
> >
> > -Erik
>
>
> Yes because you may have the file already, but the patch sent on the
distribution list did only contain a comment
> that it was a binary file, but not the file itself.
I got the file out of the web thingy.
http://buildroot.uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/package/hotplug/diethotplug-0.5.tar?rev=15796&view=markup
I'm trying to resolve the license issues to get it into BusyBox proper. (It's
gplv2 only, and busybox is gplv2 or later...)
Rob
--
Never bet against the cheap plastic solution.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2006-08-14 21:22 ` Ulf Samuelsson
2006-08-15 21:31 ` Rob Landley
@ 2006-08-16 18:23 ` Erik Andersen
1 sibling, 0 replies; 11+ messages in thread
From: Erik Andersen @ 2006-08-16 18:23 UTC (permalink / raw)
To: buildroot
On Mon Aug 14, 2006 at 11:22:43PM +0200, Ulf Samuelsson wrote:
> Yes because you may have the file already, but the patch sent
> on the distribution list did only contain a comment that it was
> a binary file, but not the file itself.
It may not have been included in the patch automatically
generated when the file was committed, but I can assure you the
file is indeed checked into the buildroot svn repository, from
which you can fetch it, and from which it is included in the
daily buildroot snapshots.
-Erik
--
Erik B. Andersen http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
@ 2007-10-18 22:59 ulf at uclibc.org
0 siblings, 0 replies; 11+ messages in thread
From: ulf at uclibc.org @ 2007-10-18 22:59 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-10-18 15:59:44 -0700 (Thu, 18 Oct 2007)
New Revision: 20294
Log:
Hotplug source is inside buildroot
Modified:
trunk/buildroot/package/hotplug/hotplug.mk
Changeset:
Modified: trunk/buildroot/package/hotplug/hotplug.mk
===================================================================
--- trunk/buildroot/package/hotplug/hotplug.mk 2007-10-18 22:40:02 UTC (rev 20293)
+++ trunk/buildroot/package/hotplug/hotplug.mk 2007-10-18 22:59:44 UTC (rev 20294)
@@ -26,7 +26,7 @@
hotplug: uclibc $(TARGET_DIR)/sbin/hotplug
-hotplug-source: $(DL_DIR)/$(HOTPLUG_SOURCE)
+hotplug-source: $(HOTPLUG_SOURCE)
hotplug-clean:
rm -f $(TARGET_DIR)/sbin/hotplug
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
@ 2008-12-17 6:32 hamish at uclibc.org
2008-12-17 9:40 ` Peter Korsgaard
0 siblings, 1 reply; 11+ messages in thread
From: hamish at uclibc.org @ 2008-12-17 6:32 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-12-16 22:32:19 -0800 (Tue, 16 Dec 2008)
New Revision: 24436
Log:
Revert $(strip ...) change which corrupted this file
Modified:
trunk/buildroot/package/hotplug/diethotplug-0.5.tar
Changeset:
Modified: trunk/buildroot/package/hotplug/diethotplug-0.5.tar
===================================================================
(Binary files differ)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2008-12-17 6:32 hamish at uclibc.org
@ 2008-12-17 9:40 ` Peter Korsgaard
2008-12-17 9:51 ` Markus Heidelberg
0 siblings, 1 reply; 11+ messages in thread
From: Peter Korsgaard @ 2008-12-17 9:40 UTC (permalink / raw)
To: buildroot
On Wed, Dec 17, 2008 at 7:32 AM, <hamish@uclibc.org> wrote:
> Author: hamish
> Date: 2008-12-16 22:32:19 -0800 (Tue, 16 Dec 2008)
> New Revision: 24436
>
> Log:
> Revert $(strip ...) change which corrupted this file
Argh, sorry about that - Seems like sed went a bit over board :/
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2008-12-17 9:40 ` Peter Korsgaard
@ 2008-12-17 9:51 ` Markus Heidelberg
2008-12-17 10:31 ` Peter Korsgaard
0 siblings, 1 reply; 11+ messages in thread
From: Markus Heidelberg @ 2008-12-17 9:51 UTC (permalink / raw)
To: buildroot
Peter Korsgaard, 17.12.2008:
> On Wed, Dec 17, 2008 at 7:32 AM, <hamish@uclibc.org> wrote:
> > Author: hamish
> > Date: 2008-12-16 22:32:19 -0800 (Tue, 16 Dec 2008)
> > New Revision: 24436
> >
> > Log:
> > Revert $(strip ...) change which corrupted this file
>
> Argh, sorry about that - Seems like sed went a bit over board :/
These files are also affected:
trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
And it seems that the openswan directory contains several outdated
patches.
Markus
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/hotplug
2008-12-17 9:51 ` Markus Heidelberg
@ 2008-12-17 10:31 ` Peter Korsgaard
0 siblings, 0 replies; 11+ messages in thread
From: Peter Korsgaard @ 2008-12-17 10:31 UTC (permalink / raw)
To: buildroot
On Wed, Dec 17, 2008 at 10:51 AM, Markus Heidelberg
<markus.heidelberg@web.de> wrote:
> These files are also affected:
>
> trunk/buildroot/package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-klips.patch
> trunk/buildroot/package/openswan/linux-2.6.20.4-openswan-2.4.7.kernel-2.6-klips.patch
> trunk/buildroot/package/openswan/linux-2.6.21.5-openswan-2.4.8.kernel-2.6-klips.patch
> trunk/buildroot/package/openswan/linux-2.6.22.6-openswan-2.4.9.kernel-2.6-klips.patch
Ahh yes, thanks - Will revert.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2008-12-17 10:31 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-08-10 20:08 [Buildroot] svn commit: trunk/buildroot/package/hotplug andersen at uclibc.org
2006-08-11 5:01 ` Ulf Samuelsson
2006-08-14 16:45 ` Erik Andersen
2006-08-14 21:22 ` Ulf Samuelsson
2006-08-15 21:31 ` Rob Landley
2006-08-16 18:23 ` Erik Andersen
-- strict thread matches above, loose matches on Subject: below --
2007-10-18 22:59 ulf at uclibc.org
2008-12-17 6:32 hamish at uclibc.org
2008-12-17 9:40 ` Peter Korsgaard
2008-12-17 9:51 ` Markus Heidelberg
2008-12-17 10:31 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox