tools: update kernel2minor to 0.24 version

Signed-off-by: Sergey Sergeev <adron@yapic.net>
This commit is contained in:
Sergey Sergeev 2017-01-24 16:04:18 +03:00 committed by Felix Fietkau
parent b2437a02a4
commit 47fa00a3d4
4 changed files with 4 additions and 61 deletions

View File

@ -7,13 +7,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=kernel2minor PKG_NAME:=kernel2minor
PKG_VERSION:=0.22 PKG_VERSION:=0.24
PKG_RELEASE:=1 PKG_RELEASE:=3
PKG_MIRROR_HASH:=8e509deb78e4eddc5f4d0798d3c5fbc99bf6dd151faaf0332a640607042d7f82
PKG_SOURCE_URL:=https://github.com/adron-s/kernel2minor.git PKG_SOURCE_URL:=https://github.com/adron-s/kernel2minor.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=0587740de3e398dbe89d965334c492609cb9739d PKG_SOURCE_VERSION:=2cacb4dec6673a60a972a3a7f7629464a26a8492
PKG_HASH:=33ca413403a3341af0c9a8e6d9bb58f4ad080a5339e8a8729b83637d35bfaf1b
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk

View File

@ -1,13 +0,0 @@
--- a/yaffs2/yaffs_guts.h
+++ b/yaffs2/yaffs_guts.h
@@ -17,8 +17,9 @@
#define __YAFFS_GUTS_H__
#include "yportenv.h"
+#include <stdint.h>
-typedef __loff_t loff_t;
+typedef int64_t loff_t;
#define YAFFS_OK 1
#define YAFFS_FAIL 0

View File

@ -1,33 +0,0 @@
--- a/k2m_biops.h
+++ b/k2m_biops.h
@@ -10,7 +10,9 @@
*/
//нужна ли конвертация. устанавливавется автоматически в 1 для НЕ big_endian систем
-static int endian_need_conv = __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__;
+static int big_endian;
+
+#define endian_need_conv (!!big_endian ^ (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
/* конвертор из одного байтового порядка в обратный
x обязательно должна быть переменной но не выражением !
--- a/kernel2minor.c
+++ b/kernel2minor.c
@@ -76,7 +76,7 @@ void print_help(void){
char *usage[] =
{ "-k", "Path to kernel file", kernel_file,
"-r", "Path to result file", res_file,
- "-e", "Enable endian convert", endian_need_conv ? "Yes" : "No",
+ "-e", "Enable endian convert to big-endian", big_endian ? "Yes" : "No",
"-c", "Use ECC", use_ecc ? "Yes" : "No",
"-s", "FLASH Unit(Chunk) size", chunk_size_str,
"-i", "Add image info block", add_image_info_block ? info_block_size_str : "No",
@@ -595,7 +595,7 @@ int main(int argc, char *argv[]){
case 'k': snprintf(kernel_file, sizeof(kernel_file) - 1, "%s", optarg); break;
case 'r': snprintf(res_file, sizeof(res_file) - 1, "%s", optarg); break;
case 'c': use_ecc = 1; break;
- case 'e': endian_need_conv = 1; break;
+ case 'e': big_endian = 1; break;
case 's': chunk_size = atoi(optarg); break;
case 'i': add_image_info_block = 1; align_size = atoi(optarg); break;
case 'p': strncpy(platform_name, optarg, sizeof(platform_name)); break;

View File

@ -1,11 +0,0 @@
--- a/kernel2minor.c
+++ b/kernel2minor.c
@@ -622,7 +622,7 @@ int main(int argc, char *argv[]){
perror("Can't open kernel file");
exit(-1);
}
- r = creat(res_file, 0);
+ r = open(res_file, O_CREAT | O_TRUNC | O_WRONLY, 0644);
if(r <= 0){
perror("Can't create result file");
close(k);