diff options
author | SoonKyu Park <sk7.park@samsung.com> | 2016-09-23 10:35:49 +0900 |
---|---|---|
committer | SoonKyu Park <sk7.park@samsung.com> | 2016-09-23 10:35:49 +0900 |
commit | c46ae15366c67ee9ecabd417f1773f454e724aa7 (patch) | |
tree | 12329309b8067983625c63213f658a5ec8e05ba0 /packaging | |
parent | 4915f9a5a1da5eaa20c58e798a2ac5de0ef7eeb0 (diff) | |
parent | 4161678b3bf9d2eb36fdcb82c820bce02f6ba5bc (diff) | |
download | mic-c46ae15366c67ee9ecabd417f1773f454e724aa7.tar.gz mic-c46ae15366c67ee9ecabd417f1773f454e724aa7.tar.bz2 mic-c46ae15366c67ee9ecabd417f1773f454e724aa7.zip |
Merge release-0.27.1 from 'tools/mic'submit/tizen/20160923.060613accepted/tizen/common/20160923.160804tizen_0.27.1
Change-Id: Ifba625f3902104e6a21e8340f5b292f0190057d7
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/Makefile | 21 | ||||
-rw-r--r-- | packaging/mic.changes | 113 | ||||
-rw-r--r-- | packaging/mic.dsc | 11 | ||||
-rw-r--r-- | packaging/mic.spec | 85 |
4 files changed, 155 insertions, 75 deletions
diff --git a/packaging/Makefile b/packaging/Makefile deleted file mode 100644 index ae431d6..0000000 --- a/packaging/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PKG_NAME := mic -SPECFILE = $(addsuffix .spec, $(PKG_NAME)) -PKG_VERSION := $(shell grep '^Version: ' $(SPECFILE)|awk '{print $$2}') - -TARBALL := $(PKG_NAME)_$(PKG_VERSION).tar.gz - -dsc: $(TARBALL) - $(eval MD5=$(shell md5sum $(TARBALL) | sed "s/ / $(shell stat -c '%s' $(TARBALL)) /")) - @sed -i 's/^Version:.*/Version: $(PKG_VERSION)/' $(PKG_NAME).dsc - @sed -i 's/ [a-f0-9]\+ [0-9]\+ $(PKG_NAME).*tar.*/ $(MD5)/' $(PKG_NAME).dsc - -$(TARBALL): - cd "$$(git rev-parse --show-toplevel)" \ - && git archive --prefix $(PKG_NAME)-$(PKG_VERSION)/ HEAD \ - | gzip > "$(CURDIR)/$(TARBALL)" - -clean: - rm -f $(PKG_NAME)*.tar.gz - -all: clean dsc - diff --git a/packaging/mic.changes b/packaging/mic.changes index 6bae117..150074e 100644 --- a/packaging/mic.changes +++ b/packaging/mic.changes @@ -1,5 +1,114 @@ -* Thu Jun 06 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130603.185841@c80dd03 -- Fixed run time requirements +* Wed May 25 2016 Jianzhong Fang <jz.fang@samsung.com> - 0.27.1 + * new distribution support: Ubuntu 16.04, Fedora 23 + * add raw image format support + + * bug fix: + - Remove BmapCreate and Filemap source code from MIC (#DEVT-151) + +* Mon Mar 28 2016 Jianzhong Fang <jz.fang@samsung.com> - 0.27 + * new distribution support: CentOS 7, Debian 8, Fedora 21, + Fedora 22, openSUSE 13.2 + * generate manifest file to describe image information + * refactor archive and compress module + * support sparse handle for tar command + * replace system V with systemd on locale setting + * add qcow2 image format support + * add strict mode for package installing + * enable ssl_verify option in config file + * enhance checksums of outputs: md5sum, sha1sum, sha256sum (#DEVT-224) + * drop mic-native support (#DEVT-248) + * update mount option + * revert bind mount config file to instroot + * drop liveusb, livecd and raw image formats support (#DEVT-243, #DEVT-263) + * use argparse module to parse the cmd line (#DEVT-52) + + * bug fix: + - fix logfile incomplete in release option + - fix config file disappear in bootstrap + - fix aarch64 bin_format + - fix pylint + - fix real path of device mapper causing initrd failure + - fix qemu arm and arm64 issues + - fix AttributeError in zypp backend + - fix 'python-xml' depends used by cElements + - fix xml requirements + - fix logfile not in release of '--release' when creation failed + - fix copyright missing issue + - fix syslinux installation path issue in Arch Linux + - fix priority option of ks file not apply (#DEVT-254) + - fix need to check loop device after excute 'losetup --find' + - fix check scriptlet error file on /tmp/.postscript/error/ + - fix broken tar archive + +* Tue Mar 11 2014 Gui Chen <gui.chen@intel.com> - 0.24 + * enhance to handle password with special characters + * change python-zypp require to python-zypp-tizen + * add --repo comand option for local build + * add --user and --password option for %repo directive of ks file + * clean up some codes relevant to EULA agreement + * add hostname showing in log + * bug fix: + - fix chroot failed by space in image not enough + - fix obsolete packages incorrect handling + - fix yum backend failed to cache packages + - fix bare ip in no_proxy not working + - fix repeated log showing with yum backend + - fix loop device latency timing + - fix zypp failed to download by changing 'cachedir' + - fix 'mkfs' not working caused by mic-bootstrap install failed + +* Fri Dec 12 2013 Gui Chen <gui.chen@intel.com> - 0.23 + * new distribution support: Ubuntu 13.10 and OpenSUSE 13.1 + * split requirements to subpackage 'mic-native' to reduce mic's dependencies + * support arm64 architecture image creation in native mode + * new option '--interactive'/'--non-interactive' to enable/disable interaction + * new option '--uuid' for 'part' in ks file to set filesystem uuid + * export more variables related to installer framework for loop format + * bug fix: + - fix bootstrap handling if bootstrap package failed + - fix 'mapper_device' key error + - fix detailed error messages missing in mounting + - fix version comparing issue of urlgrabber in Fedora + +* Thu Oct 24 2013 Gui Chen <gui.chen@intel.com> - 0.22 + * use __version__ variable instead of VERSION file + * refactor msger module to ulitize logging module + * refine error class module + * improve installation in virtualenv + * add bash completion support + * add zsh completion support + * export mapper device related to installer framework + * update BmapCreate to the latest version + * bug fix: + - fix customized plugin_dir not work in bootstrap + - fix packing process exit on Ubuntu + - fix loop device alloaction failed on openSUSE + - fix incorrect number showing during installing + - set owner of cacheidr/outdir to SUDO_USER + - correct project url in setup.py + - fix mic not work when mic.conf disappear + +* Mon Aug 26 2013 Gui Chen <gui.chen@intel.com> - 0.21 + * new distribution support: Fedora 19 + * refactor chroot module to correct the logic + * add an alias for installerfw - installerfw_plugins + * remove fuser dependency to avoid some unmount issue + * enable proxy setting with authentication + * don't get proxy info from /etc/sysconfig/proxy ever + * kill processes inside chroot after post script running + * bug fix: + - fix bootloader options omitted + - raise when incorrectly set partition flags 'legacy_boot' + - fix wrong file descriptor issue + - fix some requires + +* Mon Jul 01 2013 Gui Chen <gui.chen@intel.com> - 0.20 + * new distribution support: CentOS 6 + * drop image creation if checked packages not present in image + * introduce 'installerfw' command in kickstart to customize configuration + * improve output message of post scripts + * bug fix: + - fix rpm not support 'VCS' tag traceback * Thu May 16 2013 Gui Chen <gui.chen@intel.com> - 0.19 - new distribution support: Ubuntu 13.04 and openSUSE 12.3 diff --git a/packaging/mic.dsc b/packaging/mic.dsc deleted file mode 100644 index bf39ca0..0000000 --- a/packaging/mic.dsc +++ /dev/null @@ -1,11 +0,0 @@ -Format: 1.0 -Source: mic -Binary: mic -Architecture: all -Version: 0.19 -Maintainer: Jian-feng Ding <jian-feng.ding@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 -Files: - 1f266944838a142e657aa0244e7f15e5 1684957 mic_0.15.tar.gz diff --git a/packaging/mic.spec b/packaging/mic.spec index 11733ac..3f70bd3 100644 --- a/packaging/mic.spec +++ b/packaging/mic.spec @@ -1,51 +1,45 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_version: %define python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")} + +%define rc_version 0 + +%if 0%{?rc_version} +%define release_prefix 0.rc%{rc_version}. +%endif + Name: mic Summary: Image Creator for Linux Distributions -Version: 0.19 -Release: 0 -Group: System/Utilities -License: GPL-2.0 +Version: 0.27.1 +Release: %{?release_prefix}%{?opensuse_bs:<CI_CNT>.<B_CNT>}%{!?opensuse_bs:0} +Group: Development/Tools +License: GPLv2 BuildArch: noarch URL: http://www.tizen.org -Source0: %{name}-%{version}.tar.gz +Source0: %{name}_%{version}.tar.gz %if 0%{?tizen_version:1} Source1001: mic.manifest %endif -Requires: python-rpm -Requires: util-linux -Requires: coreutils -Requires: python >= 2.5 -Requires: e2fsprogs -Requires: dosfstools >= 2.11-8 -Requires: syslinux >= 3.82 -Requires: kpartx -Requires: parted -Requires: device-mapper -Requires: /usr/bin/genisoimage -Requires: cpio -#Requires: isomd5sum -Requires: gzip -Requires: bzip2 -Requires: python-urlgrabber -Requires: yum >= 3.2.24 -%if ! 0%{?centos_version} -%if 0%{?suse_version} -Requires: btrfsprogs -%else -Requires: btrfs-progs + +Requires: python >= 2.6 +Requires: python-urlgrabber >= 3.9.0 +%if 0%{?suse_version} || 0%{?tizen_version:1} +Requires: python-xml %endif + +%if "%{?python_version}" < "2.7" +Requires: python-argparse %endif -%if 0%{?suse_version} -Requires: squashfs >= 4.0 -Requires: python-m2crypto +%if 0%{?tizen_version:1} +Requires: python-rpm %else -Requires: squashfs >= 4.0 -Requires: python-M2Crypto +Requires: rpm-python %endif -%if 0%{?fedora_version} || 0%{?centos_version} -Requires: syslinux-extlinux -%endif +Requires: cpio +# not neccessary +Requires: gzip +Requires: bzip2 %if 0%{?tizen_version:1} Requires: qemu-linux-user @@ -53,8 +47,6 @@ Requires: qemu-linux-user Requires: qemu-arm-static %endif -Requires: python-zypp - BuildRequires: python-devel %if ! 0%{?tizen_version:1} BuildRequires: python-docutils @@ -80,7 +72,7 @@ cp %{SOURCE1001} . %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %if ! 0%{?tizen_version:1} -%__make man +make man %endif %install @@ -92,11 +84,19 @@ rm -rf %{buildroot} %endif # install man page -mkdir -p %{buildroot}%{_mandir}/man1 +mkdir -p %{buildroot}/%{_prefix}/share/man/man1 %if ! 0%{?tizen_version:1} -install -m644 doc/mic.1 %{buildroot}%{_mandir}/man1 +install -m644 doc/mic.1 %{buildroot}/%{_prefix}/share/man/man1 %endif +# install bash completion +install -d -m0755 %{buildroot}/%{_sysconfdir}/bash_completion.d/ +install -Dp -m0755 etc/bash_completion.d/%{name}.sh %{buildroot}/%{_sysconfdir}/bash_completion.d/ + +# install zsh completion +install -d -m0755 %{buildroot}/%{_sysconfdir}/zsh_completion.d/ +install -Dp -m0755 etc/zsh_completion.d/_%{name} %{buildroot}/%{_sysconfdir}/zsh_completion.d/ + %if ! 0%{?centos_version} %fdupes %{buildroot} %endif @@ -120,4 +120,7 @@ install -m644 doc/mic.1 %{buildroot}%{_mandir}/man1 %{python_sitelib}/* %dir %{_prefix}/lib/%{name} %{_prefix}/lib/%{name}/* -%{_bindir}/* +%{_bindir}/mic +%{_sysconfdir}/bash_completion.d +%{_sysconfdir}/zsh_completion.d + |