From 8b2e235743260872bbd7753a41f8cf56a628260e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 10 Jan 2014 10:06:19 +0000 Subject: [PATCH] libnfc-llcp: rename to libllcp and bump version This package has been renamed upstream to libllcp. Also, the current package we have in Buildroot fails to compile due to a version bump of it's main dependence, libnfc. A version bump is required because this package has been adapted upstream to work with libnfc-1.7.0-rc6. Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- Config.in.legacy | 11 +++++++++++ package/Config.in | 2 +- package/{libnfc-llcp => libllcp}/Config.in | 6 +++--- package/libllcp/libllcp.mk | 17 +++++++++++++++++ package/libnfc-llcp/libnfc-llcp.mk | 15 --------------- 5 files changed, 32 insertions(+), 19 deletions(-) rename package/{libnfc-llcp => libllcp}/Config.in (56%) create mode 100644 package/libllcp/libllcp.mk delete mode 100644 package/libnfc-llcp/libnfc-llcp.mk diff --git a/Config.in.legacy b/Config.in.legacy index 01bf16be96..0526419387 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -98,6 +98,17 @@ comment "build, or run, in unpredictable ways. " comment "----------------------------------------------------" endif +############################################################################### +config BR2_PACKAGE_LIBNFC_LLCP + bool "libnfc-llcp has been removed" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBNFC + select BR2_LEGACY + help + The 'libnfc-llcp' package has been removed since upstream renamed + to 'libllcp'. We have added a new package for 'libllcp' and bumped + the version at the same time. + ############################################################################### comment "Legacy options removed in 2014.02" diff --git a/package/Config.in b/package/Config.in index aac6f02f23..7257ace721 100644 --- a/package/Config.in +++ b/package/Config.in @@ -570,9 +570,9 @@ source "package/libfreefare/Config.in" source "package/libftdi/Config.in" source "package/libhid/Config.in" source "package/libiqrf/Config.in" +source "package/libllcp/Config.in" source "package/libmbim/Config.in" source "package/libnfc/Config.in" -source "package/libnfc-llcp/Config.in" source "package/libqmi/Config.in" source "package/libraw1394/Config.in" source "package/libserial/Config.in" diff --git a/package/libnfc-llcp/Config.in b/package/libllcp/Config.in similarity index 56% rename from package/libnfc-llcp/Config.in rename to package/libllcp/Config.in index f557926715..e5b21082e5 100644 --- a/package/libnfc-llcp/Config.in +++ b/package/libllcp/Config.in @@ -1,9 +1,9 @@ -config BR2_PACKAGE_LIBNFC_LLCP - bool "libnfc-llcp" +config BR2_PACKAGE_LIBLLCP + bool "libllcp" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_LIBNFC help Library extending libnfc with support for Logical Link Control Protocol. - http://code.google.com/p/nfc-tools/source/browse/trunk/libnfc-llcp/ + https://code.google.com/p/libllcp/ diff --git a/package/libllcp/libllcp.mk b/package/libllcp/libllcp.mk new file mode 100644 index 0000000000..30bbf69e65 --- /dev/null +++ b/package/libllcp/libllcp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# libllcp +# +################################################################################ + +LIBLLCP_VERSION = cf0c4b3c9df98851c6092c130192130c3f5a46bd +LIBLLCP_SITE = https://libllcp.googlecode.com/git/ +LIBLLCP_SITE_METHOD = git +LIBLLCP_DEPENDENCIES = libnfc +# There's no ./configure in the repository, so we need to autoreconf +LIBLLCP_AUTORECONF = YES +LIBLLCP_INSTALL_STAGING = YES +LIBLLCP_LICENSE = GPLv3+ +LIBLLCP_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk deleted file mode 100644 index d410b55a30..0000000000 --- a/package/libnfc-llcp/libnfc-llcp.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libnfc-llcp -# -################################################################################ - -LIBNFC_LLCP_VERSION = 1103 -LIBNFC_LLCP_SITE = http://nfc-tools.googlecode.com/svn/trunk/libnfc-llcp/ -LIBNFC_LLCP_SITE_METHOD = svn -LIBNFC_LLCP_DEPENDENCIES = libnfc -LIBNFC_LLCP_AUTORECONF = YES -LIBNFC_LLCP_AUTORECONF_OPT = --install --force --verbose -LIBNFC_LLCP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) -- 2.30.2