[LTP] [RFC PATCH] build: Remove {config.h, config.mk, features.mk, }.default
Petr Vorel
pvorel@suse.cz
Mon Nov 4 07:41:19 CET 2019
Nowadays most distributions have autoconf, we can require it.
include/config.h.default was outdated anyway.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Hi,
BTW INSTALL needs update. doc/mini-howto-building-ltp-from-git.txt is in
much better shape, but contains just compilation from git.
I'd either create single markdown page doc/installation.txt, which would
contain both installation from tarball and git (preferred) or had 2 separate pages.
And INSTALL only contain see doc/*.
Kind regards,
Petr
INSTALL | 28 +---
include/config.h.default | 241 ---------------------------------
include/mk/config.mk.default | 77 -----------
include/mk/features.mk.default | 49 -------
4 files changed, 7 insertions(+), 388 deletions(-)
delete mode 100644 include/config.h.default
delete mode 100644 include/mk/config.mk.default
delete mode 100644 include/mk/features.mk.default
diff --git a/INSTALL b/INSTALL
index 6e3b26e24..3d86415a9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -38,32 +38,18 @@ downloaded from:
Configuration
-------------------
-Using autoconf (preferred):
- $ make autotools # This must be run from "$TOP_SRCDIR"!
- $ test -d "$TOP_BUILDDIR" || mkdir -p "$TOP_BUILDDIR"
- $ cd "$TOP_BUILDDIR" && "$TOP_SRCDIR/configure" \
- # [configure args go here, e.g. CC=$CC, LDFLAGS=$LDFLAGS, etc]
-
-Not using autoconf:
-
- $ test -d "$TOP_BUILDDIR" || mkdir -p "$TOP_BUILDDIR"
- $ cp "$TOP_SRCDIR/include/config.h.default" \
- "$TOP_BUILDDIR/include/config.h"
- $ cp "$TOP_SRCDIR/include/mk/config.mk.default" \
- "$TOP_BUILDDIR/include/mk/config.mk"
- $ cp "$TOP_SRCDIR/include/mk/features.mk.default" \
- "$TOP_BUILDDIR/include/mk/features.mk"
-
- # Fire up your favorite editor and set each value appropriately in
- # include/mk/config.mk. Uncomment all values commented out, such as
- # NUMA_LIBS, etc, but only if you're sure that the libraries exist and
- # can be linked on your system.
+Configuration requires autoconf:
+
+ $ cd $TOP_SRCDIR
+ $ make autotools
+ $ mkdir -p $TOP_BUILDDIR
+ $ cd $TOP_BUILDDIR && ./configure # configure args go here, e.g. CC=$CC, LDFLAGS=$LDFLAGS, etc
- $TOP_SRCDIR and $TOP_BUILDDIR are the same for in-build-tree scenarios.
- $TOP_SRCDIR and $TOP_BUILDDIR differ for out-of-build-tree scenarios.
See the In-build-tree and Out-of-build-tree sections below for more details on
-what to do next...
+what to do next.
Compiling LTP
-------------------
diff --git a/include/config.h.default b/include/config.h.default
deleted file mode 100644
index 9490b08c5..000000000
--- a/include/config.h.default
+++ /dev/null
@@ -1,241 +0,0 @@
-/* include/config.h.default.
- A semi-sane set of defaults for more recent Linux platforms. Please tailor
- to meet your needs.
- */
-
-/* Define to 1 if you have the new implementation of quotactl that only
- requires sys/types.h and sys/quota.h */
-#define HAS_NEW_MINIMAL_QUOTACTL 1
-
-/* Define to 1 if you have the RHEL 4.8+ version of quotactl, e.g. require
- sys/quota.h */
-#define HAS_RHEL48_QUOTACTL
-
-/* Define to 1 if you have the <asm/ldt.h> header file. */
-#undef HAVE_ASM_LDT_H
-
-/* Define to 1 if you have the <sys/xattr.h> header file. */
-#undef HAVE_SYS_XATTR_H
-
-/* Define to 1 if you have the declaration of `CAP_BSET_DROP', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_BSET_DROP
-
-/* Define to 1 if you have the declaration of `CAP_BSET_READ', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_BSET_READ
-
-/* Define to 1 if you have the declaration of `cap_compare', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_COMPARE
-
-/* Define to 1 if you have the declaration of `cap_free', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_FREE
-
-/* Define to 1 if you have the declaration of `cap_from_text', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_FROM_TEXT
-
-/* Define to 1 if you have the declaration of `cap_get_proc', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_GET_PROC
-
-/* Define to 1 if you have the declaration of `cap_set_file', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_SET_FILE
-
-/* Define to 1 if you have the declaration of `cap_set_flag', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_SET_FLAG
-
-/* Define to 1 if you have the declaration of `cap_set_proc', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_SET_PROC
-
-/* Define to 1 if you have the declaration of `cap_to_text', and to 0 if you
- don't. */
-#undef HAVE_DECL_CAP_TO_TEXT
-
-/* Define to 1 if you have the declaration of `PR_CAPBSET_READ', and to 0 if
- you don't. */
-#undef HAVE_DECL_PR_CAPBSET_READ
-
-/* Define to 1 if you have the declaration of `PTRACE_GETSIGINFO', and to 0 if
- you don't. */
-#define HAVE_DECL_PTRACE_GETSIGINFO 1
-
-/* Define to 1 if you have the declaration of `PTRACE_O_TRACEVFORKDONE', and
- to 0 if you don't. */
-#define HAVE_DECL_PTRACE_O_TRACEVFORKDONE 1
-
-/* Define to 1 if you have the declaration of `PTRACE_SETOPTIONS', and to 0 if
- you don't. */
-#undef HAVE_DECL_PTRACE_SETOPTIONS
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#define HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `io_set_eventfd' function. */
-#undef HAVE_IO_SET_EVENTFD
-
-/* Define to 1 if you have the <libaio.h> header file. */
-#undef HAVE_LIBAIO_H
-
-/* Define to 1 if you have both SELinux libraries and headers. */
-#undef HAVE_LIBSELINUX_DEVEL
-
-/* Define to 1 if you have the <linux/genetlink.h> header file. */
-#undef HAVE_LINUX_GENETLINK_H
-
-/* Define to 1 if you have the <linux/module.h> header file. */
-#undef HAVE_LINUX_MODULE_H
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#undef HAVE_LINUX_NETLINK_H
-
-/* Define to 1 if you have the <linux/ptrace.h> header file. */
-#undef HAVE_LINUX_PTRACE_H
-
-/* Define to 1 if you have the <linux/signalfd.h> header file. */
-#undef HAVE_LINUX_SIGNALFD_H
-
-/* Define to 1 if you have the <linux/taskstats.h> header file. */
-#undef HAVE_LINUX_TASKSTATS_H
-
-/* Define to 1 if you have the <linux/types.h> header file. */
-#undef HAVE_LINUX_TYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <mm.h> header file. */
-#undef HAVE_MM_H
-
-/* Define to 1 if you have the `modify_ldt' function. */
-#undef HAVE_MODIFY_LDT
-
-/* 2.6 version of swapon/swapoff */
-#define HAVE_NEW_SWAPONOFF 1
-
-/* Define to 1 if you have the <numa.h> header file. */
-#undef HAVE_NUMA_H
-
-/* 2.4 version of swapon/swapoff */
-#undef HAVE_OLD_SWAPONOFF
-
-/* Define to 1 if you have the <openssl/sha.h> header file. */
-#undef HAVE_OPENSSL_SHA_H
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
-/* Define to 1 if you have the <selinux/selinux.h> header file. */
-#undef HAVE_SELINUX_SELINUX_H
-
-/* Define to 1 if you have the `signalfd' function. */
-#define HAVE_SIGNALFD 1
-
-/* Define to 1 if you have the <signalfd.h> header file. */
-#define HAVE_SIGNALFD_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if the system has the type `struct modify_ldt_ldt_s'. */
-#undef HAVE_STRUCT_MODIFY_LDT_LDT_S
-
-/* Define to 1 if the system has the type `struct ptrace_peeksiginfo_args'. */
-#undef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-
-/* Define to 1 if `signo' is member of `struct signalfd_siginfo'. */
-#undef HAVE_STRUCT_SIGNALFD_SIGINFO_SIGNO
-
-/* Define to 1 if `ssi_signo' is member of `struct signalfd_siginfo'. */
-#undef HAVE_STRUCT_SIGNALFD_SIGINFO_SSI_SIGNO
-
-/* Define to 1 if `freepages_count' is member of `struct taskstats'. */
-#undef HAVE_STRUCT_TASKSTATS_FREEPAGES_COUNT
-
-/* Define to 1 if `nvcsw' is member of `struct taskstats'. */
-#undef HAVE_STRUCT_TASKSTATS_NVCSW
-
-/* Define to 1 if `read_bytes' is member of `struct taskstats'. */
-#undef HAVE_STRUCT_TASKSTATS_READ_BYTES
-
-/* Define to 1 if the system has the type `struct user_desc'. */
-#undef HAVE_STRUCT_USER_DESC
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-#define HAVE_SYS_ACL_H 1
-
-/* Define to 1 if you have the <sys/capability.h> header file. */
-#define HAVE_SYS_CAPABILITY_H 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-#define HAVE_SYS_EPOLL_H 1
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-#define HAVE_SYS_INOTIFY_H 1
-
-/* Define to 1 if you have the <sys/prctl.h> header file. */
-#undef HAVE_SYS_PRCTL_H
-
-/* Define to 1 if you have the <sys/signalfd.h> header file. */
-#undef HAVE_SYS_SIGNALFD_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `unshare' function. */
-#undef HAVE_UNSHARE
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#undef YYTEXT_POINTER
-
-/*
- * vim: syntax=c
- */
diff --git a/include/mk/config.mk.default b/include/mk/config.mk.default
deleted file mode 100644
index 857067cb3..000000000
--- a/include/mk/config.mk.default
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# config.mk.in.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Ngie Cooper, July 2009
-#
-
-# See this page for more info about LEX*:
-# http://www.gnu.org/software/hello/manual/autoconf/Particular-Programs.html
-
-# Application specifying variables. You should never have to change these.
-AR := $(CROSS_COMPILE)ar
-CC := $(CROSS_COMPILE)cc
-LEX := flex
-RANLIB := $(CROSS_COMPILE)ranlib
-STRIP := $(CROSS_COMPILE)strip
-YACC := bison -y
-
-#JAR := jar
-#JAVAC := javac
-
-#AIO_LIBS := -laio
-#CAP_LIBS := -lcap
-#ACL_LIBS := -lacl
-#CRYPTO_LIBS := -lcrypto
-#LEXLIB := -lfl
-#NUMA_LIBS := -lnuma
-#SELINUX_LIBS := -lselinux
-#TIRPC_CPPFLAGS := -I/usr/include/tirpc
-#TIRPC_LIBS := -ltirpc
-
-prefix := /opt/ltp
-
-datarootdir := ${prefix}/share
-includedir := ${prefix}/include
-exec_prefix := ${prefix}
-bindir := ${exec_prefix}/bin
-libdir := ${exec_prefix}/lib
-mandir := ${datarootdir}/man
-
-CPPFLAGS :=
-CFLAGS := -g -O2
-LDLIBS :=
-LDFLAGS :=
-
-DEBUG_CFLAGS ?= -g
-
-# Please see README.mk-devel about -fstrict-aliasing.
-OPT_CFLAGS ?= -O2 -fno-strict-aliasing -pipe
-
-WCFLAGS ?= -Wall
-
-LDFLAGS += $(WLDFLAGS)
-CFLAGS += $(DEBUG_CFLAGS) $(OPT_CFLAGS) $(WCFLAGS)
-
-LINUX_VERSION :=
-LINUX_DIR :=
-LINUX_VERSION_MAJOR :=
-LINUX_VERSION_PATCH :=
-WITH_MODULES := no
-
-export datarootdir includedir libdir mandir prefix
diff --git a/include/mk/features.mk.default b/include/mk/features.mk.default
deleted file mode 100644
index 3a6cc5176..000000000
--- a/include/mk/features.mk.default
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# features.mk.default - feature tuning include Makefile.
-#
-# Copyright (C) 2010, Linux Test Project.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Ngie Cooper, October 2010
-#
-
-# Tools enable knobs
-WITH_EXPECT := no
-
-WITH_PERL := no
-
-WITH_PYTHON := no
-
-# Features knobs
-
-# Test suite knobs
-
-# Enable testcases/kernel/power_management's compile and install?
-ifeq ($(UCLINUX),1)
-WITH_POWER_MANAGEMENT_TESTSUITE := no
-else
-WITH_POWER_MANAGEMENT_TESTSUITE := yes
-endif
-
-# Enable testcases/open_posix_testsuite's compile and install?
-WITH_OPEN_POSIX_TESTSUITE := no
-
-# Enable testcases/realtime's compile and install?
-ifeq ($(UCLINUX),1)
-WITH_REALTIME_TESTSUITE := no
-else
-WITH_REALTIME_TESTSUITE := no
-endif
--
2.23.0
More information about the ltp
mailing list