diff -Nru mic-0.27.3/ChangeLog mic-0.27.4/ChangeLog --- mic-0.27.3/ChangeLog 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/ChangeLog 2017-04-11 03:55:48.000000000 +0000 @@ -1,3 +1,11 @@ +Release 0.27.4 - Wed Apr 5 2017 - SoonKyu Park +===================================================================== + * Fixup changelog that causes errors + * Merge add mipsel register on binfmt_misc && Add support of qemu-mipsel patch + * Replace 'copy' to 'symbolic link' in timeznoe setting inside mic + * Copy ks setting lang to file /etc/config/mic_language for other use + * Show logs inside 'Running scripts' in mic + Release 0.27.3 - Mon Dec 19 2016 - Jiankang Fan ===================================================================== * Support vdfs and squashfs image creation diff -Nru mic-0.27.3/debian/changelog mic-0.27.4/debian/changelog --- mic-0.27.3/debian/changelog 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/debian/changelog 2017-04-11 03:55:48.000000000 +0000 @@ -1,8 +1,17 @@ -mic (0.27.3-0~201702011044~ubuntu14.04.1) trusty; urgency=low +mic (0.27.4-0ubuntu0~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- MyungJoo Ham Wed, 01 Feb 2017 12:51:26 +0000 + -- Donghoon Shin Tue, 11 Apr 2017 03:55:48 +0000 + +mic (0.27.4) unstable; urgency=low + * Fixup changelog that causes errors + * Merge add mipsel register on binfmt_misc && Add support of qemu-mipsel patch + * Replace 'copy' to 'symbolic link' in timeznoe setting inside mic + * Copy ks setting lang to file /etc/config/mic_language for other use + * Show logs inside 'Running scripts' in mic + + -- SoonKyu Park Wed, 5 Apr 2017 17:00:00 +0900 mic (0.27.3) unstable; urgency=low * support vdfs and squashfs image creation diff -Nru mic-0.27.3/debian/control mic-0.27.4/debian/control --- mic-0.27.3/debian/control 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/debian/control 2017-04-11 03:55:48.000000000 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: extra Maintainer: Jian-feng Ding -Build-Depends: debhelper (>= 7.0.15), cdbs, python-dev, dh-python, python-docutils +Build-Depends: debhelper (>= 7.0.15), cdbs, python-dev, python-support, python-docutils Standards-Version: 3.8.0 Homepage: http://www.tizen.org diff -Nru mic-0.27.3/debian/git-build-recipe.manifest mic-0.27.4/debian/git-build-recipe.manifest --- mic-0.27.3/debian/git-build-recipe.manifest 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/debian/git-build-recipe.manifest 2017-04-11 03:55:48.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-0~201702011044 -lp:tizen-mic git-commit:ccf07bc292cd68d4ba7f9f37744065b06f5eb7dc +# git-build-recipe format 0.4 deb-version {debversion}-0ubuntu0 +lp:tizen-mic git-commit:eefd7b410516df05c3d3e42341f58042a1787931 diff -Nru mic-0.27.3/debian/rules mic-0.27.4/debian/rules --- mic-0.27.3/debian/rules 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/debian/rules 2017-04-11 03:55:48.000000000 +0000 @@ -45,7 +45,7 @@ dh_strip dh_compress dh_fixperms - dh_python2 + dh_pysupport dh_installdeb dh_shlibdeps dh_gencontrol diff -Nru mic-0.27.3/doc/RELEASE_NOTES mic-0.27.4/doc/RELEASE_NOTES --- mic-0.27.3/doc/RELEASE_NOTES 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/doc/RELEASE_NOTES 2017-04-11 03:55:48.000000000 +0000 @@ -1,3 +1,21 @@ +MIC Image Creator 0.27.4 Release Notes +====================================== +Released Apr 5 2017 + +This release note documents the changes included in the new release. And +the release contains new features, enhancements and bug fixes. + +New Features & Enhancements +-------------------------- + * Fixup changelog that causes errors + * Merge add mipsel register on binfmt_misc && Add support of qemu-mipsel patch + * Replace 'copy' to 'symbolic link' in timeznoe setting inside mic + * Copy ks setting lang to file /etc/config/mic_language for other use + * Show logs inside 'Running scripts' in mic + +Bug Fixes +--------- + MIC Image Creator 0.27.3 Release Notes ====================================== Released Dec 19 2016 diff -Nru mic-0.27.3/mic/imager/baseimager.py mic-0.27.4/mic/imager/baseimager.py --- mic-0.27.3/mic/imager/baseimager.py 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/mic/imager/baseimager.py 2017-04-11 03:55:48.000000000 +0000 @@ -155,25 +155,45 @@ if len(self.ks.handler.partition.partitions) > 1: self.multiple_partitions = True - if self.target_arch and self.target_arch.startswith("arm"): - for dep in self._dep_checks: - if dep == "extlinux": - self._dep_checks.remove(dep) - - if not os.path.exists("/usr/bin/qemu-arm") or \ - not misc.is_statically_linked("/usr/bin/qemu-arm"): - self._dep_checks.append("qemu-arm-static") - - if os.path.exists("/proc/sys/vm/vdso_enabled"): - vdso_fh = open("/proc/sys/vm/vdso_enabled","r") - vdso_value = vdso_fh.read().strip() - vdso_fh.close() - if (int)(vdso_value) == 1: - msger.warning("vdso is enabled on your host, which might " - "cause problems with arm emulations.\n" - "\tYou can disable vdso with following command before " - "starting image build:\n" - "\techo 0 | sudo tee /proc/sys/vm/vdso_enabled") + if self.target_arch: + if self.target_arch.startswith("arm"): + for dep in self._dep_checks: + if dep == "extlinux": + self._dep_checks.remove(dep) + + if not os.path.exists("/usr/bin/qemu-arm") or \ + not misc.is_statically_linked("/usr/bin/qemu-arm"): + self._dep_checks.append("qemu-arm-static") + + if os.path.exists("/proc/sys/vm/vdso_enabled"): + vdso_fh = open("/proc/sys/vm/vdso_enabled","r") + vdso_value = vdso_fh.read().strip() + vdso_fh.close() + if (int)(vdso_value) == 1: + msger.warning("vdso is enabled on your host, which might " + "cause problems with arm emulations.\n" + "\tYou can disable vdso with following command before " + "starting image build:\n" + "\techo 0 | sudo tee /proc/sys/vm/vdso_enabled") + elif self.target_arch == "mipsel": + for dep in self._dep_checks: + if dep == "extlinux": + self._dep_checks.remove(dep) + + if not os.path.exists("/usr/bin/qemu-mipsel") or \ + not misc.is_statically_linked("/usr/bin/qemu-mipsel"): + self._dep_checks.append("qemu-mipsel-static") + + if os.path.exists("/proc/sys/vm/vdso_enabled"): + vdso_fh = open("/proc/sys/vm/vdso_enabled","r") + vdso_value = vdso_fh.read().strip() + vdso_fh.close() + if (int)(vdso_value) == 1: + msger.warning("vdso is enabled on your host, which might " + "cause problems with mipsel emulations.\n" + "\tYou can disable vdso with following command before " + "starting image build:\n" + "\techo 0 | sudo tee /proc/sys/vm/vdso_enabled") # make sure the specified tmpdir and cachedir exist if not os.path.exists(self.tmpdir): @@ -1144,8 +1164,8 @@ env = env, stdout = subprocess.PIPE, stderr = subprocess.STDOUT) - for entry in p.communicate()[0].splitlines(): - msger.info(entry) + while p.poll() == None: + msger.info(p.stdout.readline().strip()) except OSError, (err, msg): raise CreatorError("Failed to execute %%post script " "with '%s' : %s" % (s.interp, msg)) diff -Nru mic-0.27.3/mic/__init__.py mic-0.27.4/mic/__init__.py --- mic-0.27.3/mic/__init__.py 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/mic/__init__.py 2017-04-11 03:55:48.000000000 +0000 @@ -16,7 +16,7 @@ import os, sys -__version__ = "0.27.3" +__version__ = "0.27.4" cur_path = os.path.dirname(__file__) or '.' sys.path.insert(0, cur_path + '/3rdparty') diff -Nru mic-0.27.3/mic/kickstart/__init__.py mic-0.27.4/mic/kickstart/__init__.py --- mic-0.27.3/mic/kickstart/__init__.py 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/mic/kickstart/__init__.py 2017-04-11 03:55:48.000000000 +0000 @@ -167,6 +167,12 @@ f.write("LANG=\"" + kslang.lang + "\"\n") f.close() + #cp ks lang setting to other file, then can access the file in %post section + fs.makedirs(self.path("/etc/config")) + f = open(self.path("/etc/config/mic_language"), "w+") + f.write("LANG=\"" + kslang.lang + "\"\n") + f.close() + class KeyboardConfig(KickstartConfig): """A class to apply a kickstart keyboard configuration to a system.""" @apply_wrapper @@ -197,12 +203,12 @@ tz_source = "/usr/share/zoneinfo/%s" % (tz) tz_dest = "/etc/localtime" try: - cpcmd = fs.find_binary_inchroot('cp', self.instroot) + cpcmd = fs.find_binary_inchroot('ln', self.instroot) if cpcmd: - self.call([cpcmd, "-f", tz_source, tz_dest]) + self.call([cpcmd, "-s", tz_source, tz_dest]) else: - cpcmd = fs.find_binary_path('cp') - subprocess.call([cpcmd, "-f", + cpcmd = fs.find_binary_path('ln') + subprocess.call([cpcmd, "-s", self.path(tz_source), self.path(tz_dest)]) except (IOError, OSError), (errno, msg): diff -Nru mic-0.27.3/mic/utils/misc.py mic-0.27.4/mic/utils/misc.py --- mic-0.27.3/mic/utils/misc.py 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/mic/utils/misc.py 2017-04-11 03:55:48.000000000 +0000 @@ -908,6 +908,13 @@ arm_binary = "qemu-aarch64-static" else: raise CreatorError("Please install a statically-linked %s" % arm_binary) + elif arch == "mipsel": + node = "/proc/sys/fs/binfmt_misc/mipsel" + arm_binary = "qemu-mipsel" + if not os.path.exists("/usr/bin/%s" % arm_binary) or not is_statically_linked("/usr/bin/%s"): + arm_binary = "qemu-mipsel-static" + if not os.path.exists("/usr/bin/%s" % arm_binary): + raise CreatorError("Please install a statically-linked %s" % arm_binary) else: node = "/proc/sys/fs/binfmt_misc/arm" arm_binary = "qemu-arm" @@ -937,6 +944,8 @@ if not os.path.exists(node): if arch == "aarch64": qemu_arm_string = ":aarch64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xb7:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff:%s:\n" % qemu_emulator + elif arch == "mipsel": + qemu_arm_string = ":mipsel:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x08\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xfe\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:%s:\n" % qemu_emulator else: qemu_arm_string = ":arm:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfa\\xff\\xff\\xff:%s:\n" % qemu_emulator with open("/proc/sys/fs/binfmt_misc/register", "w") as fd: diff -Nru mic-0.27.3/packaging/mic.changes mic-0.27.4/packaging/mic.changes --- mic-0.27.3/packaging/mic.changes 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/packaging/mic.changes 2017-04-11 03:55:48.000000000 +0000 @@ -1,3 +1,10 @@ +* Wed Apr 5 2017 SoonKyu Park - 0.27.4 + * Fixup changelog that causes errors + * Merge add mipsel register on binfmt_misc && Add support of qemu-mipsel patch + * Replace 'copy' to 'symbolic link' in timeznoe setting inside mic + * Copy ks setting lang to file /etc/config/mic_language for other use + * Show logs inside 'Running scripts' in mic + * Mon Dec 19 2016 Jiankang Fan - 0.27.3 * Show pkgid when install pkg error * support vdfs and squashfs image creation diff -Nru mic-0.27.3/packaging/mic.spec mic-0.27.4/packaging/mic.spec --- mic-0.27.3/packaging/mic.spec 2017-02-01 12:51:26.000000000 +0000 +++ mic-0.27.4/packaging/mic.spec 2017-04-11 03:55:48.000000000 +0000 @@ -9,7 +9,7 @@ Name: mic Summary: Image Creator for Linux Distributions -Version: 0.27.3 +Version: 0.27.4 Release: %{?release_prefix}%{?opensuse_bs:.}%{!?opensuse_bs:0} Group: Development/Tools License: GPLv2