Skip to contentSkip to conversation

tcl: update package disabling

PATCH Superseded Peter Seiderer 2 participants 3 messages Nov 3, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH 1/2 tcl: update package disabling

Update package disabling (removing pkgs subdirectories) after latest tcl version update:

$ ls tcl8.6.1/pkgs/
 itcl4.0.0
 sqlite3.8.0
 tdbc1.0.0
 tdbcmysql1.0.0
 tdbcodbc1.0.0
 tdbcpostgres1.0.0
 tdbcsqlite3-1.0.0
 thread2.7.0
$ ls tcl8.6.2/pkgs/
 itcl4.0.1
 sqlite3.8.6
 tdbc1.0.1
 tdbcmysql1.0.1
 tdbcodbc1.0.1
 tdbcpostgres1.0.1
 tdbcsqlite3-1.0.1
 thread2.7.1

Fixes:
http://autobuild.buildroot.net/results/07ae8e42acf62fef99de70c8099ec5a0ca89a817/

Could not reproduce the build failure, but disabling pkgs/sqlite3.8.6 should prevent all build failures in this directory...

Signed-off-by Peter Seiderer <[email protected]>
---
 package/tcl/tcl.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
package/tcl/tcl.mk +12 -12
index a242760..a48e48c 100644
@@ -32,21 +32,21 @@ HOST_TCL_CONF_OPTS = \
 # I haven't found a good way to force pkgs to not build
 # or configure without just removing the entire pkg directory.
 define HOST_TCL_REMOVE_PACKAGES
-	rm -fr $(@D)/pkgs/sqlite3.8.0 \
-		$(@D)/pkgs/tdbc1.0.0 \
-		$(@D)/pkgs/tdbcmysql1.0.0 \
-		$(@D)/pkgs/tdbcodbc1.0.0 \
-		$(@D)/pkgs/tdbcpostgres1.0.0 \
-		$(@D)/pkgs/tdbcsqlite3-1.0.0
+	rm -fr $(@D)/pkgs/sqlite3.8.6 \
+		$(@D)/pkgs/tdbc1.0.1 \
+		$(@D)/pkgs/tdbcmysql1.0.1 \
+		$(@D)/pkgs/tdbcodbc1.0.1 \
+		$(@D)/pkgs/tdbcpostgres1.0.1 \
+		$(@D)/pkgs/tdbcsqlite3-1.0.1
 endef
 HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
 define TCL_REMOVE_PACKAGES
-	rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.0) \
-		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.0) \
-		$(@D)/pkgs/tdbcmysql1.0.0 \
-		$(@D)/pkgs/tdbcodbc1.0.0 \
-		$(@D)/pkgs/tdbcpostgres1.0.0 \
-		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.0)
+	rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.6) \
+		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.1) \
+		$(@D)/pkgs/tdbcmysql1.0.1 \
+		$(@D)/pkgs/tdbcodbc1.0.1 \
+		$(@D)/pkgs/tdbcpostgres1.0.1 \
+		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.1)
 endef
 TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
Signature · 1 line
1.8.1.4
author
#1 lore raw

PATCH 2/2 tcl: add hash file

Signed-off-by Peter Seiderer <[email protected]>
---
 package/tcl/tcl.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/tcl/tcl.hash
package/tcl/tcl.hash new file +2 -0
new file mode 100644
index 0000000..e1b3389
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	86f7ae5f581dd0904d04415637ab3aef5a50986c1b6d04c340e2b1b0258da9c4	tcl8.6.2-src.tar.gz
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 1/2 tcl: update package disabling

In reply to Peter Seiderer
Quoted 39 lines · Peter Seiderer

Update package disabling (removing pkgs subdirectories) after latest tcl version update:

$ ls tcl8.6.1/pkgs/
 itcl4.0.0
 sqlite3.8.0
 tdbc1.0.0
 tdbcmysql1.0.0
 tdbcodbc1.0.0
 tdbcpostgres1.0.0
 tdbcsqlite3-1.0.0
 thread2.7.0
$ ls tcl8.6.2/pkgs/
 itcl4.0.1
 sqlite3.8.6
 tdbc1.0.1
 tdbcmysql1.0.1
 tdbcodbc1.0.1
 tdbcpostgres1.0.1
 tdbcsqlite3-1.0.1
 thread2.7.1

Fixes:
http://autobuild.buildroot.net/results/07ae8e42acf62fef99de70c8099ec5a0ca89a817/

Could not reproduce the build failure, but disabling pkgs/sqlite3.8.6 should prevent all build failures in this directory...

Signed-off-by Peter Seiderer <[email protected]>
---
 package/tcl/tcl.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
package/tcl/tcl.mk +0 -0
index a242760..a48e48c 100644

package/tcl/tcl.mk HOST_TCL_CONF_OPTS = \ · line 35

Quoted 10 lines
package/tcl/tcl.mk +1 -6
@@ -32,21 +32,21 @@ HOST_TCL_CONF_OPTS = \
 # I haven't found a good way to force pkgs to not build
 # or configure without just removing the entire pkg directory.
 define HOST_TCL_REMOVE_PACKAGES
-	rm -fr $(@D)/pkgs/sqlite3.8.0 \
-		$(@D)/pkgs/tdbc1.0.0 \
-		$(@D)/pkgs/tdbcmysql1.0.0 \
-		$(@D)/pkgs/tdbcodbc1.0.0 \
-		$(@D)/pkgs/tdbcpostgres1.0.0 \
-		$(@D)/pkgs/tdbcsqlite3-1.0.0
+	rm -fr $(@D)/pkgs/sqlite3.8.6 \

To avoid this in the future, perhaps it would be better to use wildcards, e.g.
$(@D)/pkgs/sqlite[0-9].[0-9]*

Regards,
Arnout

Quoted 24 lines
package/tcl/tcl.mk +11 -6
+		$(@D)/pkgs/tdbc1.0.1 \
+		$(@D)/pkgs/tdbcmysql1.0.1 \
+		$(@D)/pkgs/tdbcodbc1.0.1 \
+		$(@D)/pkgs/tdbcpostgres1.0.1 \
+		$(@D)/pkgs/tdbcsqlite3-1.0.1
 endef
 HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
 define TCL_REMOVE_PACKAGES
-	rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.0) \
-		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.0) \
-		$(@D)/pkgs/tdbcmysql1.0.0 \
-		$(@D)/pkgs/tdbcodbc1.0.0 \
-		$(@D)/pkgs/tdbcpostgres1.0.0 \
-		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.0)
+	rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.6) \
+		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.1) \
+		$(@D)/pkgs/tdbcmysql1.0.1 \
+		$(@D)/pkgs/tdbcodbc1.0.1 \
+		$(@D)/pkgs/tdbcpostgres1.0.1 \
+		$(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.1)
 endef
 TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F