split native requirements to native-mic package

Change-Id: I3dda824ac750573b4403e087fff31bc78a3ad29a
Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/debian/control b/debian/control
index 43c48e8..c1b481a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,17 +8,35 @@ Homepage: http://www.tizen.org
 
 Package: mic
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
+Depends: ${misc:Depends}, ${python:Depends},
+ rpm,
  python-rpm,
+ python-urlgrabber,
+ cpio,
  bzip2,
- dmsetup,
- dosfstools,
+ gzip
+Conflicts:
+ mic2
+Description: image creator for Linux distributions
+  The tool mic is used to create and manipulate images for Linux distributions.
+  It is composed of three subcommand\: create, convert, chroot. Subcommand create
+  is used to create images with different types; subcommand convert is used to
+  convert an image to a specified type; subcommand chroot is used to chroot into
+  an image.
+
+Package: mic-native
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
+ util-linux,
+ coreutils,
+ psmisc,
  e2fsprogs (>= 1.41),
+ dosfstools,
  isomd5sum,
  genisoimage,
+ dmsetup,
  kpartx,
  parted,
- psmisc,
  squashfs-tools (>= 4.0),
  yum (>= 3.2),
  syslinux (>= 2:4.05),
@@ -26,17 +44,11 @@ Depends: ${misc:Depends}, ${python:Depends}, ${dist:Depends},
  libzypp,
  tizen-python-zypp-0.5.14,
  python-m2crypto,
- python-urlgrabber,
- psmisc
+ mic,
 Recommends:
  binfmt-support,
  btrfs-tools,
  udisks | hal
-Conflicts:
- mic2
-Description: image creator for Linux distributions
-  The tool mic is used to create and manipulate images for Linux distributions.
-  It is composed of three subcommand\: create, convert, chroot. Subcommand create
-  is used to create images with different types; subcommand convert is used to
-  convert an image to a specified type; subcommand chroot is used to chroot into
-  an image.
+Description: Native support for mic
+ The native support package for mic, it includes all requirements
+ for mic native running.

diff --git a/debian/docs b/debian/docs
index a1320b1..678115e 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README.rst
+doc/RELEASE_NOTES

diff --git a/debian/mic-native.install b/debian/mic-native.install
new file mode 100644 (file)
index 0000000..dfb6146
--- /dev/null
+++ b/debian/mic-native.install
@@ -0,0 +1 @@
+debian/mic/usr/bin/mic-native

diff --git a/debian/mic.install b/debian/mic.install
new file mode 100644 (file)
index 0000000..499f595
--- /dev/null
+++ b/debian/mic.install
@@ -0,0 +1,3 @@
+debian/mic/usr/bin/mic
+debian/mic/usr/lib/*
+debian/mic/etc/*

diff --git a/debian/rules b/debian/rules
index e142fa8..9049449 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ install: build
        install -m644 doc/mic.1 $(CURDIR)/debian/mic/usr/share/man/man1
        install -m755 etc/mic.bash $(CURDIR)/debian/mic/etc/bash_completion.d/mic.sh
        install -m755 etc/_mic $(CURDIR)/debian/mic/etc/zsh_completion.d/_mic
+       install -m755 tools/mic $(CURDIR)/debian/mic/usr/bin/mic-native
        python setup.py install --root=$(CURDIR)/debian/mic
 
 binary-indep: build install

diff --git a/packaging/mic.dsc b/packaging/mic.dsc
index ff4bf8e..f511cd3 100644 (file)
--- a/packaging/mic.dsc
+++ b/packaging/mic.dsc
@@ -1,9 +1,9 @@
 Format: 1.0
 Source: mic
-Binary: mic
+Binary: mic, mic-native
 Architecture: all
 Version: 0.22
-Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
+Maintainer: Gui Chen <gui.chen@intel.com>
 Homepage: http://www.tizen.org
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 7.0.15), dpatch, cdbs, python-dev, python-support, python-docutils

diff --git a/packaging/mic.spec b/packaging/mic.spec
index 0cda6da..f43208e 100644 (file)
--- a/packaging/mic.spec
+++ b/packaging/mic.spec
@@ -4,45 +4,54 @@ Name:       mic
 Summary:    Image Creator for Linux Distributions
 Version:    0.22
 Release:    1
-Group:      System/Base
+Group:      Development/Tools
 License:    GPLv2
 BuildArch:  noarch
 URL:        http://www.tizen.org
 Source0:    %{name}_%{version}.tar.gz
+
+Requires:   python >= 2.6
+Requires:   python-urlgrabber >= 3.9.0
 %if 0%{?tizen_version:1}
 Requires:   python-rpm
 %else
 Requires:   rpm-python
 %endif
+
+Requires:   cpio
+# not neccessary
+Requires:   gzip
+Requires:   bzip2
+
+BuildRequires:  python-devel
+%if ! 0%{?tizen_version:1}
+BuildRequires:  python-docutils
+%endif
+
+Obsoletes:  mic2
+
+BuildRoot:  %{_tmppath}/%{name}_%{version}-build
+
+%description
+The tool mic is used to create and manipulate images for Linux distributions.
+It is composed of three subcommand\: create, convert, chroot. Subcommand create
+is used to create images with different types; subcommand convert is used to
+convert an image to a specified type; subcommand chroot is used to chroot into
+an image.
+
+%package native
+Summary:    Native support for mic
 Requires:   util-linux
 Requires:   coreutils
-Requires:   python >= 2.5
+Requires:   psmisc
 Requires:   e2fsprogs
 Requires:   dosfstools >= 2.11
-%if 0%{?centos_version}
-Requires:   syslinux >= 3.82
-%else
-Requires:   syslinux >= 4.05
-%endif
 Requires:   kpartx
 Requires:   parted
 Requires:   device-mapper
-Requires:   /usr/bin/genisoimage
-Requires:   cpio
-%if ! 0%{?tizen_version:1}
-Requires:   isomd5sum
-%endif
-Requires:   gzip
-Requires:   bzip2
-Requires:   python-urlgrabber >= 3.9.0
-Requires:   yum >= 3.2.24
-Requires:   psmisc
-%if ! 0%{?centos_version}
-%if 0%{?suse_version}
-Requires:   btrfsprogs
-%else
-Requires:   btrfs-progs
-%endif
+Requires:   syslinux >= 3.82
+%if ! 0%{?suse_version}
+Requires:   syslinux-extlinux >= 3.82
 %endif
 
 %if 0%{?suse_version} || 0%{?tizen_version:1}
@@ -53,42 +62,42 @@ Requires:   squashfs-tools >= 4.0
 Requires:   m2crypto
 %endif
 
-%if 0%{?fedora_version} || 0%{?centos_version}
-Requires:   syslinux-extlinux
-%endif
-
 %if 0%{?suse_version} || 0%{?tizen_version:1}
 Requires:   /usr/bin/qemu-arm
 %else
 Requires:   qemu-arm-static
 %endif
 
-Requires:   tizen-python-zypp
-
-BuildRequires:  python-devel
 %if ! 0%{?tizen_version:1}
-BuildRequires:  python-docutils
+Requires:   isomd5sum
+Requires:   /usr/bin/genisoimage
 %endif
 
-Obsoletes:  mic2
+Requires:   yum >= 3.2.24
+%if 0%{?tizen_version:1}
+Requires:   python-zypp
+%else
+Requires:   tizen-python-zypp
+%endif
 
-BuildRoot:  %{_tmppath}/%{name}_%{version}-build
+Requires:   mic
 
-%description
-The tool mic is used to create and manipulate images for Linux distributions.
-It is composed of three subcommand\: create, convert, chroot. Subcommand create
-is used to create images with different types; subcommand convert is used to
-convert an image to a specified type; subcommand chroot is used to chroot into
-an image.
+#%if 0%{?suse_version}
+#Requires:   btrfsprogs
+#%else
+#Requires:   btrfs-progs
+#%endif
+
+%description native
+The native support package for mic, it includes all requirements
+for mic native running.
 
 %prep
 %setup -q -n %{name}-%{version}
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-%if ! 0%{?tizen_version:1}
 make man
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -100,9 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # install man page
 mkdir -p %{buildroot}/%{_prefix}/share/man/man1
-%if ! 0%{?tizen_version:1}
 install -m644 doc/mic.1 %{buildroot}/%{_prefix}/share/man/man1
-%endif
 
 # install bash completion
 install -d -m0755 %{buildroot}/%{_sysconfdir}/bash_completion.d/
@@ -112,6 +119,8 @@ install -Dp -m0755 etc/%{name}.bash %{buildroot}/%{_sysconfdir}/bash_completion.
 install -d -m0755 %{buildroot}/%{_sysconfdir}/zsh_completion.d/
 install -Dp -m0755 etc/_%{name} %{buildroot}/%{_sysconfdir}/zsh_completion.d/_%{name}
 
+install -Dp -m0755 tools/mic %{buildroot}/%{_bindir}/mic-native
+
 %files
 %defattr(-,root,root,-)
 %doc doc/*
@@ -124,6 +133,9 @@ install -Dp -m0755 etc/_%{name} %{buildroot}/%{_sysconfdir}/zsh_completion.d/_%{
 %{python_sitelib}/*
 %dir %{_prefix}/lib/%{name}
 %{_prefix}/lib/%{name}/*
-%{_bindir}/*
+%{_bindir}/mic
 %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/zsh_completion.d
+
+%files native
+%{_bindir}/mic-native