Skip to contentSkip to conversation

Google Code: Change site

PATCH New Maxime Hadjinlian 2 participants 24 messages Jul 26, 2015 – Jul 27, 2015

lore
Share & tools
lore
#0 lore raw

cover Google Code: Change site

Hi all,

For thoses of you that don't know, Google Code will be read-only by August and close its door at the end of the year. The sources will remain online for a full year and then it's gone.

Some projects have already moved on, this series bump/change the site of theses projects.

A few are still on Google Code, they seems pretty abandonned, so a decision will be needed regarding theses. Switch to Alioth ? Look for a fork ?

Maxime Hadjinlian (12):
zxing_cpp: New package
yaml-cpp: Bump version and change site
libass: Bump version and change site
explorercanvas: Bump version and change site
libfreefare: Bump version and change site
libiscsi: Bump version
libllcp: Bump version and change site
libnfc: Bump version and change site
python-pycrc16: Change site
python-dpkt: Bump version and change site
python-pypcap: Bump version and change site
qextserialport: Bump version and change site

 Config.in.legacy                                   |  8 +++
 package/Config.in                                  |  2 +-
 package/explorercanvas/explorercanvas.hash         |  2 -
 package/explorercanvas/explorercanvas.mk           | 12 +---
 package/libass/libass.hash                         |  4 +-
 package/libass/libass.mk                           |  6 +-
 package/libfreefare/libfreefare.hash               |  2 +
 package/libfreefare/libfreefare.mk                 |  7 +-
 ...01-Fix-warnings-related-to-subdir-objects.patch | 46 ------------
 ...tool-AM_PROG_AR-warning-during-autoreconf.patch | 42 -----------
 ...0003-Fix-CUnit-test-for-cross-compilation.patch | 56 ---------------
 ...4-examples-fix-uint64_t-formatting-issues.patch | 49 -------------
 ...005-ld_iscsi-fix-largefile-related-issues.patch | 83 ----------------------
 ...nly-build-the-test-tool-and-ld-iscsi-iff-.patch | 55 --------------
 package/libiscsi/libiscsi.hash                     |  3 +
 package/libiscsi/libiscsi.mk                       |  7 +-
 package/libllcp/libllcp.mk                         |  5 +-
 package/libnfc/libnfc.hash                         |  3 +
 package/libnfc/libnfc.mk                           |  6 +-
 package/python-crc16/python-crc16.mk               |  3 +-
 package/python-dpkt/python-dpkt.mk                 |  5 +-
 package/python-pypcap/python-pypcap.mk             |  5 +-
 package/qextserialport/qextserialport.mk           |  7 +-
 package/yaml-cpp/yaml-cpp.hash                     |  5 --
 package/yaml-cpp/yaml-cpp.mk                       |  4 +-
 package/{zxing => zxing-cpp}/Config.in             | 10 +--
 package/zxing-cpp/zxing-cpp.mk                     | 33 +++++++++
 package/zxing/0001-makefile.patch                  | 30 --------
 package/zxing/zxing.mk                             | 40 -----------
 29 files changed, 86 insertions(+), 454 deletions(-)
 delete mode 100644 package/explorercanvas/explorercanvas.hash
 create mode 100644 package/libfreefare/libfreefare.hash
 delete mode 100644 package/libiscsi/0001-Fix-warnings-related-to-subdir-objects.patch
 delete mode 100644 package/libiscsi/0002-Avoid-libtool-AM_PROG_AR-warning-during-autoreconf.patch
 delete mode 100644 package/libiscsi/0003-Fix-CUnit-test-for-cross-compilation.patch
 delete mode 100644 package/libiscsi/0004-examples-fix-uint64_t-formatting-issues.patch
 delete mode 100644 package/libiscsi/0005-ld_iscsi-fix-largefile-related-issues.patch
 delete mode 100644 package/libiscsi/0006-configure-only-build-the-test-tool-and-ld-iscsi-iff-.patch
 create mode 100644 package/libiscsi/libiscsi.hash
 create mode 100644 package/libnfc/libnfc.hash
 delete mode 100644 package/yaml-cpp/yaml-cpp.hash
 rename package/{zxing => zxing-cpp}/Config.in (52%)
 create mode 100644 package/zxing-cpp/zxing-cpp.mk
 delete mode 100644 package/zxing/0001-makefile.patch
 delete mode 100644 package/zxing/zxing.mk

--
2.1.4

#1 lore raw

PATCH 1/12 zxing_cpp: New package

ZXing was hosted on Google Code, which is a closing forges. The current link was already redirecting to the github repo.

But upstream is no longer supporting the cpp bindings, it's now a Java library/application.

A fork has been created from the latests cpp source of the original upstream.
So this is a new package from an old one and a legacy option has been added.

---
 Config.in.legacy                       |  8 +++++++
 package/Config.in                      |  2 +-
 package/{zxing => zxing-cpp}/Config.in | 10 ++++-----
 package/zxing-cpp/zxing-cpp.mk         | 33 ++++++++++++++++++++++++++++
 package/zxing/0001-makefile.patch      | 30 -------------------------
 package/zxing/zxing.mk                 | 40 ----------------------------------
 6 files changed, 47 insertions(+), 76 deletions(-)
 rename package/{zxing => zxing-cpp}/Config.in (52%)
 create mode 100644 package/zxing-cpp/zxing-cpp.mk
 delete mode 100644 package/zxing/0001-makefile.patch
 delete mode 100644 package/zxing/zxing.mk
Config.in.legacy +8 -0
index 4afeb83..c6cebcb 100644
@@ -107,6 +107,14 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2015.08"
 
+config BR2_PACKAGE_ZXING
+	bool "zxing option has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZXING_CPP
+	help
+	  ZXing no longer provides the cpp bindings, it has been renamed to
+	  BR2_PACKAGE_ZXING_CPP which uses a new upstream.
+
 config BR2_PACKAGE_PERF
 	bool "perf option has been renamed"
 	select BR2_LEGACY
package/Config.in +1 -1
index f029e1d..fb54323 100644
@@ -832,7 +832,7 @@ menu "Graphics"
 	source "package/wayland/Config.in"
 	source "package/webkit/Config.in"
 	source "package/webp/Config.in"
-	source "package/zxing/Config.in"
+	source "package/zxing-cpp/Config.in"
 endmenu
 
 menu "Hardware handling"
package/zxing-cpp/Config.in renamed from package/zxing/Config.in +5 -5
similarity index 52%
rename from package/zxing/Config.in
rename to package/zxing-cpp/Config.in
index 1e04635..1695d27 100644
@@ -1,13 +1,13 @@
-comment "zxing needs a toolchain w/ C++"
+comment "zxing-cpp needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 
-config BR2_PACKAGE_ZXING
-	bool "zxing"
+config BR2_PACKAGE_ZXING_CPP
+	bool "zxing-cpp"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  ZXing (pronounced "zebra crossing") is an open-source,
+	  ZXing-cpp (pronounced "zebra crossing") is an open-source,
 	  multi-format 1D/2D barcode image processing library
 	  implemented in Java, with ports to other languages. This
 	  compiles the C++ port.
 
-	  http://code.google.com/p/zxing/
+	  https://github.com/glassechidna/zxing-cpp
package/zxing-cpp/zxing-cpp.mk new file +33 -0
new file mode 100644
index 0000000..36ba0fe
@@ -0,0 +1,33 @@
+################################################################################
+#
+# zxing-cpp
+#
+################################################################################
+
+ZXING_CPP_VERSION = e7594421d240d8a79633a83c7ad3d26b670e038f
+ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION))
+ZXING_CPP_LICENSE = Apache-2.0
+ZXING_CPP_LICENSE_FILES = COPYING
+ZXING_CPP_INSTALL_STAGING = YES
+ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO
+
+ifneq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+ZXING_CPP_DEPENDENCIES += libiconv
+endif
+endif
+
+define ZXING_CPP_INSTALL_STAGING_CMDS
+	for i in $$(find $(@D)/buildroot-build/core/src -iname *.h); do \
+		$(INSTALL) -m 644 $$i $(TARGET_DIR)/usr/local/include; \
+	done
+endef
+
+define ZXING_CPP_INSTALL_TARGET_CMDS
+	for i in $$(find $(@D)/buildroot-build/ -iname *.so -o -iname *.a); do \
+		$(INSTALL) -m 644 $$i $(TARGET_DIR)/usr/lib; \
+	done
+	$(INSTALL) -m 755 $(@D)/buildroot-build/zxing $(TARGET_DIR)/usr/sbin
+endef
+
+$(eval $(cmake-package))
package/zxing/0001-makefile.patch deleted +0 -30
deleted file mode 100644
index 66896bf..0000000
@@ -1,30 +0,0 @@
-[PATCH] add Makefile
-
-The scons based build system doesn't handle cross compilation, special
-compiler flags or (un)installation, so add a simple makefile instead
-which does.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- cpp/core/src/Makefile |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-Index: zxing-2.0/cpp/core/src/Makefile
-===================================================================
---- /dev/null
-+++ zxing-2.0/cpp/core/src/Makefile
-@@ -0,0 +1,14 @@
-+override CXXFLAGS += -I.
-+SRCS := $(shell find -name '*.cpp')
-+
-+libzxing.a: $(SRCS:.cpp=.o)
-+	$(AR) $(ARFLAGS) $@ $^
-+
-+install: libzxing.a
-+	install -D -m 0644 $^ $(DESTDIR)/usr/lib/$^
-+	find -name '*.h' -exec install -m 0644 -D "{}" \
-+		"$(DESTDIR)/usr/include/{}" ";"
-+
-+uninstall:
-+	rm -f $(DESTDIR)/usr/lib/libzxing.a
-+	rm -rf $(DESTDIR)/usr/include/zxing
package/zxing/zxing.mk deleted +0 -40
deleted file mode 100644
index 94e8b1f..0000000
@@ -1,40 +0,0 @@
-################################################################################
-#
-# zxing
-#
-################################################################################
-
-ZXING_VERSION = 2.3.0
-ZXING_SITE = http://zxing.googlecode.com/files
-ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip
-ZXING_LICENSE = Apache-2.0
-ZXING_LICENSE_FILES = COPYING
-ZXING_INSTALL_STAGING = YES
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-ZXING_DEPENDENCIES += libiconv
-else
-# There is no locale support in the toolchain and libiconv
-# is not available so disable iconv support in zxing
-ZING_MAKE_OPTS = CXXFLAGS+="-DNO_ICONV"
-endif
-endif
-
-define ZXING_EXTRACT_CMDS
-	$(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE)
-endef
-
-define ZXING_BUILD_CMDS
-	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS)
-endef
-
-define ZXING_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(STAGING_DIR) install
-endef
-
-define ZXING_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) install
-endef
-
-$(eval $(generic-package))
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/12 yaml-cpp: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, yaml-cpp has already made the move to Github.

Since a new release was available a bump was also in order. The hash is removed since the tarball from Github is generated.

---
 package/yaml-cpp/yaml-cpp.hash | 5 -----
 package/yaml-cpp/yaml-cpp.mk   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 package/yaml-cpp/yaml-cpp.hash
package/yaml-cpp/yaml-cpp.hash deleted +0 -5
deleted file mode 100644
index 391e317..0000000
@@ -1,5 +0,0 @@
-# hash from: https://yaml-cpp.googlecode.com/files/yaml-cpp-0.5.1.tar.gz:
-sha1 9c5414b4090491e96d1b808fe8628b31e625fdaa  yaml-cpp-0.5.1.tar.gz
-
-# Locally calculated:
-sha256 3e7c9052b43d987d41819a203d97fc45de4eed3ec67e0fdb14265c3d11046f06  yaml-cpp-0.5.1.tar.gz
package/yaml-cpp/yaml-cpp.mk +2 -2
index afc70bd..cea54a9 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-YAML_CPP_VERSION = 0.5.1
-YAML_CPP_SITE = https://yaml-cpp.googlecode.com/files
+YAML_CPP_VERSION = 0.5.2
+YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,release-$(YAML_CPP_VERSION))
 YAML_CPP_INSTALL_STAGING = YES
 YAML_CPP_LICENSE = MIT
 YAML_CPP_LICENSE_FILES = license.txt
Signature · 1 line
2.1.4
#3 lore raw

PATCH 3/12 libass: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, libass has already made the move to Github.

Since a new release was available a bump was also in order.

---
 package/libass/libass.hash | 4 ++--
 package/libass/libass.mk   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
package/libass/libass.hash +2 -2
index b7510de..f300166 100644
@@ -1,2 +1,2 @@
-# From https://code.google.com/p/libass/downloads/detail?name=libass-0.10.2.tar.xz&can=2&q=
-sha1 72a153364e838d3b561bae3653f1515169d479c4 libass-0.10.2.tar.xz
+# Locally computed
+sha256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c  libass-0.12.3.tar.xz
package/libass/libass.mk +4 -2
index 056ea8b..ed604b8 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-LIBASS_VERSION = 0.10.2
+LIBASS_VERSION = 0.12.3
 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
-LIBASS_SITE = http://libass.googlecode.com/files
+# Do not use the github helper here, the generated tarball is *NOT* the same
+# # as the one uploaded by upstream for the release.
+LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSION)
 LIBASS_INSTALL_STAGING = YES
 LIBASS_LICENSE = ISC
 LIBASS_LICENSE_FILES = COPYING
Signature · 1 line
2.1.4
#4 lore raw

PATCH 3/12 libass: Bump version and change site

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Google Code is a closing forge, libass has already made the move to Github.

This line is too long. Use a real text editor that wraps properly :-)

package/libass/libass.mk line 10

Quoted 6 lines
package/libass/libass.mk +3 -2
-LIBASS_VERSION = 0.10.2
+LIBASS_VERSION = 0.12.3
 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
-LIBASS_SITE = http://libass.googlecode.com/files
+# Do not use the github helper here, the generated tarball is *NOT* the same
+# # as the one uploaded by upstream for the release.

^^^

and doesn't mess up comments when rewrapping text :-)

Applied with those issues fixed.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 4/12 explorercanvas: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, libass has already made the move to Github.

This package has no release yet, so we are using a commit. Since the tarball is generated by Github, a hash is useless here.

---
 package/explorercanvas/explorercanvas.hash |  2 --
 package/explorercanvas/explorercanvas.mk   | 12 +++---------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 package/explorercanvas/explorercanvas.hash
package/explorercanvas/explorercanvas.hash deleted +0 -2
deleted file mode 100644
index ae1bfcd..0000000
@@ -1,2 +0,0 @@
-# From http://code.google.com/p/explorercanvas/downloads/detail?name=excanvas_r3.zip&can=2&q=
-sha1	f1b9f7a44428eb0c7b27fe8ac0242d34ec94a385	excanvas_r3.zip
package/explorercanvas/explorercanvas.mk +3 -9
index 083d9a3..57ebfcf 100644
@@ -4,19 +4,13 @@
 #
 ################################################################################
 
-EXPLORERCANVAS_VERSION = r3
-EXPLORERCANVAS_SITE = http://explorercanvas.googlecode.com/files
-EXPLORERCANVAS_SOURCE = excanvas_$(EXPLORERCANVAS_VERSION).zip
+EXPLORERCANVAS_VERSION = aa989ea9d9bac748638f7c66b0fc88e619715da6
+EXPLORERCANVAS_SITE = $(call github,arv,ExplorerCanvas,$(EXPLORERCANVAS_VERSION))
 EXPLORERCANVAS_LICENSE = Apache-2.0
 EXPLORERCANVAS_LICENSE_FILES = COPYING
 
-define EXPLORERCANVAS_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(DL_DIR)/$(EXPLORERCANVAS_SOURCE)
-endef
-
 define EXPLORERCANVAS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/excanvas.compiled.js \
-		$(TARGET_DIR)/var/www/excanvas.js
+	$(INSTALL) -D $(@D)/excanvas.js $(TARGET_DIR)/var/www/excanvas.js
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.4
#6 lore raw

PATCH 4/12 explorercanvas: Bump version and change site

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Google Code is a closing forge, libass has already made the move to Github.

This one, I didn't detect before committing, but this line is wrong:
s/libass/explorercanvas/.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 5/12 libfreefare: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, libfreefare has already made the move to Github.

---
 package/libfreefare/libfreefare.hash | 2 ++
 package/libfreefare/libfreefare.mk   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 package/libfreefare/libfreefare.hash
package/libfreefare/libfreefare.hash new file +2 -0
new file mode 100644
index 0000000..4d23136
@@ -0,0 +1,2 @@
+# From https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-0.4.0/libfreefare-0.4.0.tar.bz2
+sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64  libfreefare-0.4.0.tar.bz2
package/libfreefare/libfreefare.mk +5 -2
index 5d6d636..a8de617 100644
@@ -4,8 +4,11 @@
 #
 ################################################################################
 
-LIBFREEFARE_VERSION = 0.3.4
-LIBFREEFARE_SITE = http://libfreefare.googlecode.com/files
+LIBFREEFARE_VERSION = 0.4.0
+LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
+# Do not use the github helper here, the generated tarball is *NOT* the same
+# # as the one uploaded by upstream for the release.
+LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
 LIBFREEFARE_LICENSE = LGPLv3+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
Signature · 1 line
2.1.4
#8 lore raw

PATCH 5/12 libfreefare: Bump version and change site

Dear Maxime Hadjinlian,

package/libfreefare/libfreefare.mk line 10

Quoted 6 lines · Maxime Hadjinlian
package/libfreefare/libfreefare.mk +4 -2
-LIBFREEFARE_VERSION = 0.3.4
-LIBFREEFARE_SITE = http://libfreefare.googlecode.com/files
+LIBFREEFARE_VERSION = 0.4.0
+LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
+# Do not use the github helper here, the generated tarball is *NOT* the same
+# # as the one uploaded by upstream for the release.

^^^^

Crappy text editor again?

Fixed, of course.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#9 lore raw

PATCH 6/12 libiscsi: Bump version

In reply to Maxime Hadjinlian

Patches were applied upstream so they are removed. Also remove the autoreconf which has no purposes anymore

---
 ...01-Fix-warnings-related-to-subdir-objects.patch | 46 ------------
 ...tool-AM_PROG_AR-warning-during-autoreconf.patch | 42 -----------
 ...0003-Fix-CUnit-test-for-cross-compilation.patch | 56 ---------------
 ...4-examples-fix-uint64_t-formatting-issues.patch | 49 -------------
 ...005-ld_iscsi-fix-largefile-related-issues.patch | 83 ----------------------
 ...nly-build-the-test-tool-and-ld-iscsi-iff-.patch | 55 --------------
 package/libiscsi/libiscsi.hash                     |  3 +
 package/libiscsi/libiscsi.mk                       |  7 +-
 8 files changed, 6 insertions(+), 335 deletions(-)
 delete mode 100644 package/libiscsi/0001-Fix-warnings-related-to-subdir-objects.patch
 delete mode 100644 package/libiscsi/0002-Avoid-libtool-AM_PROG_AR-warning-during-autoreconf.patch
 delete mode 100644 package/libiscsi/0003-Fix-CUnit-test-for-cross-compilation.patch
 delete mode 100644 package/libiscsi/0004-examples-fix-uint64_t-formatting-issues.patch
 delete mode 100644 package/libiscsi/0005-ld_iscsi-fix-largefile-related-issues.patch
 delete mode 100644 package/libiscsi/0006-configure-only-build-the-test-tool-and-ld-iscsi-iff-.patch
 create mode 100644 package/libiscsi/libiscsi.hash
package/libiscsi/0001-Fix-warnings-related-to-subdir-objects.patch deleted +0 -46
deleted file mode 100644
index 7ccdc53..0000000
@@ -1,46 +0,0 @@
-From e801ccb2633e3f5842ed6d160af0e6e5cce44c77 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Tue, 2 Sep 2014 22:38:55 +0200
-Subject: [PATCH 1/4] Fix warnings related to subdir-objects
-
-Use AM_INIT_AUTOMAKE in configure.ac to define options such as
-subdir-objects, instead of AUTOMAKE_OPTIONS in Makefile.am, as it
-allows to avoid warnings during autoreconf:
-
-examples/Makefile.am:25: warning: source file '../lib/connect.c' is in a subdirectory,
-examples/Makefile.am:25: but option 'subdir-objects' is disabled
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- Makefile.am  | 1 -
- configure.ac | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7023988..f9de08c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@
- SUBDIRS = lib doc utils test-tool examples
- 
- ACLOCAL_AMFLAGS =-I m4
--AUTOMAKE_OPTIONS = foreign subdir-objects
- AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \
- 	"-D_R_(A,B)=__attribute__((format(printf,A,B)))"
- AM_CFLAGS=$(WARN_CFLAGS)
-diff --git a/configure.ac b/configure.ac
-index e1d01c6..6d29af0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_INIT(libiscsi, m4_esyscmd([grep 'Version:' ./packaging/RPM/libiscsi.spec.in 2
- AC_CONFIG_SRCDIR([lib/init.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
- AM_SILENT_RULES
- LT_INIT
- 
--- 
-2.0.0
-
package/libiscsi/0002-Avoid-libtool-AM_PROG_AR-warning-during-autoreconf.patch deleted +0 -42

42 lines not on this page · raw message

package/libiscsi/0003-Fix-CUnit-test-for-cross-compilation.patch deleted +0 -56

56 lines not on this page · raw message

package/libiscsi/0004-examples-fix-uint64_t-formatting-issues.patch deleted +0 -49

49 lines not on this page · raw message

package/libiscsi/0005-ld_iscsi-fix-largefile-related-issues.patch deleted +0 -83

83 lines not on this page · raw message

package/libiscsi/0006-configure-only-build-the-test-tool-and-ld-iscsi-iff-.patch deleted +0 -55

55 lines not on this page · raw message

package/libiscsi/libiscsi.hash new file +3 -0
new file mode 100644
index 0000000..00c0116
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 26aa5583053d4fe0d4686f76a76c216c7dce00130f008e652ece305b88758ff1  libiscsi-1.15.0.tar.gz
+
package/libiscsi/libiscsi.mk +3 -4
index c244830..425c29b 100644
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-LIBISCSI_VERSION = 1.12.0
+LIBISCSI_VERSION = 1.15.0
+# Note: Upstream can be found at:
+# https://github.com/sahlberg/libiscsi
 LIBISCSI_SITE = https://sites.google.com/site/libiscsitarballs/libiscsitarballs
 LIBISCSI_LICENSE = GPLv2+ LGPLv2.1+
 LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
 LIBISCSI_INSTALL_STAGING = YES
 
-# We patch configure.ac and Makefile.am
-LIBISCSI_AUTORECONF = YES
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.4
#10 lore raw

PATCH 6/12 libiscsi: Bump version

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Patches were applied upstream so they are removed.

Since you did the research, it would have good to put the pointers to the upstream commits for the respective patches.

package/libiscsi/libiscsi.mk line 9

Quoted 2 lines
package/libiscsi/libiscsi.mk +2 -0
+# Note: Upstream can be found at:
+# https://github.com/sahlberg/libiscsi

Comment not needed, since the Config.in help text already mentions that as the help text.

Quoted 1 line

LIBISCSI_SITE = https://sites.google.com/site/libiscsitarballs/libiscsitarballs

So in the end, we're still using Google? Or maybe sites.google.com is not disappearing?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#11 lore raw

PATCH 6/12 libiscsi: Bump version

Hi Thomas, all

Quoted 14 lines · Thomas Petazzoni

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Patches were applied upstream so they are removed.

Since you did the research, it would have good to put the pointers to the upstream commits for the respective patches.

package/libiscsi/libiscsi.mk line 9

Quoted 2 lines
package/libiscsi/libiscsi.mk +2 -0
+# Note: Upstream can be found at:
+# https://github.com/sahlberg/libiscsi

Comment not needed, since the Config.in help text already mentions that as the help text.

Quoted 4 lines
Quoted 1 line

LIBISCSI_SITE = https://sites.google.com/site/libiscsitarballs/libiscsitarballs

So in the end, we're still using Google? Or maybe sites.google.com is not disappearing?

sites.google.com is not scheduled to disappear as far as I know

Quoted 6 lines

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

#12 lore raw

PATCH 6/12 libiscsi: Bump version

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 4 lines · Maxime Hadjinlian

Patches were applied upstream so they are removed. Also remove the autoreconf which has no purposes anymore

This is causing some regression:

http://autobuild.buildroot.org/results/0a9/0a96f3654983ed2efc851522352dec43c1df0077/build-end.log

This is due to the fact that ld is used instead of gcc. Can you have a look?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#13 lore raw

PATCH 6/12 libiscsi: Bump version

Hi Thomas, all

Quoted 6 lines · Thomas Petazzoni

Dear Maxime Hadjinlian,

Quoted 3 lines · Maxime Hadjinlian

Patches were applied upstream so they are removed. Also remove the autoreconf which has no purposes anymore

Quoted 8 lines
Quoted 1 line

This is causing some regression:

http://autobuild.buildroot.org/results/0a9/0a96f3654983ed2efc851522352dec43c1df0077/build-end.log

This is due to the fact that ld is used instead of gcc. Can you have a look?

Dully noted, I'll add it to my todo list and look at it asap.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

#14 lore raw

PATCH 7/12 libllcp: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, libllcp has already made the move to Github.

---
 package/libllcp/libllcp.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/libllcp/libllcp.mk +2 -3
index e0dbb83..2c2014a 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LIBLLCP_VERSION = cf0c4b3c9df98851c6092c130192130c3f5a46bd
-LIBLLCP_SITE = https://libllcp.googlecode.com/git
-LIBLLCP_SITE_METHOD = git
+LIBLLCP_VERSION = 05dfa8003433a7070bfd8ae02efdb0203bbf34aa
+LIBLLCP_SITE = $(call github,nfc-tools,libllcp,$(LIBLLCP_VERSION))
 LIBLLCP_DEPENDENCIES = host-pkgconf libnfc
 # There's no ./configure in the repository, so we need to autoreconf
 LIBLLCP_AUTORECONF = YES
Signature · 1 line
2.1.4
#15 lore raw

PATCH 8/12 libnfc: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, libllcp has already made the move to Github.

---
 package/libnfc/libnfc.hash | 3 +++
 package/libnfc/libnfc.mk   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 package/libnfc/libnfc.hash
package/libnfc/libnfc.hash new file +3 -0
new file mode 100644
index 0000000..dbaf32d
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072  libnfc-1.7.1.tar.bz2
+
package/libnfc/libnfc.mk +3 -3
index ff55f93..aceedb0 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBNFC_VERSION = 7b7f5061427b5456835dd48923a8cc0563cfd1e9
-LIBNFC_SITE = http://libnfc.googlecode.com/git
-LIBNFC_SITE_METHOD = git
+LIBNFC_VERSION = 1.7.1
+LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2
+LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION)
 LIBNFC_LICENSE = LGPLv3+
 LIBNFC_LICENSE_FILES = COPYING
 LIBNFC_AUTORECONF = YES
Signature · 1 line
2.1.4
#16 lore raw

PATCH 8/12 libnfc: Bump version and change site

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Google Code is a closing forge, libllcp has already made the move to Github.

libllcp -> libnfc.

Applied with that fixed, of course.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#17 lore raw

PATCH 8/12 libnfc: Bump version and change site

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

package/libnfc/libnfc.hash line 3

Quoted 9 lines · Maxime Hadjinlian
package/libnfc/libnfc.hash new file +3 -0
new file mode 100644
index 0000000..dbaf32d
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072  libnfc-1.7.1.tar.bz2
+

It was also on several other patches: useless trailing newline here.

I've (hopefully) fixed before applying.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#18 lore raw

PATCH 9/12 python-pycrc16: Change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, python-pycrc16 has already made the move to Github.

---
 package/python-crc16/python-crc16.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
package/python-crc16/python-crc16.mk +1 -2
index 5b9b13b..3a292a0 100644
@@ -5,8 +5,7 @@
 ################################################################################
 
 PYTHON_CRC16_VERSION = 0.1.1
-PYTHON_CRC16_SOURCE = crc16-$(PYTHON_CRC16_VERSION).tar.gz
-PYTHON_CRC16_SITE = http://pycrc16.googlecode.com/files
+PYTHON_CRC16_SITE = $(call github,gennady,pycrc16,v$(PYTHON_CRC16_VERSION))
 PYTHON_CRC16_LICENSE = LGPLv3+
 PYTHON_CRC16_LICENSE_FILES = COPYING.txt
 PYTHON_CRC16_SETUP_TYPE = distutils
Signature · 1 line
2.1.4
#19 lore raw

PATCH 10/12 python-dpkt: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, python-dpkt has already made the move to Github.

---
 package/python-dpkt/python-dpkt.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/python-dpkt/python-dpkt.mk +2 -3
index fb630fb..3015502 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-PYTHON_DPKT_VERSION = 1.7
-PYTHON_DPKT_SOURCE = dpkt-$(PYTHON_DPKT_VERSION).tar.gz
-PYTHON_DPKT_SITE = http://dpkt.googlecode.com/files
+PYTHON_DPKT_VERSION = 1.8.r98
+PYTHON_DPKT_SITE = $(call github,kbandla,dpkt,$(PYTHON_DPKT_VERSION))
 PYTHON_DPKT_SETUP_TYPE = distutils
 PYTHON_DPKT_LICENSE = BSD-3c
 PYTHON_DPKT_LICENSE_FILES = LICENSE
Signature · 1 line
2.1.4
#20 lore raw

PATCH 11/12 python-pypcap: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, python-dpkt has already made the move to Github.

We are not using the latest tag, it's dated from 2005 and the latests commits is from 2010 with ~20 commits between them.

---
 package/python-pypcap/python-pypcap.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/python-pypcap/python-pypcap.mk +2 -3
index 89f2dc1..bff9d8f 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-PYTHON_PYPCAP_VERSION = 102
-PYTHON_PYPCAP_SITE = https://pypcap.googlecode.com/svn/trunk
-PYTHON_PYPCAP_SITE_METHOD = svn
+PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390
+PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION))
 PYTHON_PYPCAP_LICENSE = BSD-3c
 PYTHON_PYPCAP_LICENSE_FILES = LICENSE
 PYTHON_PYPCAP_SETUP_TYPE = distutils
Signature · 1 line
2.1.4
#21 lore raw

PATCH 11/12 python-pypcap: Bump version and change site

Dear Maxime Hadjinlian,

Quoted 1 line · Maxime Hadjinlian

Google Code is a closing forge, python-dpkt has already made the move to

python-pypcap.

Quoted 2 lines

We are not using the latest tag, it's dated from 2005 and the latests commits is from 2010 with ~20 commits between them.

Rephrased to:

We are not using the latest available tag as it dates back from 2005, and ~20 more commits have been made after the last tag. Therefore, we're using the latest commit.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#22 lore raw

PATCH 12/12 qextserialport: Bump version and change site

In reply to Maxime Hadjinlian

Google Code is a closing forge, qextserialport has already made the move to Github.

---
 package/qextserialport/qextserialport.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
package/qextserialport/qextserialport.mk +2 -5
index 61f7b05..6f82b39 100644
@@ -4,13 +4,10 @@
 #
 ################################################################################
 
-QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
-QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
-QEXTSERIALPORT_SITE_METHOD = git
-
+QEXTSERIALPORT_VERSION = ada321a9ee463f628e7b781b8ed00ff219152158
+QEXTSERIALPORT_SITE = $(call github,qextserialport,qextserialport,$(QEXTSERIALPORT_VERSION))
 QEXTSERIALPORT_LICENSE = MIT
 QEXTSERIALPORT_LICENSE_FILES = LICENSE
-
 QEXTSERIALPORT_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_QT),y)
Signature · 1 line
2.1.4
#23 lore raw

cover Google Code: Change site

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 6 lines · Maxime Hadjinlian

Some projects have already moved on, this series bump/change the site of theses projects.

A few are still on Google Code, they seems pretty abandonned, so a decision will be needed regarding theses. Switch to Alioth ? Look for a fork ?

With still have 1.5 years ahead of us before they go offline. So I would suggest that we could to monitor those projects in the coming months, and only start taking radical decision in 9-12 months.

Quoted 5 lines

Maxime Hadjinlian (12):
zxing_cpp: New package
yaml-cpp: Bump version and change site
libass: Bump version and change site
explorercanvas: Bump version and change site

Quoted 8 lines

libfreefare: Bump version and change site
libiscsi: Bump version
libllcp: Bump version and change site
libnfc: Bump version and change site
python-pycrc16: Change site
python-dpkt: Bump version and change site
python-pypcap: Bump version and change site
qextserialport: Bump version and change site

I've applied all except the zxing_cpp patch. But I had to do some fixes for some of them, so I'll reply to the specific patches.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com