Merge branch 'update-changelog' into 'master'

Updated changelog See merge request !4
Updated changelog
2017-05-10 15:28:52 +01:00 · 2017-05-10 15:25:51 +01:00 · 2017-05-10 13:30:48 +01:00 · 2017-05-10 12:17:51 +01:00 · 2017-05-10 11:38:10 +01:00 · 2017-05-10 11:38:02 +01:00
6 changed files with 74 additions and 18 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,43 @@
+stages:
+  - package
+  - publish
+
+package:jessie:gem:
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-ruby
+  stage: package
+  variables:
+    DISTRO: jessie
+    GEMFILE: netlinkrb.gemspec
+  script:
+    - package
+  artifacts:
+    paths:
+    - pkg/
+ 
+package:jessie: &package
+  image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
+  stage: package
+  variables:
+    DISTRO: jessie
+  script:
+    - package
+  artifacts:
+    paths:
+      - pkg/
+
+package:stretch:
+  <<: *package
+  variables:
+    DISTRO: stretch
+
+package:wheezy:
+  <<: *package
+  variables:
+    DISTRO: wheezy
+
+publish:
+  image: $CI_REGISTRY/docker-images/layers:jessie-publish
+  stage: publish
+  script:
+    - publish
+
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ruby-linux-netlink (0.19-1) stable; urgency=medium
+
+  * The size of size_t is now calculated from the size of an unsigned long
+    int, instead of calling gcc.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Wed, 10 May 2017 15:24:42 +0100
+
+ruby-linux-netlink (0.18-2) stable; urgency=medium
+
+  * This package is now architecture independent.
+  * The source format has been removed in favour of using dh --with quilt.
+
+ -- Patrick J Cherry <patrick@bytemark.co.uk>  Tue, 28 Feb 2017 16:43:43 +0000
+
 ruby-linux-netlink (0.18-1+jessie1) stable; urgency=medium

  * Fixed new massive IP test thing to work with ruby1.8 and also non-root users
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
 Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
 Section: ruby
 Priority: optional
-Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi
+Build-Depends:  debhelper (>= 7), gem2deb, rake, ruby-ffi, quilt
 Standards-Version: 3.8.0
 XS-Ruby-Versions: all 

 Package: ruby-linux-netlink
-Architecture: any
+Architecture: all
 Depends: ruby | ruby-interpreter, ruby-ffi, ${misc:Depends}
 Provides: liblinux-netlink-ruby1.8, liblinux-netlink-ruby1.9.1
 XB-Ruby-Versions: ${ruby:Versions}
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@
 # export DH_RUBY_GEMSPEC=gem.gemspec

 %:
-	dh $@ --buildsystem=ruby --with ruby
+	dh $@ --buildsystem=ruby --with ruby --with quilt

 override_dh_auto_build-arch:
 	rake lib/linux/c_struct_sizeof_size_t.rb
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/lib/linux/c_struct.rb
+++ b/lib/linux/c_struct.rb
@@ -82,8 +82,8 @@ class CStruct
  begin
    require 'linux/c_struct_sizeof_size_t.rb'
  rescue LoadError
-    warn "Falling back to gcc to determine sizeof size_t." if $VERBOSE
-    SIZEOF_SIZE_T = Integer(`echo __SIZEOF_SIZE_T__ | gcc -E -P -`) rescue 1.size
+    warn "netlinkrb: Assuming size_t is a long unsigned int." if $DEBUG
+    SIZEOF_SIZE_T = [0].pack("L_").bytesize
  end

  define_type :size_t,
Author	SHA1	Message	Date
James Carter	28722623e2	Merge branch 'update-changelog' into 'master' Updated changelog See merge request !4	2017-05-10 15:28:52 +01:00
Patrick J Cherry	1afe488c81	Updated changelog	2017-05-10 15:25:51 +01:00
James Carter	424f700fb8	Merge branch '3-packaging-change-triggers-falling-back-to-gcc-to-determine-sizeof-size_t-warnings' into 'master' Packaging change triggers `Falling back to gcc to determine sizeof size_t` warnings Closes #3 See merge request !3	2017-05-10 13:30:48 +01:00
Patrick J Cherry	bbcbb10e75	Use #bytesize instead of #size when measuring the length of our packed integer.	2017-05-10 12:17:51 +01:00
Patrick J Cherry	6e75dc4e17	Re-instate this as an arch-independent package, and remove gcc call We're now assuming that the size of size_t is a long unsigned integer. In the kernel there's a comment: /* * Most 32 bit architectures use "unsigned int" size_t, * and all 64 bit architectures use "unsigned long" size_t. */ On 32 bit architectures, an unsigned int is the same size as an unsigned long anyway, so I think this assumption is OK.	2017-05-10 11:38:10 +01:00
Patrick J Cherry	a539a87132	Revert "Revert "This is really an arch-independent package"" This reverts commit `c7d9554d63`.	2017-05-10 11:38:02 +01:00
Patrick J Cherry	c7d9554d63	Revert "This is really an arch-independent package" This reverts commit `2614fdd90d`.	2017-05-10 10:11:14 +01:00
Ian Chilton	e2543fb32b	Merge branch 'package-gem' into 'master' Added gem packaging job See merge request !2	2017-03-07 16:52:00 +00:00
Patrick J Cherry	e7ba3b40c2	Added gem packaging job	2017-03-07 16:25:15 +00:00
Steve Kemp	f591cd8dcb	Merge branch '2-package-and-publish-in-gitlab-ci-retire-maker2-job' into 'master' Build in gitlab-ci Closes #2 See merge request !1	2017-03-01 08:38:06 +00:00
Patrick J Cherry	b25a4b8744	Updated changelog	2017-02-28 16:44:50 +00:00
Patrick J Cherry	a389edbf27	Set correct image for publishing	2017-02-28 16:39:58 +00:00
Patrick J Cherry	8c21f7c28f	Use docker images to build	2017-02-28 16:34:13 +00:00
Patrick J Cherry	2614fdd90d	This is really an arch-independent package	2017-02-28 16:33:28 +00:00
Patrick J Cherry	230c5f8641	Added quilt as a build-dep	2017-02-28 16:28:56 +00:00
Patrick J Cherry	17cf206279	Added correct debbuildopt	2017-02-28 16:25:05 +00:00
Patrick J Cherry	15a303cb97	Use quilt to build	2017-02-28 16:21:31 +00:00
Patrick J Cherry	7488920028	Update sautobuild just do do a binary build; also save artifacts	2017-02-28 16:20:27 +00:00
Patrick J Cherry	ae655dde0e	added wheezy	2017-02-28 16:17:10 +00:00
Patrick J Cherry	4c7488d928	gitlab-ci: Checkout master before trying to do stuff	2017-02-22 13:06:20 +00:00
Patrick J Cherry	1aff2698f7	gitlab-ci: Updated some more	2017-02-22 13:05:19 +00:00
Patrick J Cherry	c3a79718fa	Use sautobuild to do the building	2017-02-22 12:09:19 +00:00
Patrick J Cherry	27e9ba595b	Add more git-buildpackage flags	2017-01-24 16:54:15 +00:00
Patrick J Cherry	ad1fbc788d	Checkout the branch, don't create it	2017-01-24 16:52:05 +00:00
Patrick J Cherry	1f2b994c45	First pass at gitlab-ci	2017-01-24 16:51:07 +00:00