jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/config: update quilt series

Browse Source 
Update the patches so they apply without offset

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Yann E. MORIN 2010-10-31 17:35:11 +01:00 committed by Peter Korsgaard
parent e5e8fae892
commit 20106a052e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/config/patches/03-change-config-option-prefix.patch
View File

@ -2,10 +2,10 @@
confdata.c | 49 +++++++++++++++++++++++-------------------------- confdata.c | 49 +++++++++++++++++++++++--------------------------
1 file changed, 23 insertions(+), 26 deletions(-) 1 file changed, 23 insertions(+), 26 deletions(-)
Index: config.new/confdata.c Index: config/confdata.c
=================================================================== ===================================================================
--- config.new.orig/confdata.c --- config.orig/confdata.c
+++ config.new/confdata.c +++ config/confdata.c
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -128,7 +128,7 @@ Index: config.new/confdata.c
break; break;
case S_OTHER: case S_OTHER:
case S_UNKNOWN: case S_UNKNOWN:
@@ -834,14 +831,14 @@ @@ -838,14 +835,14 @@
case no: case no:
break; break;
case mod: case mod:
@ -147,7 +147,7 @@ Index: config.new/confdata.c
break; break;
} }
break; break;
@@ -851,12 +848,12 @@ @@ -855,12 +852,12 @@
case S_HEX: case S_HEX:
str = sym_get_string_value(sym); str = sym_get_string_value(sym);
if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {

4
package/config/patches/09-implement-kconfig-probability.patch
View File

@ -6,7 +6,7 @@ Index: config/confdata.c
=================================================================== ===================================================================
--- config.orig/confdata.c --- config.orig/confdata.c
+++ config/confdata.c +++ config/confdata.c
@@ -977,7 +977,16 @@ @@ -981,7 +981,16 @@
void conf_set_all_new_symbols(enum conf_def_mode mode) void conf_set_all_new_symbols(enum conf_def_mode mode)
{ {
struct symbol *sym, *csym; struct symbol *sym, *csym;
@ -24,7 +24,7 @@ Index: config/confdata.c
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
if (sym_has_value(sym)) if (sym_has_value(sym))
@@ -996,8 +1005,15 @@ @@ -1000,8 +1009,15 @@
sym->def[S_DEF_USER].tri = no; sym->def[S_DEF_USER].tri = no;
break; break;
case def_random: case def_random:

12
package/config/patches/14-support-out-of-tree-config.patch
View File

@ -41,7 +41,7 @@ Index: config/confdata.c
dirname[0] = 0; dirname[0] = 0;
if (name && name[0]) { if (name && name[0]) {
struct stat st; struct stat st;
@@ -656,6 +657,7 @@ @@ -658,6 +659,7 @@
{ {
const char *name; const char *name;
char path[128]; char path[128];
@ -49,7 +49,7 @@ Index: config/confdata.c
char *s, *d, c; char *s, *d, c;
struct symbol *sym; struct symbol *sym;
struct stat sb; struct stat sb;
@@ -664,8 +666,20 @@ @@ -666,8 +668,20 @@
name = conf_get_autoconfig_name(); name = conf_get_autoconfig_name();
conf_read_simple(name, S_DEF_AUTO); conf_read_simple(name, S_DEF_AUTO);
@ -72,7 +72,7 @@ Index: config/confdata.c
res = 0; res = 0;
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
@@ -758,9 +772,11 @@ @@ -760,9 +774,11 @@
close(fd); close(fd);
} }
out: out:
@ -87,7 +87,7 @@ Index: config/confdata.c
return res; return res;
} }
@@ -772,25 +788,38 @@ @@ -774,25 +790,38 @@
FILE *out, *tristate, *out_h; FILE *out, *tristate, *out_h;
time_t now; time_t now;
int i; int i;
@ -130,7 +130,7 @@ Index: config/confdata.c
if (!out_h) { if (!out_h) {
fclose(out); fclose(out);
fclose(tristate); fclose(tristate);
@@ -811,8 +840,7 @@ @@ -815,8 +844,7 @@
fprintf(out_h, "/*\n" fprintf(out_h, "/*\n"
" * Automatically generated C config: don't edit\n" " * Automatically generated C config: don't edit\n"
" * %s" " * %s"
@ -140,7 +140,7 @@ Index: config/confdata.c
ctime(&now)); ctime(&now));
for_all_symbols(i, sym) { for_all_symbols(i, sym) {
@@ -866,19 +894,22 @@ @@ -870,19 +898,22 @@
name = getenv("KCONFIG_AUTOHEADER"); name = getenv("KCONFIG_AUTOHEADER");
if (!name) if (!name)
name = "include/generated/autoconf.h"; name = "include/generated/autoconf.h";