Merge lp:~chipaca/snappy/snappy-tar-pack-mknod into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Add support for adding devices in snappy build.

This is lp:~mvo/snappy/snappy-tar-pack-mknod merged with trunk and conflcits resolved.

[Sergio Schvezov (sergiusens)]

one comment useful for troubleshooting, otherwise looks good and thanks!

[Sergio Schvezov (sergiusens)]

good, just a cosmetic, but good good

review: Approve

[Snappy Tarmac (snappydevtarmac)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Michael Vogt (mvo)]

reply to inline comment

=== modified file 'clickdeb/deb.go'
--- clickdeb/deb.go	2015-04-23 11:12:32 +0000
+++ clickdeb/deb.go	2015-05-07 20:37:19 +0000
@@ -289,8 +289,8 @@
 		}
 
 		// check if we support this type
-		if !st.Mode().IsRegular() && !helpers.IsSymlink(st.Mode()) && !st.Mode().IsDir() {
-			return nil
+		if !st.Mode().IsRegular() && !helpers.IsSymlink(st.Mode()) && !st.Mode().IsDir() && !helpers.IsDevice(st.Mode()) {
+			return fmt.Errorf("unsupported file type for %s", path)
 		}
 
 		// check our exclude function
@@ -307,6 +307,17 @@
 			return err
 		}
 
+		// tar.FileInfoHeader does include the fact that its a
+		// char/block device, but does not set major/minor :/
+		if helpers.IsDevice(st.Mode()) {
+			major, minor, err := helpers.MajorMinor(st)
+			if err != nil {
+				return err
+			}
+			hdr.Devmajor = int64(major)
+			hdr.Devminor = int64(minor)
+		}
+
 		// exclude "."
 		relativePath := "." + path[len(sourceDir):]
 		if relativePath == "." {

=== modified file 'clickdeb/deb_test.go'
--- clickdeb/deb_test.go	2015-04-13 20:58:56 +0000
+++ clickdeb/deb_test.go	2015-05-07 20:37:19 +0000
@@ -25,6 +25,7 @@
 	"path/filepath"
 	"regexp"
 	"strings"
+	"syscall"
 	"testing"
 
 	. "launchpad.net/gocheck"
@@ -175,7 +176,6 @@
 	// create tar
 	tempdir := c.MkDir()
 	tarfile := filepath.Join(tempdir, "data.tar.xz")
-	tarfile = "/tmp/lala.tar.xz"
 	err = tarCreate(tarfile, builddir, func(path string) bool {
 		return !strings.HasSuffix(path, "exclude-me")
 	})
@@ -213,3 +213,16 @@
 	c.Assert(err, IsNil)
 	c.Assert(r.Match(output), Equals, false)
 }
+
+func (s *ClickDebTestSuite) TestTarCreateUnknownTypeFailsWithError(c *C) {
+
+	builddir := c.MkDir()
+	err := syscall.Mkfifo(filepath.Join(builddir, "fifo"), 0644)
+	c.Assert(err, IsNil)
+
+	tempdir := c.MkDir()
+	tarfile := filepath.Join(tempdir, "data.tar.xz")
+
+	err = tarCreate(tarfile, builddir, nil)
+	c.Assert(err, ErrorMatches, "unsupported file type for.*")
+}

=== modified file 'helpers/cp.go'
--- helpers/cp.go	2015-05-07 10:34:05 +0000
+++ helpers/cp.go	2015-05-07 20:37:19 +0000
@@ -20,6 +20,7 @@
 import (
 	"fmt"
 	"os"
+	"os/exec"
 )
 
 // CopyFlag is used to tweak the behaviour of CopyFile
@@ -89,3 +90,38 @@
 
 	return nil
 }
+
+// CopySpecialFile is used to copy all the things that are not files
+// (like device nodes, named pipes etc)
+func CopySpecialFile(path, dest string) error {
+	cmd := exec.Command("cp", "-av", path, dest)
+	if output, err := cmd.CombinedOutput(); err != nil {
+		if exitCode, err := ExitCode(err); err == nil {
+			return &ErrCopySpecialFile{
+				exitCode: exitCode,
+				output:   output,
+			}
+		}
+		return &ErrCopySpecialFile{
+			err:    err,
+			output: output,
+		}
+	}
+
+	return nil
+}
+
+// ErrCopySpecialFile is returned if a special file copy fails
+type ErrCopySpecialFile struct {
+	exitCode int
+	output   []byte
+	err      error
+}
+
+func (e ErrCopySpecialFile) Error() string {
+	if e.err == nil {
+		return fmt.Sprintf("failed to copy device node: %q (%v)", e.output, e.exitCode)
+	}
+
+	return fmt.Sprintf("failed to copy device node: %q (%v)", e.output, e.err)
+}

=== modified file 'helpers/cp_test.go'
--- helpers/cp_test.go	2015-05-02 14:40:45 +0000
+++ helpers/cp_test.go	2015-05-07 20:37:19 +0000
@@ -23,6 +23,7 @@
 	"os"
 	"path/filepath"
 	"strings"
+	"syscall"
 	"time"
 
 	. "launchpad.net/gocheck"
@@ -167,3 +168,22 @@
 func (mockstat) ModTime() time.Time { return time.Now() }
 func (mockstat) IsDir() bool        { return false }
 func (mockstat) Sys() interface{}   { return nil }
+
+func (s *cpSuite) TestCopySpecialFileSimple(c *C) {
+	src := filepath.Join(c.MkDir(), "fifo")
+	err := syscall.Mkfifo(src, 0644)
+	c.Assert(err, IsNil)
+	dst := filepath.Join(c.MkDir(), "copied-fifo")
+
+	err = CopySpecialFile(src, dst)
+	c.Assert(err, IsNil)
+
+	st, err := os.Stat(dst)
+	c.Assert(err, IsNil)
+	c.Assert((st.Mode() & os.ModeNamedPipe), Equals, os.ModeNamedPipe)
+}
+
+func (s *cpSuite) TestCopySpecialFileErrors(c *C) {
+	err := CopySpecialFile("no-such-file", "no-such-target")
+	c.Assert(err, ErrorMatches, ".*No such file or directory.*")
+}

=== modified file 'snappy/build.go'
--- snappy/build.go	2015-05-07 16:27:46 +0000
+++ snappy/build.go	2015-05-07 20:37:19 +0000
@@ -412,10 +412,22 @@
 		}
 
 		dest := filepath.Join(buildDir, path[len(sourceDir):])
+
+		// handle dirs
 		if info.IsDir() {
 			return os.Mkdir(dest, info.Mode())
 		}
 
+		// handle char/block devices
+		if helpers.IsDevice(info.Mode()) {
+			return helpers.CopySpecialFile(path, dest)
+		}
+
+		// fail if its unsupported
+		if !info.Mode().IsRegular() {
+			return fmt.Errorf("can not handle type of file %s", path)
+		}
+
 		// it's a file. Maybe we can link it?
 		if os.Link(path, dest) == nil {
 			// whee

=== modified file 'snappy/build_test.go'
--- snappy/build_test.go	2015-05-07 10:34:05 +0000
+++ snappy/build_test.go	2015-05-07 20:37:19 +0000
@@ -23,6 +23,7 @@
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 
 	"launchpad.net/snappy/helpers"
 
@@ -462,3 +463,15 @@
 	c.Assert(strings.Contains(string(readFiles), `drwxrwxrwx`), Equals, true)
 	c.Assert(strings.Contains(string(readFiles), `-rw-rw-rw-`), Equals, true)
 }
+
+func (s *SnapTestSuite) TestBuildFailsForUnknownType(c *C) {
+	sourceDir := makeExampleSnapSourceDir(c, `name: hello
+version: 1.0.1
+vendor: Foo <[e-mail]>
+`)
+	err := syscall.Mkfifo(filepath.Join(sourceDir, "fifo"), 0644)
+	c.Assert(err, IsNil)
+
+	_, err = Build(sourceDir, "")
+	c.Assert(err, ErrorMatches, "can not handle type of file .*")
+}