mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
blktool: remove a duplicate patch
blktool-gnulib-makedev.patch is actually doing the same thing as 0004-fix-ftbfs-glibc-2.28.patch, so we end up including the same file twice. (From OE-Core rev: 8de82c63fe49917c80d1b634819ae2001625a645) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
db1566b859
commit
a7f6451222
@@ -1,23 +0,0 @@
|
||||
include <sys/sysmacros.h> for major/minor defintions
|
||||
|
||||
Fixes
|
||||
|
||||
| ../blktool-4.orig/blktool.c: In function 'detect_dev_class':
|
||||
| ../blktool-4.orig/blktool.c:295:10: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
|
||||
| switch (major(st_rdev)) {
|
||||
| ^~~~~
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Index: blktool-4.orig/blktool.c
|
||||
===================================================================
|
||||
--- blktool-4.orig.orig/blktool.c
|
||||
+++ blktool-4.orig/blktool.c
|
||||
@@ -27,6 +27,7 @@
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/major.h>
|
||||
#include <scsi/scsi.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
|
||||
#include "blktool.h"
|
||||
|
||||
@@ -14,7 +14,6 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/
|
||||
file://0002-fix-string-error.patch \
|
||||
file://0003-Fix-3-d-argument-for-BLKROSET-it-must-be-const-int.patch \
|
||||
file://0004-fix-ftbfs-glibc-2.28.patch \
|
||||
file://blktool-gnulib-makedev.patch \
|
||||
"
|
||||
|
||||
SRC_URI[tarball.md5sum] = "62edc09c9908107e69391c87f4f3fd40"
|
||||
|
||||
Reference in New Issue
Block a user