diff --git a/Config.in.legacy b/Config.in.legacy index 053f5c7c77..cf8e57bc4d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.02.11" +config BR2_PACKAGE_CVS + bool "cvs has been removed" + select BR2_LEGACY + help + The cvs project was no longer maintained upstream, broken + with GCC 14.x, so it was removed. + config BR2_PACKAGE_CRIU bool "criu has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 2dd7d4ec3e..917b662a71 100644 --- a/package/Config.in +++ b/package/Config.in @@ -174,7 +174,6 @@ menu "Development tools" source "package/cppunit/Config.in" source "package/cukinia/Config.in" source "package/cunit/Config.in" - source "package/cvs/Config.in" source "package/cxxtest/Config.in" source "package/diffutils/Config.in" source "package/dos2unix/Config.in" diff --git a/package/cvs/Config.in b/package/cvs/Config.in deleted file mode 100644 index e8f0606ecc..0000000000 --- a/package/cvs/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_CVS - bool "cvs" - depends on BR2_USE_WCHAR - # needs fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_NCURSES - help - Concurrent Versions System - source code revision control - tools. - - http://www.nongnu.org/cvs/ - -if BR2_PACKAGE_CVS - -config BR2_PACKAGE_CVS_SERVER - bool "server support" - help - Enable cvs server code - -endif - -comment "cvs needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package/cvs/cvs.hash b/package/cvs/cvs.hash deleted file mode 100644 index 7b03a552d0..0000000000 --- a/package/cvs/cvs.hash +++ /dev/null @@ -1,8 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs/cvs_1.12.13-12%2Bsqueeze1.dsc -sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz -sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz - -# Hash for license files, locally computed -sha256 569c5b876327d899cf444b2277fe910128a38ca71d90755fe4125dd44f8ece02 COPYING -sha256 da0e282103fb508894e78db519aab255e36971ce0bc87de585e3b05014b83b1e COPYING.LIB -sha256 ee9a2fbdb626c0ac57fd8e569f357eb2e6d6c80cc6f41efa8bd126d5ea589d72 lib/glob-libc.h diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk deleted file mode 100644 index cf9127fc3a..0000000000 --- a/package/cvs/cvs.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# cvs -# -################################################################################ - -CVS_VERSION = 1.12.13 -CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz -CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz -CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs -CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob) -CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h -CVS_CPE_ID_VENDOR = gnu -CVS_SELINUX_MODULES = apache cvs -CVS_DEPENDENCIES = ncurses - -CVS_CONF_ENV = \ - ac_cv_func_working_mktime=yes \ - cvs_cv_func_printf_ptr=yes - -CVS_CONF_OPTS = \ - --disable-old-info-format-support \ - --with-editor=/bin/vi -ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONF_OPTS += --enable-server -else -CVS_CONF_OPTS += --disable-server -endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONF_OPTS += --with-external-zlib -endif - -define CVS_BZIP_UNPACK - $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | $(TAR) -C $(BUILD_DIR) $(TAR_OPTIONS) - - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 -endef - -CVS_POST_PATCH_HOOKS += CVS_BZIP_UNPACK - -ifneq ($(CVS_PATCH),) -define CVS_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - (cd $(@D)/debian/patches && for i in *; \ - do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \ - done; \ - ); \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*; \ - fi -endef -endif - -CVS_POST_PATCH_HOOKS += CVS_DEBIAN_PATCHES - -define CVS_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs -endef - -$(eval $(autotools-package))