Changeset 21112 for branches/backfire


Ignore:
Timestamp:
2010-04-23T17:28:27+02:00 (6 years ago)
Author:
jow
Message:

[backfire] merge r20679-r20685

Location:
branches/backfire/package/hotplug2/patches
Files:
5 copied

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/hotplug2/patches/120-sysfs_path_fix.patch

    r20679 r21112  
    1 diff -x '*~' -Naur hotplug2-201/rules/command.c hotplug2-201.patched/rules/command.c 
    2 --- hotplug2-201/rules/command.c        2009-12-09 20:44:13.000000000 +0200 
    3 +++ hotplug2-201.patched/rules/command.c        2010-03-31 17:24:09.000000000 +0300 
    4 @@ -374,9 +374,9 @@ 
     1--- a/rules/command.c 
     2+++ b/rules/command.c 
     3@@ -374,9 +374,9 @@ RULES_COMMAND_F(cmd_firmware) { 
    54        if (firmware == NULL) 
    65                return -1; 
  • branches/backfire/package/hotplug2/patches/130-cancel_download_fix.patch

    r20680 r21112  
    1 diff -x '*~' -Naur hotplug2-201/rules/command.c hotplug2-201.patched/rules/command.c 
    2 --- hotplug2-201/rules/command.c        2010-03-31 17:14:44.000000000 +0300 
    3 +++ hotplug2-201.patched/rules/command.c        2010-03-31 17:14:51.000000000 +0300 
    4 @@ -385,13 +385,13 @@ 
     1--- a/rules/command.c 
     2+++ b/rules/command.c 
     3@@ -385,13 +385,13 @@ RULES_COMMAND_F(cmd_firmware) { 
    54  
    65        infp = fopen(firmware_path, "r"); 
  • branches/backfire/package/hotplug2/patches/140-worker_fork_fix.patch

    r20681 r21112  
    1 diff -x '*~' -Naur hotplug2-201/action.c hotplug2-201.patched/action.c 
    2 --- hotplug2-201/action.c       2010-04-01 04:48:10.000000000 +0300 
    3 +++ hotplug2-201.patched/action.c       2010-04-01 04:53:49.000000000 +0300 
    4 @@ -39,7 +39,7 @@ 
     1--- a/action.c 
     2+++ b/action.c 
     3@@ -39,7 +39,7 @@ static void action_dumb(const struct set 
    54  * Returns: Newly allocated string in "key=value" form 
    65  * 
     
    1110        char *combined; 
    1211  
    13 diff -x '*~' -Naur hotplug2-201/action.h hotplug2-201.patched/action.h 
    14 --- hotplug2-201/action.h       2009-12-09 20:44:14.000000000 +0200 
    15 +++ hotplug2-201.patched/action.h       2010-04-01 04:54:14.000000000 +0300 
     12--- a/action.h 
     13+++ b/action.h 
    1614@@ -12,5 +12,6 @@ 
    1715 #include "settings.h" 
     
    2119 #endif /* ifndef ACTION_H */ 
    2220  
    23 diff -x '*~' -Naur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers/worker_fork.c 
    24 --- hotplug2-201/workers/worker_fork.c  2010-04-01 04:52:26.000000000 +0300 
    25 +++ hotplug2-201.patched/workers/worker_fork.c  2010-04-01 04:51:49.000000000 +0300 
    26 @@ -380,6 +380,7 @@ 
     21--- a/workers/worker_fork.c 
     22+++ b/workers/worker_fork.c 
     23@@ -380,6 +380,7 @@ static void worker_fork_deinit(void *in_ 
    2724  
    2825  
     
    3229        struct worker_fork_child_t *child; 
    3330        struct worker_fork_ctx_t *ctx = in_ctx; 
    34 @@ -406,6 +407,12 @@ 
     31@@ -406,6 +407,12 @@ static int worker_fork_process(void *in_ 
    3532                 * No child process is currently available. 
    3633                 */ 
     
    4542                         * Are the matching rules trivial enough that we 
    4643                         * can execute them in the main process? 
    47 @@ -421,6 +428,12 @@ 
     44@@ -421,6 +428,12 @@ static int worker_fork_process(void *in_ 
    4845                         */ 
    4946                        if (ctx->children_count < ctx->max_children) 
  • branches/backfire/package/hotplug2/patches/160-event_block_fix.patch

    r20684 r21112  
    1 diff -x '*~' -ur hotplug2-201/uevent.c hotplug2-201.patched/uevent.c 
    2 --- hotplug2-201/uevent.c       2009-12-09 20:44:14.000000000 +0200 
    3 +++ hotplug2-201.patched/uevent.c       2010-04-02 23:03:11.000000000 +0300 
    4 @@ -132,6 +132,8 @@ 
     1--- a/uevent.c 
     2+++ b/uevent.c 
     3@@ -132,6 +132,8 @@ struct uevent_t *uevent_dup(const struct 
    54         
    65        dest = xmalloc(sizeof(struct uevent_t)); 
     
    1110        dest->env_vars = xmalloc(sizeof(struct env_var_t) * dest->env_vars_c); 
    1211        dest->plain_s = src->plain_s; 
    13 diff -x '*~' -ur hotplug2-201/workers/worker_fork.c hotplug2-201.patched/workers/worker_fork.c 
    14 --- hotplug2-201/workers/worker_fork.c  2010-04-03 17:02:15.000000000 +0300 
    15 +++ hotplug2-201.patched/workers/worker_fork.c  2010-04-03 17:04:27.000000000 +0300 
     12--- a/workers/worker_fork.c 
     13+++ b/workers/worker_fork.c 
    1614@@ -1,6 +1,69 @@ 
    1715 #include "worker_fork.h" 
     
    8482 /** 
    8583  * Destroys data structures related to the given child ID (not PID). 
    86 @@ -315,6 +378,8 @@ 
     84@@ -315,6 +378,8 @@ static void *worker_fork_init(struct set 
    8785        struct worker_fork_ctx_t *ctx; 
    8886        PRINTFUNC(); 
     
    9391        ctx->children = NULL; 
    9492        ctx->children_count = 0; 
    95 @@ -376,6 +441,7 @@ 
     93@@ -376,6 +441,7 @@ static void worker_fork_deinit(void *in_ 
    9694        free(ctx->children); 
    9795        free(ctx); 
     
    10199  
    102100  
    103 @@ -384,15 +450,26 @@ 
     101@@ -384,15 +450,26 @@ static int worker_fork_process(void *in_ 
    104102        int i; 
    105103        struct worker_fork_child_t *child; 
     
    129127  
    130128                child = NULL; 
    131 @@ -407,9 +484,9 @@ 
     129@@ -407,9 +484,9 @@ static int worker_fork_process(void *in_ 
    132130                 * No child process is currently available. 
    133131                 */ 
     
    142140                        } 
    143141  
    144 @@ -418,8 +495,11 @@ 
     142@@ -418,8 +495,11 @@ static int worker_fork_process(void *in_ 
    145143                         * can execute them in the main process? 
    146144                         */ 
     
    156154                        } 
    157155                         
    158 @@ -427,11 +507,11 @@ 
     156@@ -427,11 +507,11 @@ static int worker_fork_process(void *in_ 
    159157                         * We have to fork off a new child. 
    160158                         */ 
     
    171169                        } 
    172170                        free(env); 
    173 @@ -442,9 +522,14 @@ 
     171@@ -442,9 +522,14 @@ static int worker_fork_process(void *in_ 
    174172                 */ 
    175173                if (child != NULL) { 
     
    189187  
    190188                /*  
    191 diff -x '*~' -ur hotplug2-201/workers/worker_fork.h hotplug2-201.patched/workers/worker_fork.h 
    192 --- hotplug2-201/workers/worker_fork.h  2009-12-09 20:44:13.000000000 +0200 
    193 +++ hotplug2-201.patched/workers/worker_fork.h  2010-04-03 01:00:24.000000000 +0300 
    194 @@ -35,4 +35,9 @@ 
     189--- a/workers/worker_fork.h 
     190+++ b/workers/worker_fork.h 
     191@@ -35,4 +35,9 @@ struct worker_fork_ctx_t { 
    195192        struct settings_t                       *settings; 
    196193 }; 
Note: See TracChangeset for help on using the changeset viewer.