mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
package/lockdev: remove package
The package was removed from Debian in 2016: https://tracker.debian.org/news/738763/removed-103-16-from-unstable/ "Obsolete and replaced by flock" and causes build errors with musl. Fixes: https://autobuild.buildroot.net/results/9fa/9fa9323bac3ee1720396bb34fefb3017125e5a85/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
5f9d8b6e54
commit
f6e0678ba8
@@ -607,7 +607,6 @@ package/lmbench/0002-src-Makefile-add-lmbench-to-list-of-executables.patch lib_p
|
|||||||
package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch lib_patch.Upstream
|
package/lmbench/0003-TOO_LONG-100-usec-to-prevent-memsize-from-timingout-.patch lib_patch.Upstream
|
||||||
package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch lib_patch.Upstream
|
package/lmbench/0004-Fix-garbage-pointer-for-lat_rpc-S-localhost.patch lib_patch.Upstream
|
||||||
package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch lib_patch.Upstream
|
package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch lib_patch.Upstream
|
||||||
package/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch lib_patch.Upstream
|
|
||||||
package/lockfile-progs/0001-sus3v-legacy.patch lib_patch.Sob lib_patch.Upstream
|
package/lockfile-progs/0001-sus3v-legacy.patch lib_patch.Sob lib_patch.Upstream
|
||||||
package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch lib_patch.Upstream
|
package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch lib_patch.Upstream
|
||||||
package/ltrace/0001-arm-plt.patch lib_patch.Upstream
|
package/ltrace/0001-arm-plt.patch lib_patch.Upstream
|
||||||
|
|||||||
@@ -146,6 +146,13 @@ endif
|
|||||||
|
|
||||||
comment "Legacy options removed in 2026.02"
|
comment "Legacy options removed in 2026.02"
|
||||||
|
|
||||||
|
config BR2_PACKAGE_LOCKDEV
|
||||||
|
bool "lockdev removed"
|
||||||
|
select BR2_LEGACY
|
||||||
|
help
|
||||||
|
lockdev was no longer maintained upstream, so it has been
|
||||||
|
dropped.
|
||||||
|
|
||||||
config BR2_PACKAGE_DBUS_TRIGGERD
|
config BR2_PACKAGE_DBUS_TRIGGERD
|
||||||
bool "dbus-triggerd removed"
|
bool "dbus-triggerd removed"
|
||||||
select BR2_LEGACY
|
select BR2_LEGACY
|
||||||
|
|||||||
@@ -1699,7 +1699,6 @@ menu "Filesystem"
|
|||||||
source "package/liblockfile/Config.in"
|
source "package/liblockfile/Config.in"
|
||||||
source "package/libnfs/Config.in"
|
source "package/libnfs/Config.in"
|
||||||
source "package/libsysfs/Config.in"
|
source "package/libsysfs/Config.in"
|
||||||
source "package/lockdev/Config.in"
|
|
||||||
source "package/physfs/Config.in"
|
source "package/physfs/Config.in"
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
From 0dcd2368c3e23a5cc1cc4a979d9c241ed9302236 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Romain Naour <romain.naour@openwide.fr>
|
|
||||||
Date: Sun, 4 Jan 2015 16:06:07 +0100
|
|
||||||
Subject: [PATCH] Makefile: install static library and headers separately
|
|
||||||
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
|
||||||
---
|
|
||||||
Makefile | 12 +++++++-----
|
|
||||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index e27dcbd..ecf52d1 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -45,12 +45,10 @@ perl-lib: static
|
|
||||||
cd LockDev && make OPTIMIZE="-O2 -g -Wall"
|
|
||||||
cd LockDev && make test
|
|
||||||
|
|
||||||
-.PHONY: install install_dev install_dbg install_doc install_run
|
|
||||||
-install: install_dev install_dbg install_doc install_run
|
|
||||||
+.PHONY: install install_dev install_dbg install_doc install_run install_static
|
|
||||||
+install: install_dev install_dbg install_doc install_run install_static
|
|
||||||
|
|
||||||
-install_dev: ${static} src/lockdev.h
|
|
||||||
- install -m755 -d ${libdir}
|
|
||||||
- install -m644 ${static} ${libdir}
|
|
||||||
+install_dev: src/lockdev.h
|
|
||||||
install -m755 -d ${incdir}
|
|
||||||
install -m644 src/lockdev.h ${incdir}
|
|
||||||
install -m644 src/ttylock.h ${incdir}
|
|
||||||
@@ -69,6 +67,10 @@ install_doc: docs/lockdev.3
|
|
||||||
install -m755 -d ${mandir}/man3
|
|
||||||
install -m644 docs/lockdev.3 ${mandir}/man3
|
|
||||||
|
|
||||||
+install_static: ${static}
|
|
||||||
+ install -m755 -d ${libdir}
|
|
||||||
+ install -m644 ${static} ${libdir}
|
|
||||||
+
|
|
||||||
install_run: ${shared}
|
|
||||||
install -m755 -d ${libdir}
|
|
||||||
install -m644 ${shared} ${libdir}
|
|
||||||
--
|
|
||||||
1.9.3
|
|
||||||
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
config BR2_PACKAGE_LOCKDEV
|
|
||||||
bool "lockdev"
|
|
||||||
help
|
|
||||||
Library for locking devices.
|
|
||||||
|
|
||||||
No upstream site, primary site is Debian.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_1.0.3-1.6.dsc
|
|
||||||
sha256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82 lockdev_1.0.3.orig.tar.gz
|
|
||||||
sha256 a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e lockdev_1.0.3-1.6.diff.gz
|
|
||||||
# Locally calculated
|
|
||||||
sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 LICENSE
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
#
|
|
||||||
# lockdev
|
|
||||||
#
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
LOCKDEV_VERSION_MAJOR = 1
|
|
||||||
LOCKDEV_VERSION = $(LOCKDEV_VERSION_MAJOR).0.3
|
|
||||||
LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz
|
|
||||||
LOCKDEV_PATCH = lockdev_$(LOCKDEV_VERSION)-1.6.diff.gz
|
|
||||||
LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev
|
|
||||||
LOCKDEV_LICENSE = LGPL-2.1
|
|
||||||
LOCKDEV_LICENSE_FILES = LICENSE
|
|
||||||
LOCKDEV_INSTALL_STAGING = YES
|
|
||||||
|
|
||||||
ifeq ($(BR2_STATIC_LIBS),y)
|
|
||||||
LOCKDEV_BUILD_ARGS = static
|
|
||||||
LOCKDEV_INSTALL_ARGS = install_static
|
|
||||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
|
||||||
LOCKDEV_BUILD_ARGS = static shared
|
|
||||||
LOCKDEV_INSTALL_ARGS = install_run install_static
|
|
||||||
else # BR2_SHARED_LIBS
|
|
||||||
LOCKDEV_BUILD_ARGS = shared
|
|
||||||
LOCKDEV_INSTALL_ARGS = install_run
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Make the code believe we are using a C library compatible with
|
|
||||||
# glibc, which for the purpose of lockdev is actually true.
|
|
||||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
|
|
||||||
LOCKDEV_BUILD_ARGS += CFLAGS="$(TARGET_CFLAGS) -D__GNU_LIBRARY__"
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BR2_SHARED_STATIC_LIBS)$(BR2_SHARED_LIBS),y)
|
|
||||||
define LOCKDEV_CREATE_LINKS_STAGING
|
|
||||||
ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so
|
|
||||||
ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define LOCKDEV_CREATE_LINKS_TARGET
|
|
||||||
ln -sf liblockdev.$(LOCKDEV_VERSION).so $(TARGET_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR)
|
|
||||||
endef
|
|
||||||
endif
|
|
||||||
|
|
||||||
define LOCKDEV_BUILD_CMDS
|
|
||||||
$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(LOCKDEV_BUILD_ARGS)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define LOCKDEV_INSTALL_STAGING_CMDS
|
|
||||||
$(MAKE1) basedir=$(STAGING_DIR)/usr -C $(@D) $(LOCKDEV_INSTALL_ARGS) install_dev
|
|
||||||
$(LOCKDEV_CREATE_LINKS_STAGING)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define LOCKDEV_INSTALL_TARGET_CMDS
|
|
||||||
$(MAKE1) basedir=$(TARGET_DIR)/usr -C $(@D) $(LOCKDEV_INSTALL_ARGS)
|
|
||||||
$(LOCKDEV_CREATE_LINKS_TARGET)
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(generic-package))
|
|
||||||
Reference in New Issue
Block a user