xfsprogs: update to 4.2.0.
This commit is contained in:
Christian Neukirchen
parent
a122da2d7f
commit
c4160b9737
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
crc32table.h: gen_crc32table.c
|
||||
- @echo " [CC] gen_crc32table"
|
||||
- $(Q) $(CC) $(CFLAGS) -o gen_crc32table $<
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
|
||||
+ @echo " [BUILD_CC] gen_crc32table"
|
||||
+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table $<
|
||||
@echo " [GENERATE] $@"
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
# disk.
|
||||
crc32selftest: gen_crc32table.c crc32table.h crc32.c
|
||||
@echo " [TEST] CRC32"
|
||||
- $(Q) $(CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
+ $(Q) $(BUILD_CC) $(BUILD_CFLAGS) -I. -I../include -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
$(Q) ./$@
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
|
||||
index 6f00b41..5b4af53 100644
|
||||
--- fsr/xfs_fsr.c
|
||||
+++ fsr/xfs_fsr.c
|
||||
@@ -44,6 +44,10 @@
|
||||
--- fsr/xfs_fsr.c.orig 2015-08-27 02:17:57.000000000 +0200
|
||||
+++ fsr/xfs_fsr.c 2015-10-03 21:15:14.888366570 +0200
|
||||
@@ -43,6 +43,10 @@
|
||||
#define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
|
||||
#define _PATH_PROC_MOUNTS "/proc/mounts"
|
||||
|
||||
|
|
@ -13,81 +11,58 @@ index 6f00b41..5b4af53 100644
|
|||
|
||||
char *progname;
|
||||
|
||||
diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
|
||||
index ac260bc..0e7fccf 100644
|
||||
--- include/platform_defs.h.in
|
||||
+++ include/platform_defs.h.in
|
||||
@@ -68,6 +68,32 @@ typedef __u64 __bitwise __be64;
|
||||
--- include/linux.h.orig 2015-08-04 01:37:12.000000000 +0200
|
||||
+++ include/linux.h 2015-10-03 21:19:02.256382607 +0200
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <endian.h>
|
||||
#include <stdbool.h>
|
||||
#include <asm/types.h>
|
||||
+#include <linux/limits.h> /* XATTR_SIZE_MAX */
|
||||
|
||||
typedef struct filldir filldir_t;
|
||||
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
|
||||
{
|
||||
@@ -140,6 +141,10 @@
|
||||
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
|
||||
#define EFSBADCRC EBADMSG /* Bad CRC detected */
|
||||
|
||||
+#ifndef __uint8_t
|
||||
+#define __uint8_t uint8_t
|
||||
+#endif
|
||||
+#ifndef __uint16_t
|
||||
+#define __uint16_t uint16_t
|
||||
+#endif
|
||||
+#ifndef __uint32_t
|
||||
+#define __uint32_t uint32_t
|
||||
+#endif
|
||||
+#ifndef __uint64_t
|
||||
+#define __uint64_t uint64_t
|
||||
+#ifndef loff_t
|
||||
+#define loff_t off_t
|
||||
+#endif
|
||||
+
|
||||
+#ifndef __int8_t
|
||||
+#define __int8_t int8_t
|
||||
+#endif
|
||||
+#ifndef __int16_t
|
||||
+#define __int16_t int16_t
|
||||
+#endif
|
||||
+#ifndef __int32_t
|
||||
+#define __int32_t int32_t
|
||||
+#endif
|
||||
+#ifndef __int64_t
|
||||
+#define __int64_t int64_t
|
||||
+#endif
|
||||
+
|
||||
#if defined(__linux__)
|
||||
#include <xfs/linux.h>
|
||||
#elif defined(__FreeBSD__)
|
||||
diff --git a/libhandle/handle.c b/libhandle/handle.c
|
||||
index 9a232fa..1db7772 100644
|
||||
--- libhandle/handle.c
|
||||
+++ libhandle/handle.c
|
||||
@@ -20,6 +20,9 @@
|
||||
#include <xfs/xfs.h>
|
||||
#include <xfs/handle.h>
|
||||
#include <xfs/parent.h>
|
||||
typedef loff_t xfs_off_t;
|
||||
typedef __uint64_t xfs_ino_t;
|
||||
typedef __uint32_t xfs_dev_t;
|
||||
--- libhandle/handle.c.orig 2015-10-03 21:15:14.890366562 +0200
|
||||
+++ libhandle/handle.c 2015-10-03 21:19:28.903266874 +0200
|
||||
@@ -21,6 +21,9 @@
|
||||
#include "xfs.h"
|
||||
#include "handle.h"
|
||||
#include "parent.h"
|
||||
+#if defined(__linux__)
|
||||
+#include <linux/limits.h>
|
||||
+#endif
|
||||
|
||||
/* just pick a value we know is more than big enough */
|
||||
#define MAXHANSIZ 64
|
||||
diff --git a/libhandle/jdm.c b/libhandle/jdm.c
|
||||
index 070407b..8dd6322 100644
|
||||
--- libhandle/jdm.c
|
||||
+++ libhandle/jdm.c
|
||||
@@ -20,6 +20,9 @@
|
||||
#include <xfs/handle.h>
|
||||
#include <xfs/jdm.h>
|
||||
#include <xfs/parent.h>
|
||||
--- libhandle/jdm.c.orig 2015-10-03 21:15:14.890366562 +0200
|
||||
+++ libhandle/jdm.c 2015-10-03 21:19:38.716224218 +0200
|
||||
@@ -21,6 +21,9 @@
|
||||
#include "handle.h"
|
||||
#include "jdm.h"
|
||||
#include "parent.h"
|
||||
+#if defined(__linux__)
|
||||
+#include <linux/limits.h>
|
||||
+#endif
|
||||
|
||||
/* internal fshandle - typecast to a void for external use */
|
||||
#define FSHANDLE_SZ 8
|
||||
diff --git a/libxfs/linux.c b/libxfs/linux.c
|
||||
index 2e07d54..4075786 100644
|
||||
--- libxfs/linux.c
|
||||
+++ libxfs/linux.c
|
||||
@@ -16,12 +16,9 @@
|
||||
--- libxfs/linux.c.orig 2015-08-03 02:39:42.000000000 +0200
|
||||
+++ libxfs/linux.c 2015-10-03 21:17:50.262694871 +0200
|
||||
@@ -16,11 +16,8 @@
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
-#define ustat __kernel_ustat
|
||||
#include <xfs/libxfs.h>
|
||||
#include <mntent.h>
|
||||
#include <sys/stat.h>
|
||||
-#undef ustat
|
||||
|
|
@ -95,7 +70,7 @@ index 2e07d54..4075786 100644
|
|||
#include <sys/mount.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/sysinfo.h>
|
||||
@@ -49,9 +46,12 @@ static int max_block_alignment;
|
||||
@@ -51,9 +48,12 @@
|
||||
int
|
||||
platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
|
||||
{
|
||||
|
|
@ -110,7 +85,7 @@ index 2e07d54..4075786 100644
|
|||
|
||||
if (!s) {
|
||||
if (stat64(block, &st) < 0)
|
||||
@@ -61,14 +61,25 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
|
||||
@@ -63,14 +63,25 @@
|
||||
s = &st;
|
||||
}
|
||||
|
||||
|
|
@ -139,24 +114,59 @@ index 2e07d54..4075786 100644
|
|||
}
|
||||
|
||||
int
|
||||
--- include/linux.h.orig 2014-11-10 15:20:54.601136271 +0100
|
||||
+++ include/linux.h 2014-11-10 15:21:35.905541676 +0100
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <getopt.h>
|
||||
#include <endian.h>
|
||||
#include <stdbool.h>
|
||||
+#include <linux/limits.h> /* XATTR_SIZE_MAX */
|
||||
--- include/xfs.h.orig 2015-08-04 01:37:12.000000000 +0200
|
||||
+++ include/xfs.h 2015-10-03 21:42:48.317971365 +0200
|
||||
@@ -33,6 +33,8 @@
|
||||
#ifndef __XFS_H__
|
||||
#define __XFS_H__
|
||||
|
||||
static __inline__ int xfsctl(const char *path, int fd, int cmd, void *p)
|
||||
{
|
||||
@@ -138,6 +139,10 @@ platform_discard_blocks(int fd, uint64_t
|
||||
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
|
||||
#define EFSBADCRC EBADMSG /* Bad CRC detected */
|
||||
+#include <xfs/xfs_types.h>
|
||||
+
|
||||
#if defined(__linux__)
|
||||
#include <xfs/linux.h>
|
||||
#elif defined(__FreeBSD__)
|
||||
@@ -60,7 +62,6 @@
|
||||
#define __user
|
||||
#endif
|
||||
|
||||
+#ifndef loff_t
|
||||
+#define loff_t off_t
|
||||
-#include <xfs/xfs_types.h>
|
||||
#include <xfs/xfs_fs.h>
|
||||
|
||||
#endif /* __XFS_H__ */
|
||||
--- libxfs/xfs_types.h.orig 2015-08-03 02:39:42.000000000 +0200
|
||||
+++ libxfs/xfs_types.h 2015-10-03 21:42:38.897015215 +0200
|
||||
@@ -18,6 +18,34 @@
|
||||
#ifndef __XFS_TYPES_H__
|
||||
#define __XFS_TYPES_H__
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
+#ifndef __uint8_t
|
||||
+#define __uint8_t uint8_t
|
||||
+#endif
|
||||
+#ifndef __uint16_t
|
||||
+#define __uint16_t uint16_t
|
||||
+#endif
|
||||
+#ifndef __uint32_t
|
||||
+#define __uint32_t uint32_t
|
||||
+#endif
|
||||
+#ifndef __uint64_t
|
||||
+#define __uint64_t uint64_t
|
||||
+#endif
|
||||
+
|
||||
typedef loff_t xfs_off_t;
|
||||
typedef __uint64_t xfs_ino_t;
|
||||
typedef __uint32_t xfs_dev_t;
|
||||
+#ifndef __int8_t
|
||||
+#define __int8_t int8_t
|
||||
+#endif
|
||||
+#ifndef __int16_t
|
||||
+#define __int16_t int16_t
|
||||
+#endif
|
||||
+#ifndef __int32_t
|
||||
+#define __int32_t int32_t
|
||||
+#endif
|
||||
+#ifndef __int64_t
|
||||
+#define __int64_t int64_t
|
||||
+#endif
|
||||
+
|
||||
typedef __uint32_t prid_t; /* project ID */
|
||||
|
||||
typedef __uint32_t xfs_agblock_t; /* blockno in alloc. group */
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
--- libxfs/xfs_attr_remote.c.orig
|
||||
+++ libxfs/xfs_attr_remote.c
|
||||
@@ -17,6 +17,7 @@
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#include <xfs.h>
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "xfs_trans_space.h"
|
||||
#include "xfs_trace.h"
|
||||
#include "xfs_cksum.h"
|
||||
+#include <linux/limits.h>
|
||||
|
||||
#define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */
|
||||
|
|
|
|||
|
|
@ -1,28 +1,24 @@
|
|||
# Template file for 'xfsprogs'
|
||||
pkgname=xfsprogs
|
||||
version=3.2.4
|
||||
revision=2
|
||||
version=4.2.0
|
||||
revision=1
|
||||
build_pie=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-readline=yes --enable-blkid=yes --enable-lib64=no"
|
||||
configure_args="--enable-readline=yes --enable-lib64=no"
|
||||
CFLAGS=-D_DIRENT_HAVE_D_RECLEN
|
||||
hostmakedepends="libuuid-devel"
|
||||
makedepends="libuuid-devel libblkid-devel readline-devel"
|
||||
short_desc="Utilities for managing the XFS filesystem"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="LGPL-2.1"
|
||||
homepage="http://oss.sgi.com/projects/xfs/"
|
||||
homepage="http://xfs.org/"
|
||||
distfiles="ftp://oss.sgi.com/projects/xfs/cmd_tars/${pkgname}-${version}.tar.gz"
|
||||
checksum=dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465
|
||||
checksum=3deab1ad0f4635e54053aa45add27bd48cd87a188c16ac60f4789e01730e5260
|
||||
|
||||
do_install() {
|
||||
make DIST_ROOT=${DESTDIR} install install-dev
|
||||
# Remove unneeded stuff
|
||||
make install install-dev DIST_ROOT=${DESTDIR} \
|
||||
PKG_ROOT_SBIN_DIR=/usr/bin PKG_ROOT_LIB_DIR=/usr/lib
|
||||
rm -rf ${DESTDIR}/usr/share/doc
|
||||
rm -f ${DESTDIR}/lib*/*.{a,la}
|
||||
rm -f ${DESTDIR}/usr/lib/*.{a,so}
|
||||
# Move stuff to /usr.
|
||||
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
|
||||
mv ${DESTDIR}/lib*/* ${DESTDIR}/usr/lib
|
||||
}
|
||||
|
||||
xfsprogs-devel_package() {
|
||||
|
|
@ -30,6 +26,7 @@ xfsprogs-devel_package() {
|
|||
short_desc+=" - development files"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove "usr/lib/*.a"
|
||||
vmove "usr/lib/*.so"
|
||||
vmove usr/share/man/man3
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue