vapier 14/11/18 04:07:28 Added: kobs-ng-fix-mtd-defines.patch kobs-ng-fix-open-without-mode.patch kobs-ng-fix-array-violation.patch Log: Initial ebuild by Nam Nguyen. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.1 dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch?rev=1.1&content-type=text/plain Index: kobs-ng-fix-mtd-defines.patch =================================================================== # Source: http://git.buildroot.net/buildroot/plain/package/kobs-ng/kobs-ng-fix-mtd-defines.patch?id=b6fb2f5018fe0ae9bba275991efc502236422924 Newer kernel headers renamed mtd mode defines and no longer support MEMSETOOBSEL. Allow code to work with both older and newer kernel versions. Signed-off-by: Paul B. Henson <hen...@acm.org> diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c 2012-12-17 22:37:40.000000000 -0800 +++ kobs-ng-3.0.35-4.0.0/src/mtd.c 2013-07-28 19:39:59.000000000 -0700 @@ -852,8 +852,11 @@ mp = &md->part[i]; if (mp->fd != -1) { +/* Newer kernels dropped MEMSETOOBSEL */ +#ifdef MEMSETOOBSEL (void)ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo); +#endif close(mp->fd); } @@ -896,6 +899,8 @@ continue; } +/* Newer kernels dropped MEMSETOOBSEL */ +#ifdef MEMSETOOBSEL if (r == -ENOTTY) { r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo); if (r != 0) { @@ -904,6 +909,7 @@ } mp->oobinfochanged = 0; } +#endif } else { r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW); if (r != 0 && r != -ENOTTY) { @@ -911,6 +917,8 @@ continue; } +/* Newer kernels dropped MEMSETOOBSEL */ +#ifdef MEMSETOOBSEL if (r == -ENOTTY) { r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo); if (r != 0) { @@ -920,6 +928,7 @@ mp->oobinfochanged = 1; } else mp->oobinfochanged = 2; +#endif } mp->ecc = ecc; diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h --- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h 2012-12-17 22:37:40.000000000 -0800 +++ kobs-ng-3.0.35-4.0.0/src/mtd.h 2013-07-28 19:33:57.000000000 -0700 @@ -31,6 +31,14 @@ #include "BootControlBlocks.h" #include "rom_nand_hamming_code_ecc.h" +// Newer kernel headers renamed define +#ifndef MTD_MODE_NORMAL +#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL +#endif +#ifndef MTD_MODE_RAW +#define MTD_MODE_RAW MTD_FILE_MODE_RAW +#endif + //------------------------------------------------------------------------------ // Re-definitions of true and false, because the standard ones aren't good // enough? 1.1 dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch?rev=1.1&content-type=text/plain Index: kobs-ng-fix-open-without-mode.patch =================================================================== add missing mode to open() when using O_CREAT --- kobs-ng-3.0.35-4.1.0/src/main.c +++ kobs-ng-3.0.35-4.1.0/src/main.c @@ -563,7 +563,7 @@ int sz = getpagesize(); from = open(file_name, O_RDONLY); - to = open(tmp_file, O_CREAT | O_RDWR); + to = open(tmp_file, O_CREAT | O_RDWR, 0644); if (from < 0 || to < 0) { fprintf(stderr, "unable to create a temporary file\n"); exit(5); 1.1 dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch?rev=1.1&content-type=text/plain Index: kobs-ng-fix-array-violation.patch =================================================================== the part array is declared as part[2], so trying to index [2] isn't going to work --- a/src/mtd.c +++ b/src/mtd.c @@ -786,7 +786,7 @@ mp->ecc = 1; } - if (md->part[1].fd >= 0 && md->part[2].fd >=0) + if (md->part[1].fd >= 0) md->flags |= F_MULTICHIP; /* if a second partition has been opened, verify that are compatible */