Commit 2b78fb21 authored by Gary Bisson's avatar Gary Bisson Committed by Thomas Petazzoni
Browse files

kobs-ng: remove obsolete package 



In favor of imx-kobs maintained by Freescale.

Signed-off-by: default avatarGary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ff3e2d69

Config.in.legacy

+8 −0
Original line number Diff line number Diff line
@@ -363,6 +363,14 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES_WINDOW 
	  BR2_PACKAGE_DIRECTFB_EXAMPLES option now installs all

	  examples.



config BR2_PACKAGE_KOBS_NG

	bool "kobs-ng was replaced by imx-kobs"

	select BR2_LEGACY

	select BR2_PACKAGE_IMX_KOBS

	help

	  The outdated kobs-ng has been replaced by the Freescale-

	  maintained imx-kobs package.



config BR2_PACKAGE_SAWMAN

	bool "sawman package removed"

	select BR2_LEGACY

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ menu "Filesystem and flash utilities" 
	source "package/genext2fs/Config.in"

	source "package/genpart/Config.in"

	source "package/genromfs/Config.in"

	source "package/kobs-ng/Config.in"

	source "package/makedevs/Config.in"

	source "package/mmc-utils/Config.in"

	source "package/mtd/Config.in"

package/kobs-ng/0001-fix-mtd-defines.patch

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
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 <henson@acm.org>

Signed-off-by: Sergey Alyoshin <alyoshin.s@gmail.com>



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,13 @@

 #include "BootControlBlocks.h"

 #include "rom_nand_hamming_code_ecc.h"

 

+// Newer kernel headers renamed define

+#include <linux/version.h>

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)

+# define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL

+# define MTD_MODE_RAW MTD_FILE_MODE_RAW

+#endif

+

 //------------------------------------------------------------------------------

 // Re-definitions of true and false, because the standard ones aren't good

 // enough?

package/kobs-ng/Config.in

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
config BR2_PACKAGE_KOBS_NG

	bool "kobs-ng"

	depends on BR2_arm

	help

	  The kobs-ng tool is used for writing images to NAND on i.MX

	  platforms.



	  This utility is provided by Freescale as-is and doesn't have an

	  upstream.

package/kobs-ng/kobs-ng.hash

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
# From http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-3.0.35-4.0.0/kobs-ng-3.0.35-4.0.0.tar.gz.md5sum

md5	26104c577f59a6b81782a5bd16aadd82	kobs-ng-3.0.35-4.0.0.tar.gz