diff mbox

libnfc-llcp: rename to libllcp and bump version

Message ID 1389287265-1498-1-git-send-email-Vincent.Riera@imgtec.com
State Superseded
Headers show

Commit Message

Vicente Olivert Riera Jan. 9, 2014, 5:07 p.m. UTC
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 <Vincent.Riera@imgtec.com>
---
 package/Config.in                          |    2 +-
 package/{libnfc-llcp => libllcp}/Config.in |    6 +++---
 package/libllcp/libllcp.mk                 |   15 +++++++++++++++
 package/libnfc-llcp/libnfc-llcp.mk         |   15 ---------------
 4 files changed, 19 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

Comments

Yann E. MORIN Jan. 9, 2014, 5:42 p.m. UTC | #1
Vicente, All,

On 2014-01-09 17:07 +0000, Vicente Olivert Riera spake thusly:
> 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 <Vincent.Riera@imgtec.com>
> ---
>  package/Config.in                          |    2 +-
>  package/{libnfc-llcp => libllcp}/Config.in |    6 +++---
>  package/libllcp/libllcp.mk                 |   15 +++++++++++++++
>  package/libnfc-llcp/libnfc-llcp.mk         |   15 ---------------
>  4 files changed, 19 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/package/Config.in b/package/Config.in
> index 8af6a1e..ce9a130 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -567,7 +567,7 @@ source "package/libhid/Config.in"
>  source "package/libiqrf/Config.in"
>  source "package/libmbim/Config.in"
>  source "package/libnfc/Config.in"
> -source "package/libnfc-llcp/Config.in"
> +source "package/libllcp/Config.in"

Keep the alphabetical order (ie. move it between libiqrf and libmbim).

> diff --git a/package/libllcp/libllcp.mk b/package/libllcp/libllcp.mk
> new file mode 100644
> index 0000000..4a3c2c4
> --- /dev/null
> +++ b/package/libllcp/libllcp.mk
> @@ -0,0 +1,15 @@
> +################################################################################
> +#
> +# libllcp
> +#
> +################################################################################
> +
> +LIBLLCP_VERSION = cf0c4b3c9df98851c6092c130192130c3f5a46bd
> +LIBLLCP_SITE = https://libllcp.googlecode.com/git/
> +LIBLLCP_SITE_METHOD = git
> +LIBLLCP_DEPENDENCIES = libnfc
> +LIBLLCP_AUTORECONF = YES

It's not obvious why AUTORECONF is needed, so just add a small note,
like:
    # There's no ./configure is the repository, so we need to autoreconf
    LIBLLCP_AUTORECONF = YES

> +LIBLLCP_AUTORECONF_OPT = --install --force --verbose

Are those autoreconf opts still needed with this new version?

Also, please add the licensing terms while you are at it:
    LIBLLCP_LICENSE = GPLv3+
    LIBLLCP_LICENSE_FILES = COPYING

Regards,
Yann E. MORIN.
Baruch Siach Jan. 9, 2014, 5:43 p.m. UTC | #2
Hi Vicente,

On Thu, Jan 09, 2014 at 05:07:45PM +0000, Vicente Olivert Riera wrote:
> 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 <Vincent.Riera@imgtec.com>
> ---
>  package/Config.in                          |    2 +-
>  package/{libnfc-llcp => libllcp}/Config.in |    6 +++---
>  package/libllcp/libllcp.mk                 |   15 +++++++++++++++
>  package/libnfc-llcp/libnfc-llcp.mk         |   15 ---------------
>  4 files changed, 19 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/package/Config.in b/package/Config.in
> index 8af6a1e..ce9a130 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -567,7 +567,7 @@ source "package/libhid/Config.in"
>  source "package/libiqrf/Config.in"
>  source "package/libmbim/Config.in"
>  source "package/libnfc/Config.in"
> -source "package/libnfc-llcp/Config.in"
> +source "package/libllcp/Config.in"

It seems that the order should change as well to keep the list alphabetically 
ordered.

baruch
Thomas Petazzoni Jan. 9, 2014, 11:23 p.m. UTC | #3
Dear Vicente Olivert Riera,

On Thu, 9 Jan 2014 17:07:45 +0000, Vicente Olivert Riera wrote:

> -config BR2_PACKAGE_LIBNFC_LLCP
> -	bool "libnfc-llcp"
> +config BR2_PACKAGE_LIBLLCP
> +	bool "libllcp"

You're renaming an option which I believe was part of a Buildroot
release, so please add the necessary Config.in.legacy stuff to ensure
that users upgrading are notified of this change.

Thanks!

Thomas
Arnout Vandecappelle Jan. 10, 2014, 6:04 a.m. UTC | #4
On 09/01/14 18:07, Vicente Olivert Riera wrote:
> This package has been renamed upstream to libllcp.

  This is not sufficient reason to rename the package in buildroot as 
well. Renaming makes it difficult for people to follow buildroot upstream 
with their configurations.

  Also, if any existing symbol is removed (or renamed), entries have to 
be added to Config.in.legacy. This makes is slightly easier for users to 
maintain buildroot configurations, but it's still annoying so renaming of 
symbols should be done with care.

  It _is_ an option to still rename it in the menu. I'm not entirely sure 
what should be done with the alphabetical ordering in that case - 
probably follow the visible name, not the internal name.

  Regards,
  Arnout

> 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<Vincent.Riera@imgtec.com>
> ---
>   package/Config.in                          |    2 +-
>   package/{libnfc-llcp => libllcp}/Config.in |    6 +++---
>   package/libllcp/libllcp.mk                 |   15 +++++++++++++++
>   package/libnfc-llcp/libnfc-llcp.mk         |   15 ---------------
>   4 files changed, 19 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
Vicente Olivert Riera Jan. 10, 2014, 10:07 a.m. UTC | #5
On 01/09/2014 11:23 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
>
> On Thu, 9 Jan 2014 17:07:45 +0000, Vicente Olivert Riera wrote:
>
>> -config BR2_PACKAGE_LIBNFC_LLCP
>> -	bool "libnfc-llcp"
>> +config BR2_PACKAGE_LIBLLCP
>> +	bool "libllcp"
>
> You're renaming an option which I believe was part of a Buildroot
> release, so please add the necessary Config.in.legacy stuff to ensure
> that users upgrading are notified of this change.
>
> Thanks!
>
> Thomas
>

v3 sent. Thanks for your comments.
Vicente Olivert Riera Jan. 10, 2014, 1:19 p.m. UTC | #6
On 01/10/2014 06:04 AM, Arnout Vandecappelle wrote:
> On 09/01/14 18:07, Vicente Olivert Riera wrote:
>> This package has been renamed upstream to libllcp.
>
>   This is not sufficient reason to rename the package in buildroot as
> well. Renaming makes it difficult for people to follow buildroot
> upstream with their configurations.

The real reason to do this is because doing a version bump you will fix 
a compilation error due to libnfc-llcp not being compatible with libnfc. 
So, when you try to do a version bump, you notice that upstream has 
renamed the package, so..., why not do it altogether?

>   Also, if any existing symbol is removed (or renamed), entries have to
> be added to Config.in.legacy. This makes is slightly easier for users to
> maintain buildroot configurations, but it's still annoying so renaming
> of symbols should be done with care.

You are writing a comment for the first version patch. The last one is 
the V3 patch which already modifies Config.in.legacy to do this.

>
>   It _is_ an option to still rename it in the menu. I'm not entirely
> sure what should be done with the alphabetical ordering in that case -
> probably follow the visible name, not the internal name.
>
>   Regards,
>   Arnout
>
>> 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<Vincent.Riera@imgtec.com>
>> ---
>>   package/Config.in                          |    2 +-
>>   package/{libnfc-llcp => libllcp}/Config.in |    6 +++---
>>   package/libllcp/libllcp.mk                 |   15 +++++++++++++++
>>   package/libnfc-llcp/libnfc-llcp.mk         |   15 ---------------
>>   4 files changed, 19 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
>
>
Thomas Petazzoni Jan. 11, 2014, 12:47 a.m. UTC | #7
Hello,

On Fri, 10 Jan 2014 07:04:55 +0100, Arnout Vandecappelle wrote:
> On 09/01/14 18:07, Vicente Olivert Riera wrote:
> > This package has been renamed upstream to libllcp.
> 
>   This is not sufficient reason to rename the package in buildroot as 
> well. Renaming makes it difficult for people to follow buildroot upstream 
> with their configurations.

True, but having packages in Buildroot that progressively do not follow
the upstream names of the packages is also going to be big mess, as we
are going to have more and more of such packages.

Since we have the Config.in.legacy thing in place, I'd very much prefer
to rename packages to follow upstream decisions.

Best regards,

Thomas
diff mbox

Patch

diff --git a/package/Config.in b/package/Config.in
index 8af6a1e..ce9a130 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -567,7 +567,7 @@  source "package/libhid/Config.in"
 source "package/libiqrf/Config.in"
 source "package/libmbim/Config.in"
 source "package/libnfc/Config.in"
-source "package/libnfc-llcp/Config.in"
+source "package/libllcp/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 f557926..e5b2108 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 0000000..4a3c2c4
--- /dev/null
+++ b/package/libllcp/libllcp.mk
@@ -0,0 +1,15 @@ 
+################################################################################
+#
+# libllcp
+#
+################################################################################
+
+LIBLLCP_VERSION = cf0c4b3c9df98851c6092c130192130c3f5a46bd
+LIBLLCP_SITE = https://libllcp.googlecode.com/git/
+LIBLLCP_SITE_METHOD = git
+LIBLLCP_DEPENDENCIES = libnfc
+LIBLLCP_AUTORECONF = YES
+LIBLLCP_AUTORECONF_OPT = --install --force --verbose
+LIBLLCP_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
diff --git a/package/libnfc-llcp/libnfc-llcp.mk b/package/libnfc-llcp/libnfc-llcp.mk
deleted file mode 100644
index d410b55..0000000
--- 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))