Changeset 30858 for packages


Ignore:
Timestamp:
2012-03-09T02:11:17+01:00 (4 years ago)
Author:
swalker
Message:

[packages] dosfstools: update to 3.0.12, add fsck script (#10697)

Location:
packages/utils/dosfstools
Files:
1 added
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • packages/utils/dosfstools/Makefile

    r24917 r30858  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=dosfstools 
    11 PKG_VERSION:=3.0.11 
     11PKG_VERSION:=3.0.12 
    1212PKG_RELEASE:=1 
    1313 
    14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://www.daniel-baumann.ch/software/dosfstools 
    16 PKG_MD5SUM:=8d2211d5bd813164e20740e7c852aa06 
     16PKG_MD5SUM:=4c1f1e72b82371704f93ebdd3c7b6259 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
     
    7474 
    7575define Package/dosfsck/install 
     76        $(INSTALL_DIR) $(1)/lib/functions/fsck 
     77        $(INSTALL_DATA) ./files/dosfsck.sh $(1)/lib/functions/fsck/ 
    7678        $(INSTALL_DIR) $(1)/usr/sbin 
    7779        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/ 
  • packages/utils/dosfstools/files/dosfsck.sh

    r30848 r30858  
    55# 
    66 
    7 fsck_e2fsck() { 
    8         e2fsck -p "$device" 2>&1 | logger -t "fstab: e2fsck ($device)" 
     7fsck_dosfsck() { 
     8        dosfsck -p "$device" 2>&1 | logger -t "fstab: dosfsck ($device)" 
    99        local status="$?" 
    1010        case "$status" in 
    1111                0|1) ;; #success 
    1212                2) reboot;; 
    13                 4) echo "e2fsck ($device): Warning! Uncorrected errors."| logger -t fstab 
     13                4) echo "dosfsck ($device): Warning! Uncorrected errors."| logger -t fstab 
    1414                        return 1 
    1515                        ;; 
    16                 *) echo "e2fsck ($device): Error $status. Check not complete."| logger -t fstab;; 
     16                *) echo "dosfsck ($device): Error $status. Check not complete."| logger -t fstab;; 
    1717        esac 
    1818        return 0 
    1919} 
    2020 
    21 fsck_ext2() { 
    22         fsck_e2fsck "$@" 
     21fsck_dos() { 
     22        fsck_dosfsck "$@" 
    2323} 
    2424 
    25 fsck_ext3() { 
    26         fsck_e2fsck "$@" 
     25fsck_vfat() { 
     26        fsck_dosfsck "$@" 
    2727} 
    2828 
    29 fsck_ext4() { 
    30         fsck_e2fsck "$@" 
    31 } 
    32  
    33 append libmount_known_fsck "ext2" 
    34 append libmount_known_fsck "ext3" 
    35 append libmount_known_fsck "ext4" 
     29append libmount_known_fsck "dos" 
     30append libmount_known_fsck "vfat" 
  • packages/utils/dosfstools/patches/002-linux_26_headers.patch

    r19532 r30858  
    55 */ 
    66  
    7 -# include <asm/types.h> 
     7-#include <asm/types.h> 
    88+#include <linux/types.h> 
    99  
     
    1212--- a/src/dosfsck.h 
    1313+++ b/src/dosfsck.h 
    14 @@ -32,8 +32,8 @@ 
    15  #define _LINUX_STRING_H_       /* hack to avoid inclusion of <linux/string.h>*/ 
    16  #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */ 
     14@@ -31,7 +31,7 @@ 
     15 #define _LINUX_STRING_H_       /* hack to avoid inclusion of <linux/string.h> */ 
     16 #define _LINUX_FS_H            /* hack to avoid inclusion of <linux/fs.h> */ 
    1717  
    18 -# include <asm/types.h> 
    19 -# include <asm/byteorder.h> 
     18-#include <asm/types.h> 
    2019+#include <linux/types.h> 
    21 +#include <asm/byteorder.h> 
     20 #include <asm/byteorder.h> 
    2221  
    2322 #include <linux/msdos_fs.h> 
    24   
    2523--- a/src/file.c 
    2624+++ b/src/file.c 
    27 @@ -34,7 +34,7 @@ 
    28  #define _LINUX_STRING_H_       /* hack to avoid inclusion of <linux/string.h>*/ 
    29  #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */ 
     25@@ -33,7 +33,7 @@ 
     26 #define _LINUX_STRING_H_       /* hack to avoid inclusion of <linux/string.h> */ 
     27 #define _LINUX_FS_H            /* hack to avoid inclusion of <linux/fs.h> */ 
    3028  
    31 -# include <asm/types.h> 
     29-#include <asm/types.h> 
    3230+#include <linux/types.h> 
    3331  
     
    5048 #include <errno.h> 
    5149  
    52 -# include <asm/types.h> 
     50-#include <asm/types.h> 
    5351+#include <linux/types.h> 
    5452  
Note: See TracChangeset for help on using the changeset viewer.