From 546d9904029548ed86b52c893fbb55796061046d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 5 May 2013 22:35:44 +0200 Subject: [PATCH] Fuse is not used by anything, kill it --- defaults/software.sh | 5 ----- gen_compile.sh | 21 --------------------- gen_determineargs.sh | 2 -- maintenance/docmatcher.py | 2 +- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/defaults/software.sh b/defaults/software.sh index 7df937e..e77a306 100644 --- a/defaults/software.sh +++ b/defaults/software.sh @@ -19,11 +19,6 @@ ISCSI_DIR="${ISCSI_DIR:-open-iscsi-${ISCSI_VER}}" ISCSI_SRCTAR="${ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${ISCSI_VER}.tar.gz}" ISCSI_BINCACHE="${ISCSI_BINCACHE:-%%CACHE%%/iscsi-${ISCSI_VER}-%%ARCH%%.bz2}" -FUSE_VER="${FUSE_VER:-VERSION_FUSE}" -FUSE_DIR="${FUSE_DIR:-fuse-${FUSE_VER}}" -FUSE_SRCTAR="${FUSE_SRCTAR:-${DISTDIR}/fuse-${FUSE_VER}.tar.gz}" -FUSE_BINCACHE="${FUSE_BINCACHE:-%%CACHE%%/fuse-${FUSE_VER}-%%ARCH%%.tar.bz2}" - GPG_VER="${GPG_VER:-VERSION_GPG}" GPG_DIR="${GPG_DIR:-gnupg-${GPG_VER}}" GPG_SRCTAR="${GPG_SRCTAR:-${DISTDIR}/gnupg-${GPG_VER}.tar.bz2}" diff --git a/gen_compile.sh b/gen_compile.sh index 0e971f0..90c38cd 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -403,27 +403,6 @@ compile_busybox() { fi } -compile_fuse() { - if [ ! -f "${FUSE_BINCACHE}" ] - then - [ ! -f "${FUSE_SRCTAR}" ] && - gen_die "Could not find fuse source tarball: ${FUSE_SRCTAR}. Please place it there, or place another version, changing /etc/genkernel.conf as necessary!" - cd "${TEMP}" - rm -rf "${FUSE_DIR}" - tar -zxpf "${FUSE_SRCTAR}" - [ ! -d "${FUSE_DIR}" ] && - gen_die "fuse directory ${FUSE_DIR} invalid" - cd "${FUSE_DIR}" - apply_patches fuse ${FUSE_VER} - print_info 1 'fuse: >> Configuring...' - ./configure --disable-example >> ${LOGFILE} 2>&1 || - gen_die 'Configuring fuse failed!' - print_info 1 'fuse: >> Compiling...' - MAKE=${UTILS_MAKE} compile_generic "" "" - cd "${TEMP}" - fi -} - compile_iscsi() { if [ ! -f "${ISCSI_BINCACHE}" ] then diff --git a/gen_determineargs.sh b/gen_determineargs.sh index bd1e4ed..8aad597 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -143,7 +143,6 @@ determine_real_args() { BUSYBOX_BINCACHE=`cache_replace "${BUSYBOX_BINCACHE}"` ISCSI_BINCACHE=`cache_replace "${ISCSI_BINCACHE}"` BLKID_BINCACHE=`cache_replace "${BLKID_BINCACHE}"` - FUSE_BINCACHE=`cache_replace "${FUSE_BINCACHE}"` GPG_BINCACHE=`cache_replace "${GPG_BINCACHE}"` DEFAULT_KERNEL_CONFIG=`arch_replace "${DEFAULT_KERNEL_CONFIG}"` @@ -151,7 +150,6 @@ determine_real_args() { BUSYBOX_BINCACHE=`arch_replace "${BUSYBOX_BINCACHE}"` ISCSI_BINCACHE=`arch_replace "${ISCSI_BINCACHE}"` BLKID_BINCACHE=`arch_replace "${BLKID_BINCACHE}"` - FUSE_BINCACHE=`arch_replace "${FUSE_BINCACHE}"` GPG_BINCACHE=`arch_replace "${GPG_BINCACHE}"` if [ -n "${CMD_BOOTLOADER}" ] diff --git a/maintenance/docmatcher.py b/maintenance/docmatcher.py index 2802e9e..5a4b0d8 100644 --- a/maintenance/docmatcher.py +++ b/maintenance/docmatcher.py @@ -19,7 +19,7 @@ NON_CONFIG_VARIABLES = ('BUILD_KERNEL', 'BUILD_MODULES', 'BUILD_RAMDISK', EXTRA_VARIABLES = ['ARCH_OVERRIDE', 'BOOTLOADER', 'CLEAR_CACHE_DIR', 'DEFAULT_KERNEL_SOURCE', 'DISTDIR', 'GK_SHARE', 'BUSYBOX_APPLETS'] -for app in ('DEVICE_MAPPER', 'BUSYBOX', 'DMRAID', 'LVM', 'ISCSI', 'FUSE', 'GPG', 'MDADM'): +for app in ('DEVICE_MAPPER', 'BUSYBOX', 'DMRAID', 'LVM', 'ISCSI', 'GPG', 'MDADM'): for prop in ('DIR', 'SRCTAR', 'VER'): EXTRA_VARIABLES.append('%s_%s' % (app, prop)) EXTRA_VARIABLES = tuple(EXTRA_VARIABLES)