Ignore:
Timestamp:
Dec 20, 2016, 4:07:32 PM (8 years ago)
Author:
Bruno Cornec
Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:
branches/3.3
Files:
4 added
36 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/3.3/mindi-busybox/util-linux/volume_id/Kbuild.src

    r3232 r3621  
    88
    99INSERT
    10 
    11 lib-$(CONFIG_BLKID)                             += get_devname.o
    12 lib-$(CONFIG_FINDFS)                            += get_devname.o
    13 lib-$(CONFIG_FEATURE_MOUNT_LABEL)               += get_devname.o
    14 
    15 lib-$(CONFIG_VOLUMEID)                          += volume_id.o util.o
    16 lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS)            += btrfs.o
    17 lib-$(CONFIG_FEATURE_VOLUMEID_EXT)              += ext.o
    18 lib-$(CONFIG_FEATURE_VOLUMEID_FAT)              += fat.o
    19 lib-$(CONFIG_FEATURE_VOLUMEID_HFS)              += hfs.o
    20 ### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID)    += highpoint.o
    21 ### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID)          += isw_raid.o
    22 ### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID)          += lsi_raid.o
    23 ### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID)          += via_raid.o
    24 ### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID)      += silicon_raid.o
    25 ### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID)       += nvidia_raid.o
    26 ### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID)      += promise_raid.o
    27 lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660)          += iso9660.o
    28 lib-$(CONFIG_FEATURE_VOLUMEID_JFS)              += jfs.o
    29 lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID)        += linux_raid.o
    30 lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP)        += linux_swap.o
    31 ### lib-$(CONFIG_FEATURE_VOLUMEID_LVM)              += lvm.o
    32 ### lib-$(CONFIG_FEATURE_VOLUMEID_MAC)              += mac.o
    33 ### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS)            += msdos.o
    34 lib-$(CONFIG_FEATURE_VOLUMEID_NILFS)            += nilfs.o
    35 lib-$(CONFIG_FEATURE_VOLUMEID_NTFS)             += ntfs.o
    36 lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT)            += exfat.o
    37 lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS)         += reiserfs.o
    38 lib-$(CONFIG_FEATURE_VOLUMEID_UDF)              += udf.o
    39 ### lib-$(CONFIG_FEATURE_VOLUMEID_UFS)              += ufs.o
    40 lib-$(CONFIG_FEATURE_VOLUMEID_XFS)              += xfs.o
    41 lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS)           += cramfs.o
    42 ### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS)             += hpfs.o
    43 lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS)            += romfs.o
    44 lib-$(CONFIG_FEATURE_VOLUMEID_SYSV)             += sysv.o
    45 ### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX)            += minix.o
    46 lib-$(CONFIG_FEATURE_VOLUMEID_LUKS)             += luks.o
    47 lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2)            += ocfs2.o

  • branches/3.3/mindi-busybox/util-linux/volume_id/btrfs.c

    r3232 r3621  
    1919 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    2020 */
     21
     22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
     23
     24//config:
     25//config:config FEATURE_VOLUMEID_BTRFS
     26//config:   bool "btrfs filesystem"
     27//config:   default y
     28//config:   depends on VOLUMEID
     29//config:   help
     30//config:     TODO
     31//config:
    2132
    2233#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/cramfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_CRAMFS
     25//config:   bool "cramfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/exfat.c

    r3233 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_EXFAT
     25//config:   bool "exFAT filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     exFAT (extended FAT) is a proprietary file system designed especially
     30//config:     for flash drives. It has many features from NTFS, but with less
     31//config:     overhead. exFAT is used on most SDXC cards for consumer electronics.
     32//config:
    2033
    2134#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/ext.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_EXT
     25//config:   bool "Ext filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/fat.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_FAT
     25//config:   bool "fat filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/get_devname.c

    r3232 r3621  
    88 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
    99 */
     10
     11//kbuild:lib-$(CONFIG_BLKID) += get_devname.o
     12//kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
     13//kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o
     14
    1015#include <sys/mount.h> /* BLKGETSIZE64 */
    1116#if !defined(BLKGETSIZE64)
    … …  
    298303    char *tmp = *fsname;
    299304
    300     if (strncmp(*fsname, "UUID=", 5) == 0)
     305    if (is_prefixed_with(*fsname, "UUID="))
    301306        tmp = get_devname_from_uuid(*fsname + 5);
    302     else if (strncmp(*fsname, "LABEL=", 6) == 0)
     307    else if (is_prefixed_with(*fsname, "LABEL="))
    303308        tmp = get_devname_from_label(*fsname + 6);
    304309

  • branches/3.3/mindi-busybox/util-linux/volume_id/hfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_HFS
     25//config:   bool "hfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/iso9660.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_ISO9660
     25//config:   bool "iso9660 filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/jfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_JFS
     25//config:   bool "jfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/linux_raid.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_LINUXRAID
     25//config:   bool "linuxraid"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/linux_swap.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_LINUXSWAP
     25//config:   bool "linux swap filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/luks.c

    r3232 r3621  
    1919 */
    2020
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_LUKS
     25//config:   bool "luks filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
     31
    2132#include "volume_id_internal.h"
    2233
    … …  
    3041#define LUKS_NUMKEYS             8
    3142
    32 static const uint8_t LUKS_MAGIC[] = { 'L','U','K','S', 0xba, 0xbe };
     43static const uint8_t LUKS_MAGIC[] ALIGN1 = { 'L','U','K','S', 0xba, 0xbe };
    3344
    3445struct luks_phdr {

  • branches/3.3/mindi-busybox/util-linux/volume_id/nilfs.c

    r3233 r3621  
    1919 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    2020 */
     21
     22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
     23
     24//config:
     25//config:config FEATURE_VOLUMEID_NILFS
     26//config:   bool "nilfs filesystem"
     27//config:   default y
     28//config:   depends on VOLUMEID
     29//config:   help
     30//config:     NILFS is a New Implementation of a Log-Structured File System (LFS)
     31//config:     that supports continuous snapshots. This provides features like
     32//config:     versioning of the entire filesystem, restoration of files that
     33//config:     were deleted a few minutes ago. NILFS keeps consistency like
     34//config:     conventional LFS, so it provides quick recovery after system crashes.
     35//config:
     36//config:     The possible use of NILFS includes versioning, tamper detection,
     37//config:     SOX compliance logging, and so forth. It can serve as an alternative
     38//config:     filesystem for Linux desktop environment, or as a basis of advanced
     39//config:     storage appliances.
     40//config:
    2141
    2242#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/ntfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_NTFS
     25//config:   bool "ntfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/ocfs2.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_OCFS2
     25//config:   bool "ocfs2 filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/reiserfs.c

    r3232 r3621  
    1919 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    2020 */
     21
     22//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
     23
     24//config:
     25//config:config FEATURE_VOLUMEID_REISERFS
     26//config:   bool "Reiser filesystem"
     27//config:   default y
     28//config:   depends on VOLUMEID
     29//config:   help
     30//config:     TODO
     31//config:
    2132
    2233#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/romfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_ROMFS
     25//config:   bool "romfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/sysv.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_SYSV
     25//config:   bool "sysv filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/udf.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_UDF
     25//config:   bool "udf filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_highpoint.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
     25//config:###    bool "highpoint raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_hpfs.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_HPFS
     25//config:###    bool "hpfs filesystem"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_isw_raid.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_ISWRAID
     25//config:###    bool "intel raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_lsi_raid.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_LSIRAID
     25//config:###    bool "lsi raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_lvm.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_LVM
     25//config:###    bool "lvm"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_mac.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_MAC
     25//config:###    bool "mac filesystem"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_minix.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_MINIX
     25//config:###    bool "minix filesystem"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_msdos.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_MSDOS
     25//config:###    bool "msdos filesystem"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"
    … …  
    166177                    id->partition_count = 4;
    167178
    168                 p = &id->partitions[id->partition_count];
     179//              p = &id->partitions[id->partition_count];
    169180
    170181//              if (is_raid(part[i].sys_ind))

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_nvidia_raid.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_NVIDIARAID
     25//config:###    bool "nvidia raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_promise_raid.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_PROMISERAID
     25//config:###    bool "promise raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_silicon_raid.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_SILICONRAID
     25//config:###    bool "silicon raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_ufs.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_UFS
     25//config:###    bool "ufs filesystem"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/unused_via_raid.c

    r2725 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
     22
     23//config:
     24//config:### config FEATURE_VOLUMEID_VIARAID
     25//config:###    bool "via raid"
     26//config:###    default y
     27//config:###    depends on VOLUMEID
     28//config:###    help
     29//config:###      TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"

  • branches/3.3/mindi-busybox/util-linux/volume_id/volume_id.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_VOLUMEID) += volume_id.o util.o
    2022
    2123#include "volume_id_internal.h"
    … …  
    106108    volume_id_probe_xfs,
    107109#endif
     110#if ENABLE_FEATURE_VOLUMEID_BCACHE
     111    volume_id_probe_bcache,
     112#endif
    108113};
    109114
    … …  
    136141#if ENABLE_FEATURE_VOLUMEID_UFS
    137142    volume_id_probe_ufs,
     143#endif
     144#if ENABLE_FEATURE_VOLUMEID_F2FS
     145    volume_id_probe_f2fs,
    138146#endif
    139147#if ENABLE_FEATURE_VOLUMEID_NILFS

  • branches/3.3/mindi-busybox/util-linux/volume_id/volume_id_internal.h

    r3232 r3621  
    9797#define SEEK_BUFFER_SIZE            0x10000
    9898
    99 #define bswap16(x) (uint16_t)   ( \
    100                 (((uint16_t)(x) & 0x00ffu) << 8) | \
    101                 (((uint16_t)(x) & 0xff00u) >> 8))
    102 
    103 #define bswap32(x) (uint32_t)   ( \
    104                 (((uint32_t)(x) & 0xff000000u) >> 24) | \
    105                 (((uint32_t)(x) & 0x00ff0000u) >>  8) | \
    106                 (((uint32_t)(x) & 0x0000ff00u) <<  8) | \
    107                 (((uint32_t)(x) & 0x000000ffu) << 24))
    108 
    109 #define bswap64(x) (uint64_t)   ( \
    110                 (((uint64_t)(x) & 0xff00000000000000ull) >> 56) | \
    111                 (((uint64_t)(x) & 0x00ff000000000000ull) >> 40) | \
    112                 (((uint64_t)(x) & 0x0000ff0000000000ull) >> 24) | \
    113                 (((uint64_t)(x) & 0x000000ff00000000ull) >>  8) | \
    114                 (((uint64_t)(x) & 0x00000000ff000000ull) <<  8) | \
    115                 (((uint64_t)(x) & 0x0000000000ff0000ull) << 24) | \
    116                 (((uint64_t)(x) & 0x000000000000ff00ull) << 40) | \
    117                 (((uint64_t)(x) & 0x00000000000000ffull) << 56))
    118 
    11999#if BB_LITTLE_ENDIAN
    120 #define le16_to_cpu(x) (x)
    121 #define le32_to_cpu(x) (x)
    122 #define le64_to_cpu(x) (x)
    123 #define be16_to_cpu(x) bswap16(x)
    124 #define be32_to_cpu(x) bswap32(x)
    125 #define cpu_to_le16(x) (x)
    126 #define cpu_to_le32(x) (x)
    127 #define cpu_to_be32(x) bswap32(x)
     100# define le16_to_cpu(x) (uint16_t)(x)
     101# define le32_to_cpu(x) (uint32_t)(x)
     102# define le64_to_cpu(x) (uint64_t)(x)
     103# define be16_to_cpu(x) (uint16_t)(bswap_16(x))
     104# define be32_to_cpu(x) (uint32_t)(bswap_32(x))
     105# define cpu_to_le16(x) (uint16_t)(x)
     106# define cpu_to_le32(x) (uint32_t)(x)
     107# define cpu_to_be32(x) (uint32_t)(bswap_32(x))
    128108#else
    129 #define le16_to_cpu(x) bswap16(x)
    130 #define le32_to_cpu(x) bswap32(x)
    131 #define le64_to_cpu(x) bswap64(x)
    132 #define be16_to_cpu(x) (x)
    133 #define be32_to_cpu(x) (x)
    134 #define cpu_to_le16(x) bswap16(x)
    135 #define cpu_to_le32(x) bswap32(x)
    136 #define cpu_to_be32(x) (x)
     109# define le16_to_cpu(x) (uint16_t)(bswap_16(x))
     110# define le32_to_cpu(x) (uint32_t)(bswap_32(x))
     111# define le64_to_cpu(x) (uint64_t)(bb_bswap_64(x))
     112# define be16_to_cpu(x) (uint16_t)(x)
     113# define be32_to_cpu(x) (uint32_t)(x)
     114# define cpu_to_le16(x) (uint16_t)(bswap_16(x))
     115# define cpu_to_le32(x) (uint32_t)(bswap_32(x))
     116# define cpu_to_be32(x) (uint32_t)(x)
    137117#endif
    138118
    … …  
    190170/* FS */
    191171
     172int FAST_FUNC volume_id_probe_bcache(struct volume_id *id /*,uint64_t off*/);
     173
    192174int FAST_FUNC volume_id_probe_btrfs(struct volume_id *id /*,uint64_t off*/);
    193175
    … …  
    216198//int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);
    217199
     200int FAST_FUNC volume_id_probe_f2fs(struct volume_id *id /*,uint64_t off*/);
     201
    218202int FAST_FUNC volume_id_probe_nilfs(struct volume_id *id /*,uint64_t off*/);
    219203

  • branches/3.3/mindi-busybox/util-linux/volume_id/xfs.c

    r3232 r3621  
    1818 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    1919 */
     20
     21//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
     22
     23//config:
     24//config:config FEATURE_VOLUMEID_XFS
     25//config:   bool "xfs filesystem"
     26//config:   default y
     27//config:   depends on VOLUMEID
     28//config:   help
     29//config:     TODO
     30//config:
    2031
    2132#include "volume_id_internal.h"
Note: See TracChangeset for help on using the changeset viewer.