From patchwork Fri Sep 11 09:39:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Bisson X-Patchwork-Id: 516648 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id DA652140784 for ; Fri, 11 Sep 2015 19:40:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0F3F33358D; Fri, 11 Sep 2015 09:40:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8BtNIP0H1t1Z; Fri, 11 Sep 2015 09:40:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 73060306A4; Fri, 11 Sep 2015 09:40:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ADE061C0A72 for ; Fri, 11 Sep 2015 09:40:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A7AA0919A2 for ; Fri, 11 Sep 2015 09:40:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TKa7qIJpXDcy for ; Fri, 11 Sep 2015 09:40:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by whitealder.osuosl.org (Postfix) with ESMTPS id 02EB191997 for ; Fri, 11 Sep 2015 09:40:03 +0000 (UTC) Received: by wicfx3 with SMTP id fx3so57282965wic.1 for ; Fri, 11 Sep 2015 02:40:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IRJWlYlNrdHiUSy1qCsOmP4x11fx0Uzw2dD0ePnG2K8=; b=ERWavCS9XIo/6xrQErHy2gYqlKbnrOYlsLJkMJvUppe5eTBZBywRsAB4/0qJVwszqV Clh3bdCQB7u5g8VqKgwm9kPssT+pJ+OWF2gLmKTOc8aMOJ2WIJ7Sd4mrAzbIhs2Eyiy6 ZmuhVLd/HHpjPXItcZNM90LbtKHw7usA/1j3IF59cBcvK98QfkW41/zMWydwqiigHz0G wmPudzVFjFdSlIXfdLzmC6B/hpumuwJmgXoTboxvNdi9Exda8uqBAmZQSTJogk2Bs0nR 0seMjF1gY0++lTUM5hp95raCDRH4ICQpCV2ICSywdLYk9v5p4m5pDnH0+MopP2ArvctK A3Dw== X-Gm-Message-State: ALoCoQntoHfguUgE3SjjoGgazu1oYFZW9jl9808KiETorL7u/IuelbmvG1MQw/R2ddzRufsb8LQ/ X-Received: by 10.194.93.35 with SMTP id cr3mr2187608wjb.46.1441964402691; Fri, 11 Sep 2015 02:40:02 -0700 (PDT) Received: from t450s.lan (89-92-157-132.hfc.dyn.abo.bbox.fr. [89.92.157.132]) by smtp.googlemail.com with ESMTPSA id go5sm1390374wib.3.2015.09.11.02.40.02 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Sep 2015 02:40:02 -0700 (PDT) From: Gary Bisson To: buildroot@busybox.net Date: Fri, 11 Sep 2015 11:39:42 +0200 Message-Id: <1441964394-3817-4-git-send-email-gary.bisson@boundarydevices.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1441964394-3817-1-git-send-email-gary.bisson@boundarydevices.com> References: <1441964394-3817-1-git-send-email-gary.bisson@boundarydevices.com> Cc: thomas.petazzoni@free-electrons.com, jezz@sysmic.org, vincent.stehle@freescale.com, luca@lucaceresoli.net Subject: [Buildroot] [PATCH v2 03/14] kobs-ng: remove obsolete package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In favor of imx-kobs maintained by Freescale. Signed-off-by: Gary Bisson --- Config.in.legacy | 8 ++++ package/Config.in | 1 - package/kobs-ng/0001-fix-mtd-defines.patch | 73 ------------------------------ package/kobs-ng/Config.in | 9 ---- package/kobs-ng/kobs-ng.hash | 2 - package/kobs-ng/kobs-ng.mk | 13 ------ 6 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 package/kobs-ng/0001-fix-mtd-defines.patch delete mode 100644 package/kobs-ng/Config.in delete mode 100644 package/kobs-ng/kobs-ng.hash delete mode 100644 package/kobs-ng/kobs-ng.mk diff --git a/Config.in.legacy b/Config.in.legacy index 52031fe..dfbf6db 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -316,6 +316,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 diff --git a/package/Config.in b/package/Config.in index 030477a..bbd6f37 100644 --- a/package/Config.in +++ b/package/Config.in @@ -163,7 +163,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" diff --git a/package/kobs-ng/0001-fix-mtd-defines.patch b/package/kobs-ng/0001-fix-mtd-defines.patch deleted file mode 100644 index 3ffba71..0000000 --- a/package/kobs-ng/0001-fix-mtd-defines.patch +++ /dev/null @@ -1,73 +0,0 @@ -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 -Signed-off-by: Sergey Alyoshin - -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 -+#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? diff --git a/package/kobs-ng/Config.in b/package/kobs-ng/Config.in deleted file mode 100644 index 1f6b2d1..0000000 --- a/package/kobs-ng/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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. diff --git a/package/kobs-ng/kobs-ng.hash b/package/kobs-ng/kobs-ng.hash deleted file mode 100644 index 3e527da..0000000 --- a/package/kobs-ng/kobs-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# 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 diff --git a/package/kobs-ng/kobs-ng.mk b/package/kobs-ng/kobs-ng.mk deleted file mode 100644 index 13d1faf..0000000 --- a/package/kobs-ng/kobs-ng.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kobs-ng -# -################################################################################ - -# kobs-ng versions have never made much sense :( -KOBS_NG_VERSION = 3.0.35-4.0.0 -KOBS_NG_SITE = http://repository.timesys.com/buildsources/k/kobs-ng/kobs-ng-$(KOBS_NG_VERSION) -KOBS_NG_LICENSE = GPLv2+ -KOBS_NG_LICENSE_FILES = COPYING - -$(eval $(autotools-package))