Re: [ptxdist] [APPLIED] liblockfile: Remove after one year in staging

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as c983bfca76f465126e447cfd46d4f447e021eb54.

Michael

[sent from post-receive hook]

On Mon, 18 May 2026 09:53:52 +0200, Thorsten Scherer <t.scherer@eckelmann.de> wrote:
> Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
> Message-Id: <20260504121331.57729-16-t.scherer@eckelmann.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch b/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch
> deleted file mode 100644
> index 47e336fd4406..000000000000
> --- a/patches/liblockfile-1.08/0001-Makefile-make-ar-overwritable.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From a1c4d6082291b660ce4fda90f65d791e2fc84081 Mon Sep 17 00:00:00 2001
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Wed, 15 Jul 2009 21:57:59 +0200
> -Subject: [PATCH] [Makefile] make ar overwritable (for cross-builds)
> -
> -[wsa: Simplified a bit]
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> -Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> -
> ----
> -# wsa: 20091230: sent upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562937
> -
> - Makefile.in |    2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index 7ae5406..84fc5b7 100644
> ---- a/Makefile.in
> -+++ b/Makefile.in
> -@@ -29,7 +30,7 @@ shared:		liblockfile.so dotlockfile
> - nfslib:		nfslock.so.$(VER)
> - 
> - liblockfile.a:	lockfile.o
> --		ar rv liblockfile.a lockfile.o
> -+		$(AR) rv liblockfile.a lockfile.o
> - 
> - liblockfile.so: liblockfile.a
> - 		$(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
> --- 
> -1.6.3.3
> -
> diff --git a/patches/liblockfile-1.08/series b/patches/liblockfile-1.08/series
> deleted file mode 100644
> index 1de6f45b3620..000000000000
> --- a/patches/liblockfile-1.08/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-Makefile-make-ar-overwritable.patch
> diff --git a/rules/liblockfile.in b/rules/liblockfile.in
> deleted file mode 100644
> index 11cddce4d168..000000000000
> --- a/rules/liblockfile.in
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=disk_and_file
> -
> -config LIBLOCKFILE
> -	tristate
> -	prompt "liblockfile, dotlockfile"
> -	help
> -	  Dotlockfile is a command line utility to safely create,
> -	  test and remove lockfiles. Lockfiles are created in an
> -	  NFS-safe way. Dotlockfile can can also be used to lock
> -	  and unlock mailboxes even if the mailspool directory
> -	  is only writable by group mail. However, its use is not
> -	  restricted to mail
> -
> -	  STAGING: remove in PTXdist 2026.03.0
> -	  Unmaintained in PTXdist, fails to build with current toolchains.
> -	  Needs updating to the latest version.
> diff --git a/rules/liblockfile.make b/rules/liblockfile.make
> deleted file mode 100644
> index 06f3c8bd1850..000000000000
> --- a/rules/liblockfile.make
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2006 by Bjoern Buerger
> -#               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_LIBLOCKFILE) += liblockfile
> -
> -#
> -# Paths and names
> -#
> -LIBLOCKFILE_VERSION	:= 1.08
> -LIBLOCKFILE_MD5		:= c24e2dfb4a2aab0263fe5ac1564d305e
> -LIBLOCKFILE_SUFFIX	:= tar.gz
> -LIBLOCKFILE		:= liblockfile-$(LIBLOCKFILE_VERSION)
> -LIBLOCKFILE_TARBALL	:= liblockfile_$(LIBLOCKFILE_VERSION).orig.$(LIBLOCKFILE_SUFFIX)
> -LIBLOCKFILE_URL		:= http://snapshot.debian.org/archive/debian/20080725T000000Z/pool/main/libl/liblockfile/$(LIBLOCKFILE_TARBALL)
> -LIBLOCKFILE_SOURCE	:= $(SRCDIR)/$(LIBLOCKFILE_TARBALL)
> -LIBLOCKFILE_DIR		:= $(BUILDDIR)/liblockfile-$(LIBLOCKFILE_VERSION)
> -LIBLOCKFILE_LICENSE	:= GPL-2.0-or-later AND LGPL-2.0-or-later
> -LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -LIBLOCKFILE_MAKE_OPT	:= $(CROSS_ENV_AR)
> -LIBLOCKFILE_INSTALL_OPT	:= ROOT=$(PKGDIR)/$(LIBLOCKFILE) install
> -
> -#
> -# autoconf
> -#
> -LIBLOCKFILE_CONF_TOOL	:= autoconf
> -LIBLOCKFILE_CONF_OPT	:= $(CROSS_AUTOCONF_USR)
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/liblockfile.targetinstall:
> -	@$(call targetinfo)
> -
> -	@$(call install_init, liblockfile)
> -	@$(call install_fixup, liblockfile,PRIORITY,optional)
> -	@$(call install_fixup, liblockfile,SECTION,base)
> -	@$(call install_fixup, liblockfile,AUTHOR,"Bjoern Buerger <b.buerger@pengutronix.de>")
> -	@$(call install_fixup, liblockfile,DESCRIPTION,missing)
> -
> -	@$(call install_copy, liblockfile, 0, 0, 0755, -, /usr/bin/dotlockfile)
> -
> -	@$(call install_finish, liblockfile)
> -
> -	@$(call touch)
> -
> -# vim: syntax=make