diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-01-27 07:33:55 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-01-27 07:33:55 +0000 |
| commit | fc2c1c7afff05c274cd53b65d610192392733544 (patch) | |
| tree | 07cb357551db7497dbfa5aba1c3b6eb5714967a8 /mount | |
| parent | 9d619e76ea70039e6ddd3a060466950b64187905 (diff) | |
| download | illumos-packaging-fc2c1c7afff05c274cd53b65d610192392733544.tar.gz | |
Build hsfs and pcfs
Diffstat (limited to 'mount')
| -rw-r--r-- | mount/debian/patches/hsfs-mount-no-etc.patch | 21 | ||||
| -rw-r--r-- | mount/debian/patches/hsfs-no-fstyp-link.patch | 13 | ||||
| -rw-r--r-- | mount/debian/patches/series | 2 | ||||
| -rwxr-xr-x | mount/debian/rules | 2 |
4 files changed, 37 insertions, 1 deletions
diff --git a/mount/debian/patches/hsfs-mount-no-etc.patch b/mount/debian/patches/hsfs-mount-no-etc.patch new file mode 100644 index 0000000..f6880dc --- /dev/null +++ b/mount/debian/patches/hsfs-mount-no-etc.patch @@ -0,0 +1,21 @@ +Index: mount/usr/src/cmd/fs.d/hsfs/mount/Makefile +=================================================================== +--- mount.orig/usr/src/cmd/fs.d/hsfs/mount/Makefile 2012-10-08 00:25:23.000000000 +0000 ++++ mount/usr/src/cmd/fs.d/hsfs/mount/Makefile 2013-01-27 06:49:23.361175459 +0000 +@@ -25,15 +25,7 @@ + # + + FSTYPE= hsfs +-LIBPROG= mount +-PROG= $(LIBPROG) +-ROOTFS_PROG= $(PROG) +- +-# duplicate ROOTLIBFSTYPE value needed for installation rule +-# we must define this before including Makefile.fstype +-ROOTLIBFSTYPE = $(ROOT)/usr/lib/fs/$(FSTYPE) +-$(ROOTLIBFSTYPE)/%: $(ROOTLIBFSTYPE) % +- $(RM) $@; $(SYMLINK) ../../../../etc/fs/$(FSTYPE)/$(PROG) $@ ++LIBPROG= mount + + include ../../Makefile.fstype + include ../../Makefile.mount diff --git a/mount/debian/patches/hsfs-no-fstyp-link.patch b/mount/debian/patches/hsfs-no-fstyp-link.patch new file mode 100644 index 0000000..fdaa95e --- /dev/null +++ b/mount/debian/patches/hsfs-no-fstyp-link.patch @@ -0,0 +1,13 @@ +Index: mount/usr/src/cmd/fs.d/hsfs/fstyp/Makefile +=================================================================== +--- mount.orig/usr/src/cmd/fs.d/hsfs/fstyp/Makefile 2012-10-08 00:25:23.000000000 +0000 ++++ mount/usr/src/cmd/fs.d/hsfs/fstyp/Makefile 2013-01-27 06:46:08.759287466 +0000 +@@ -67,8 +67,6 @@ + all: $(LIBPROG) + + install: all +- $(RM) $(ROOTLIBFSTYPE)/fstyp +- $(LN) $(ROOTUSRSBIN)/fstyp $(ROOTLIBFSTYPE)/fstyp + + lint: lint_SRCS + diff --git a/mount/debian/patches/series b/mount/debian/patches/series index 3d08310..15a8d32 100644 --- a/mount/debian/patches/series +++ b/mount/debian/patches/series @@ -7,3 +7,5 @@ pcfs-mkfs-avoid-macros.h.patch pcfs-mkfs-include-time.h.patch pcfs-fsck-pcfs_bpb.h-amd64.patch udfs-ud_lib.c-pointers.patch +hsfs-no-fstyp-link.patch +hsfs-mount-no-etc.patch diff --git a/mount/debian/rules b/mount/debian/rules index a41190c..325bd07 100755 --- a/mount/debian/rules +++ b/mount/debian/rules @@ -5,7 +5,7 @@ include /usr/share/dpkg/buildflags.mk export DH_VERBOSE = 1 -fs := mntfs lofs objfs ctfs tmpfs dev fd proc sharefs # pcfs udfs hsfs ufs +fs := mntfs lofs objfs ctfs tmpfs dev fd proc sharefs hsfs pcfs # udfs ufs cmd := \ $(fs:%=fs.d/%) \ |