summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGui Chen <gui.chen@intel.com>2012-09-20 16:02:18 +0800
committerGui Chen <gui.chen@intel.com>2012-09-26 15:17:22 +0800
commitc6d74e7998dc05c55bed21e7b7b13897b7f75a9e (patch)
treefc7b5695db86392f03797c29006c7c7e455133da
parentfee503b47d468cbc7c539910796269b65cbff750 (diff)
downloadmic-c6d74e7998dc05c55bed21e7b7b13897b7f75a9e.tar.gz
mic-c6d74e7998dc05c55bed21e7b7b13897b7f75a9e.tar.bz2
mic-c6d74e7998dc05c55bed21e7b7b13897b7f75a9e.zip
relocate dist files and add change log
Change-Id: Idd31d153f36ff12b5a0aedee644d3811038b599b Signed-off-by: Gui Chen <gui.chen@intel.com>
-rw-r--r--etc/bootstrap.conf (renamed from distfiles/bootstrap.conf)0
-rw-r--r--etc/mic.conf.in (renamed from distfiles/mic.conf.in)0
-rw-r--r--packaging/debian.changelog237
-rw-r--r--packaging/debian/compat (renamed from distfiles/debian/compat)0
-rw-r--r--packaging/debian/control (renamed from distfiles/debian/control)0
-rw-r--r--packaging/debian/copyright (renamed from distfiles/debian/copyright)0
-rw-r--r--packaging/debian/docs (renamed from distfiles/debian/docs)0
-rwxr-xr-xpackaging/debian/rules (renamed from distfiles/debian/rules)0
-rw-r--r--packaging/mic.changes194
-rw-r--r--packaging/mic.dsc9
-rw-r--r--packaging/mic.spec (renamed from distfiles/mic.spec)25
-rw-r--r--setup.py6
12 files changed, 453 insertions, 18 deletions
diff --git a/distfiles/bootstrap.conf b/etc/bootstrap.conf
index c239eb3..c239eb3 100644
--- a/distfiles/bootstrap.conf
+++ b/etc/bootstrap.conf
diff --git a/distfiles/mic.conf.in b/etc/mic.conf.in
index b79603e..b79603e 100644
--- a/distfiles/mic.conf.in
+++ b/etc/mic.conf.in
diff --git a/packaging/debian.changelog b/packaging/debian.changelog
new file mode 100644
index 0000000..a6bb7ce
--- /dev/null
+++ b/packaging/debian.changelog
@@ -0,0 +1,237 @@
+mic (0.15) unstable; urgency=low
+
+ * Release 0.15, changes including:
+ - new bootstrap implementation: use bootstrap as default
+ - enable 'pkgmgr=auto' to use auto-selected backend
+ - just warning in chroot when not Tizen/MeeGo chroot dir
+ - remove username and password in zypp repo file
+ - update usage.rst for man page
+ - bug fix:
+ - fix https proxy issue in yum backend
+ - fix repodata checksum failed issue
+ - avoid traceback when loopback is NoneType
+
+ -- Gui Chen <gui.chen@intel.com> Fri, 31 Aug 2012 17:25:35 +0800
+
+mic (0.14) unstable; urgency=low
+
+ * Release 0.14, changes including:
+ - use cached metadata when checksum is not changed
+ - skip non-fatal error in ks file and prompt user to handle
+ - prompt user to handle when failed to apply img configure
+ - replace hard name with device uuid in etc/fstab
+ - enhance extlinux cfg file for symbolic kernel like IVI
+ - support label assign for raw image
+ - bug fix:
+ - fix live image create failure when label assigned
+ - avoid traceback when converting unsupported type
+ - fix mic --version ugly output
+
+ -- Gui Chen <gui.chen@intel.com> Thu, 02 Aug 2012 17:25:35 +0800
+
+mic (0.13) unstable; urgency=low
+
+ * Release 0.13, changes including:
+ - create logfile as default when --release specifid
+ - use 'gzip' and 'bzip2' to pack image instead of python
+ - automatically detect path of 'env' for chroot
+ - record version and os info in build log and logfile
+ - bug fix:
+ - fix popup message in ubuntus
+ - fix unicode issue for logfile
+ - better fix for 'chroot raw' issue
+
+ -- Gui Chen <gui.chen@intel.com> Wed, 12 Jul 2012 17:25:35 +0800
+
+mic (0.12) unstable; urgency=low
+
+ * Release 0.12, changes including:
+ - use default value when @BUILD_ID@ and @ARCH@ not specified
+ - enhance proxy support in attachment retrieve
+ - add new --shrink opt for loop image to control img shrinking
+ - avoid invalid literal for loop device generation
+ - relocate and refactor selinux_check func
+ - remove prefix for make install
+ - bug fix:
+ - fix compres image in raw image
+ - fix src pkgs download failed issue
+ - fix convert failed issue
+
+ -- Gui Chen <gui.chen@intel.com> Wed, 20 Jun 2012 17:25:35 +0800
+
+mic (0.11) unstable; urgency=low
+
+ * Release 0.11, changes including:
+ - support new subcmd 'auto' to handle magic line in ks
+ - enhance the handle of authentication url and https proxy
+ - support packing images together and support compressed file format
+ - reset LD_PRELOAD for chroot env
+ - centralized interface to check existing images
+ - avoid live image creating when using multi-partitions
+ - resolve the depends of python-urlgrabber
+ - bug fix:
+ - fix logfile context lost issue
+ - fix attachment package url handling
+ - fix mic ch raw failed issue
+
+ -- Gui Chen <gui.chen@intel.com> Fri, 08 Jun 2012 17:25:35 +0800
+
+mic (0.10.4) unstable; urgency=low
+
+ * Release 0.10, changes including:
+ - container support using '%attachment' section in ks
+ - add --compress-to option to support zip format in loop image
+ - auto-detect config and plugindir to meet virtualenv and customized install
+ - remove all hardcoded info in setup.py and use sys.prefix for installing
+ - tolerate some OS errors in the image configurations stage
+ - extra patch:
+ - fix zypp missing password when using username passwd
+ - some fixes to enhance authentication url
+ - refine repostr structure to fix comma issue in baseurl
+
+ -- Gui Chen <gui.chen@intel.com> Tue, 15 May 2012 17:25:35 +0800
+
+mic (0.9.4) unstable; urgency=low
+
+ * Release 0.9, changes including:
+ - support pre-install package with zypp backend
+ - sync /etc/mic/mic.conf to bootstrap
+ - enhance sorting for version comparsion in zypp
+ - rewrite chroot tar image using xml format mount point file
+ - fix the incorrect number showing in fs src pkgs download
+ - remove tests directory for dist in Makefile
+ - fix liveusb parted mkpart failure, revert mbr size expand in raw
+ - cleanup /tmp/repolic* dir in the EULA checking
+
+ -- Gui Chen <gui.chen@intel.com> Fri, 13 Apr 2012 17:25:35 +0800
+
+mic (0.8.1) unstable; urgency=low
+
+ * Release 0.8, changes including:
+ - partition alignment support
+ - remove bootloader option 'quiet vga' for raw
+ - update dist files in git source
+ - update unittest, add cases for chroot, msger, runner
+ - add 40 system test case for help
+ - rewrite loop device allocation mechanism
+
+ -- Gui Chen <gui.chen@intel.com> Mon, 26 Mar 2012 17:25:35 +0800
+
+mic (0.7) unstable; urgency=low
+
+ * Release 0.7, changes including:
+ - zypp backend: fixed a fatal issue of unreleasable loop devs
+ - zypp backend: more friendly output message
+ - backend: share cached rpm files between yum and zypp
+ - enhancement for multiple partition loop format
+ - make msger to accept Unicode string
+ - fixed a regression of compress option for FS format
+ - fixed issues in openSUSE12.1
+ - new written man page
+
+ -- JF Ding <jian-feng.ding@intel.com> Fri, 02 Mar 2012 17:45:35 +0800
+
+mic (0.6) unstable; urgency=low
+
+ * Release 0.6, changes including:
+ - give hint when converted image existed
+ - conf.py: proxy scheme check
+ - space check before copy image
+ - zypp: abort with error msg for repo resolver issues
+ - runner.py refinement
+ - ks file syntax check for '%post' without '%end'
+ - support more compression formats than only bzip2
+ - fix msg NoneType issue, causing exit after install
+ - bootstrap:
+ - catch creator error when retrieving bootstrap metadata
+ - correct matching .metadata file in bootstrap
+
+ -- Qiang Zhang <qiang.z.zhang@intel.com> Thu, 16 Feb 2012 17:25:35 +0800
+
+mic (0.5) unstable; urgency=low
+
+ * Release 0.5, changes including:
+ - Rewrite the algorithm of checking free space for download and install
+ - Add --shell option for convert to recreate image modified by innershell
+ - Add -s option for chroot to unpack image
+ - Introduce --copy-kernel option for creator
+ - Remove the hardcoded default args for bootloader
+ - Disable logstderr and flush message buffer in disable_logstderr
+ - Deal with yum.conf inside yum backend by itself
+ - Bug fix:
+ - Fix rpmdb error in yum and zypp to avoid bad file descriptor message
+ - Fix MANIFEST syntax to be compliant with md5sum
+ - Correct dependencies for mic in bootstrap
+
+ -- Gui Chen <gui.chen@intel.com> Mon, 06 Feb 2012 17:25:35 +0800
+
+mic (0.4) unstable; urgency=low
+
+ * Release 0.4, changes including:
+ - Support bootstrap mode, run with '--runtime=bootstrap'
+ - Full support for taring-to output, use 'mic ch x.tar'
+ - Break dependency between backend and baseimage
+ - Check valid repos in ks file
+ - Space check update and catch no space exception
+ - Fix no prompt when cv and ch no existed image
+ - Fix NoneType 'createopts' when convert
+ - Fix no existed local_pkgs_path
+
+ -- Gui Chen <gui.chen@intel.com> Fri, 06 Jan 2012 17:25:35 +0800
+
+mic (0.3) unstable; urgency=low
+
+ * Upgrade to version 0.3, changes including:
+ - Unit test support, run 'make test'
+ - Enable proxy support in config file
+ - Refine configmgr and pluginmgr
+ - Support multi instance with different cache dir
+ - Add 47 system test case
+ - Improve md5sum generation
+ - Add repo option --ssl_verify
+ - Add option --name_prefix
+ - Reformatted code according to PEP08
+ - Backport from mic2:
+ - Add priority and cost option for repos
+ - Reinstroduced compress-disk-image option
+
+ -- Gui Chen <gui.chen@intel.com> Mon, 26 Dec 2011 17:25:35 +0800
+
+mic (0.2) unstable; urgency=low
+
+ * Release 0.2, with the following changes:
+ - Support btrfs and ext4 fstype for creator, convertor, and chroot
+ - Append distfiles and Makefile
+ - Check arch type from repo data
+ - Set rpm dbpath to fix 'rpm -qa' issue
+ - Fix chroot issue caused by image size
+ - Improve setup.py and make it compatible with python 2.5
+ - Disable ca check for https
+ - Change default output dir name to ./mic-output
+ - untrack mic/__version__.py
+ - Fix some minor issues
+
+ -- Gui Chen <gui.chen@intel.com> Tue, 29 Nov 2011 17:25:35 +0800
+
+mic (0.1) unstable; urgency=low
+
+ * Official release 0.1, with the following features:
+ - Support three subcommand: create, convert, chroot
+ - Support five image types: fs, loop, raw, livecd, liveusb
+ - Support two package manager backend: yum and zypp
+ - Support the following global command line options:
+ - --verbose
+ - --debug
+ - Creator subcommand support the following command line options:
+ - --logfile=LOGFILE
+ - -c CONFIG, --config=CONFIG
+ - -k CACHEDIR, --cachedir=CACHEDIR
+ - -o OUTDIR, --outdir=OUTDIR
+ - -A ARCH, --arch=ARCH
+ - --release=RID
+ - --record-pkgs=RECORD_PKGS
+ - --pkgmgr=PKGMGR
+ - --local-pkgs-path=LOCAL_PKGS_PATH
+
+ -- Gui Chen <gui.chen@intel.com> Thu, 27 Oct 2011 17:25:35 +0800
+
diff --git a/distfiles/debian/compat b/packaging/debian/compat
index 7f8f011..7f8f011 100644
--- a/distfiles/debian/compat
+++ b/packaging/debian/compat
diff --git a/distfiles/debian/control b/packaging/debian/control
index b34aa3e..b34aa3e 100644
--- a/distfiles/debian/control
+++ b/packaging/debian/control
diff --git a/distfiles/debian/copyright b/packaging/debian/copyright
index 0c99694..0c99694 100644
--- a/distfiles/debian/copyright
+++ b/packaging/debian/copyright
diff --git a/distfiles/debian/docs b/packaging/debian/docs
index a1320b1..a1320b1 100644
--- a/distfiles/debian/docs
+++ b/packaging/debian/docs
diff --git a/distfiles/debian/rules b/packaging/debian/rules
index af51936..af51936 100755
--- a/distfiles/debian/rules
+++ b/packaging/debian/rules
diff --git a/packaging/mic.changes b/packaging/mic.changes
new file mode 100644
index 0000000..81442ad
--- /dev/null
+++ b/packaging/mic.changes
@@ -0,0 +1,194 @@
+* Fri Aug 31 2012 Gui Chen <gui.chen@intel.com> - 0.15
+- Release 0.15, changes including:
+ - new bootstrap implementation: use bootstrap as default
+ - enable 'pkgmgr=auto' to use auto-selected backend
+ - just warning in chroot when not Tizen/MeeGo chroot dir
+ - remove username and password in zypp repo file
+ - update usage.rst for man page
+ - bug fix:
+ - fix https proxy issue in yum backend
+ - fix repodata checksum failed issue
+ - avoid traceback when loopback is NoneType
+
+* Thu Aug 02 2012 Gui Chen <gui.chen@intel.com> - 0.14
+- Release 0.14, changes including:
+ - use cached metadata when checksum is not changed
+ - skip non-fatal error in ks file and prompt user to handle
+ - prompt user to handle when failed to apply img configure
+ - replace hard name with device uuid in etc/fstab
+ - enhance extlinux cfg file for symbolic kernel like IVI
+ - support label assign for raw image
+ - bug fix:
+ - fix live image create failure when label assigned
+ - avoid traceback when converting unsupported type
+ - fix mic --version ugly output
+
+* Wed Jul 12 2012 Gui Chen <gui.chen@intel.com> - 0.13
+- Release 0.13, changes including:
+ - create logfile as default when --release specifid
+ - use 'gzip' and 'bzip2' to pack image instead of python
+ - automatically detect path of 'env' for chroot
+ - record version and os info in build log and logfile
+ - bug fix:
+ - fix popup message in ubuntus
+ - fix unicode issue for logfile
+ - better fix for 'chroot raw' issue
+
+* Wed Jun 20 2012 Gui Chen <gui.chen@intel.com> - 0.12
+- Release 0.12, changes including:
+ - use default value when @BUILD_ID@ and @ARCH@ not specified
+ - enhance proxy support in attachment retrieve
+ - add new --shrink opt for loop image to control img shrinking
+ - avoid invalid literal for loop device generation
+ - relocate and refactor selinux_check func
+ - remove prefix for make install
+ - bug fix:
+ - fix compres image in raw image
+ - fix src pkgs download failed issue
+ - fix convert failed issue
+
+* Fri Jun 08 2012 Gui Chen <gui.chen@intel.com> - 0.11
+- Release 0.11, changes including:
+ - support new subcmd 'auto' to handle magic line in ks
+ - enhance the handle of authentication url and https proxy
+ - support packing images together and support compressed file format
+ - reset LD_PRELOAD for chroot env
+ - centralized interface to check existing images
+ - avoid live image creating when using multi-partitions
+ - resolve the depends of python-urlgrabber
+ - bug fix:
+ - fix logfile context lost issue
+ - fix attachment package url handling
+ - fix mic ch raw failed issue
+
+* Tue May 15 2012 Gui Chen <gui.chen@intel.com> - 0.10
+- Release 0.10.4, changes including:
+ - container support using '%attachment' section in ks
+ - add --compress-to option to support zip format in loop image
+ - auto-detect config and plugindir to meet virtualenv and customized install
+ - remove all hardcoded info in setup.py and use sys.prefix for installing
+ - tolerate some OS errors in the image configurations stage
+ - extra patch:
+ - fix zypp missing password when using username passwd
+ - some fixes to enhance authentication url
+ - refine repostr structure to fix comma issue in baseurl
+
+* Fri Apr 13 2012 Gui Chen <gui.chen@intel.com> - 0.9
+- Release 0.9, changes including:
+ - support pre-install package with zypp backend
+ - sync /etc/mic/mic.conf to bootstrap
+ - enhance sorting for version comparsion in zypp
+ - rewrite chroot tar image using xml format mount point file
+ - fix the incorrect number showing in fs src pkgs download
+ - remove tests directory for dist in Makefile
+ - fix liveusb parted mkpart failure, revert mbr size expand in raw
+ - cleanup /tmp/repolic* dir in the EULA checking
+
+* Mon Mar 26 2012 Gui Chen <gui.chen@intel.com> - 0.8
+- Release 0.8, changes including:
+ - partition alignment support
+ - remove bootloader option 'quiet vga' for raw
+ - update dist files in git source
+ - update unittest, add cases for chroot, msger, runner
+ - add 40 system test case for help
+ - rewrite loop device allocation mechanism
+
+* Fri Mar 02 2012 Jian-feng Ding <jian-feng.ding@intel.com> - 0.7
+- Release 0.7, changes including:
+ - zypp backend: fixed a fatal issue of unreleasable loop devs
+ - zypp backend: more friendly output message
+ - backend: share cached rpm files between yum and zypp
+ - enhancement for multiple partition loop format
+ - make msger to accept Unicode string
+ - fixed a regression of compress option for FS format
+ - fixed issues in openSUSE12.1
+ - new written man page
+
+* Thu Feb 16 2012 Qiang Zhang <qiang.z.zhang@intel.com> - 0.6
+- Release 0.6, changes including:
+ - give hint when converted image existed
+ - conf.py: proxy scheme check
+ - space check before copy image
+ - zypp: abort with error msg for repo resolver issues
+ - runner.py refinement
+ - ks file syntax check for '%post' without '%end'
+ - support more compression formats than only bzip2
+ - fix msg NoneType issue, causing exit after install
+ - bootstrap:
+ - catch creator error when retrieving bootstrap metadata
+ - correct matching .metadata file in bootstrap
+
+* Mon Feb 06 2012 Gui Chen <gui.chen@intel.com> - 0.5
+- Release 0.5, changes including:
+ - Rewrite the algorithm of checking free space for download and install
+ - Add --shell option for convert to recreate image modified by internal shell
+ - Add -s option for chroot to unpack image
+ - Introduce --copy-kernel option for creator
+ - Remove the hardcoded default args for bootloader
+ - Disable logstderr and flush message buffer in disable_logstderr
+ - Deal with yum.conf inside yum backend by itself
+ - Bug fix:
+ - Fix rpmdb error in yum and zypp to avoid bad file descriptor message
+ - Fix MANIFEST syntax to be compliant with md5sum
+ - Correct dependencies for mic in bootstrap
+
+* Fri Jan 06 2012 Gui Chen <gui.chen@intel.com> - 0.4
+- Release 0.4, changes including:
+ - Support bootstrap mode, run with '--runtime=bootstrap'
+ - Full support for taring-to output, use 'mic ch x.tar'
+ - Break dependency between backend and baseimage
+ - Check valid repos in ks file
+ - Space check update and catch no space exception
+ - Fix no prompt when cv and ch no existed image
+ - Fix NoneType 'createopts' when convert
+ - Fix no existed local_pkgs_path
+
+* Mon Dec 26 2011 Zhang Qiang<qiang.z.zhang@intel.com> - 0.3
+- Upgrade to version 0.3, changes including:
+ - Unit test support, run 'make test'
+ - Enable proxy support in config file
+ - Refine configmgr and pluginmgr
+ - Support multi instance with different cache dir
+ - Add 47 system test case
+ - Improve md5sum generation
+ - Add repo option --ssl_verify
+ - Add option --name_prefix
+ - Reformatted code according to PEP08
+ - Backport from mic2:
+ - Add priority and cost option for repos
+ - Reinstroduced compress-disk-image option
+
+* Tue Nov 29 2011 Gui Chen <gui.chen@intel.com> - 0.2
+- Release 0.2, with the following changes:
+ - Support btrfs and ext4 fstype for creator, convertor, and chroot
+ - Append distfiles and Makefile
+ - Check arch type from repo data
+ - Set rpm dbpath to fix 'rpm -qa' issue
+ - Fix chroot issue caused by image size
+ - Improve setup.py and make it compatible with python 2.5
+ - Disable ca check for https
+ - Change default output dir name to ./mic-output
+ - untrack mic/__version__.py
+ - Fix some minor issues
+
+* Thu Oct 27 2011 Gui Chen <gui.chen@intel.com> - 0.1
+- Official release 0.1, with the following features:
+ - Support three subcommand: create, convert, chroot
+ - Support five image types: fs, loop, raw, livecd, liveusb
+ - Support two package manager backend: yum and zypp
+ - Support the following global command line options:
+ - --verbose
+ - --debug
+ - Creator subcommand support the following command line options:
+ - --logfile=LOGFILE
+ - -c CONFIG, --config=CONFIG
+ - -k CACHEDIR, --cachedir=CACHEDIR
+ - -o OUTDIR, --outdir=OUTDIR
+ - -A ARCH, --arch=ARCH
+ - --release=RID
+ - --record-pkgs=RECORD_PKGS
+ - --pkgmgr=PKGMGR
+ - --local-pkgs-path=LOCAL_PKGS_PATH
+
+ Please read README.rst for more details.
+
diff --git a/packaging/mic.dsc b/packaging/mic.dsc
new file mode 100644
index 0000000..fb825ab
--- /dev/null
+++ b/packaging/mic.dsc
@@ -0,0 +1,9 @@
+Format: 1.0
+Source: mic
+Binary: mic
+Architecture: all
+Version: 0.15
+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
diff --git a/distfiles/mic.spec b/packaging/mic.spec
index cfe9c94..6082ea2 100644
--- a/distfiles/mic.spec
+++ b/packaging/mic.spec
@@ -15,14 +15,7 @@ Requires: coreutils
Requires: python >= 2.5
Requires: e2fsprogs
Requires: dosfstools >= 2.11-8
-%if 0%{is_tizen} == 0
-Requires: yum >= 3.2.24
-%endif
-%if 0%{?suse_version} == 1210
-Requires: syslinux == 4.04.1
-%else
Requires: syslinux >= 3.82
-%endif
Requires: kpartx
Requires: parted
Requires: device-mapper
@@ -32,7 +25,11 @@ Requires: isomd5sum
Requires: gzip
Requires: bzip2
Requires: squashfs-tools >= 4.0
+Requires: qemu-arm-static
Requires: python-urlgrabber
+%if 0%{is_tizen} == 0
+Requires: yum >= 3.2.24
+%endif
%if 0%{?suse_version}
Requires: btrfsprogs
%else
@@ -49,15 +46,11 @@ Requires: python-m2crypto
%endif
%endif
-%if 0%{?fedora_version} == 16
+%if 0%{?fedora_version} > 13 || 0%{is_tizen} == 1
Requires: syslinux-extlinux
%endif
-%if 0%{?suse_version} == 1210
-Requires: python-zypp == 0.5.50
-%else
-Requires: python-zypp >= 0.5.9.1
-%endif
+Requires: python-zypp
BuildRequires: python-devel
Obsoletes: mic2
@@ -76,7 +69,6 @@ an image.
%prep
%setup -q -n %{name}-%{version}
-
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -93,17 +85,20 @@ rm -rf $RPM_BUILD_ROOT
# remove yum backend for tizen
%if 0%{is_tizen} == 1
rm -rf %{buildroot}/%{_prefix}/lib/%{name}/plugins/backend/yumpkgmgr.py
+rm -rf %{buildroot}/%{_sysconfdir}/%{name}/bootstrap.conf
%endif
mkdir -p %{buildroot}/%{_prefix}/share/man/man1
install -m644 doc/mic.1 %{buildroot}/%{_prefix}/share/man/man1
-
%files
%defattr(-,root,root,-)
%doc README.rst
%{_mandir}/man1/*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%if 0%{is_tizen} == 0
+%config %{_sysconfdir}/%{name}/bootstrap.conf
+%endif
%{python_sitelib}/*
%dir %{_prefix}/lib/%{name}
%{_prefix}/lib/%{name}/*
diff --git a/setup.py b/setup.py
index 83ad835..bf0d6ee 100644
--- a/setup.py
+++ b/setup.py
@@ -77,13 +77,13 @@ if prefix.lstrip('/') == 'usr':
else:
etc_prefix = os.path.join(prefix, 'etc')
-conffile = 'distfiles/mic.conf'
-bsconf = 'distfiles/bootstrap.conf'
+conffile = 'etc/mic.conf'
+bsconf = 'etc/bootstrap.conf'
if os.path.isfile('%s/mic/mic.conf' % etc_prefix):
conffile += '.new'
# apply prefix to mic.conf.in to generate actual mic.conf
-conf_str = file('distfiles/mic.conf.in').read()
+conf_str = file('etc/mic.conf.in').read()
conf_str = conf_str.replace('@PREFIX@', prefix)
with file(conffile, 'w') as wf:
wf.write(conf_str)