From bb380d86e744361ca70d8f674f5c2f76029ade15 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Wed, 10 Aug 2011 14:15:02 +0800 Subject: [PATCH] remove config key for release prefix name like 'meego', need not any more --- Makefile | 7 +-- distfiles/micng.conf | 14 ++++-- micng/configmgr.py | 2 - micng/micng.conf | 14 ------ micng/utils/__init__.py | 1 - tests/meego-ivi-ia32-1.2.80.0.20110502.2.ks | 69 ----------------------------- 6 files changed, 14 insertions(+), 93 deletions(-) delete mode 100644 micng/micng.conf delete mode 100644 tests/meego-ivi-ia32-1.2.80.0.20110502.2.ks diff --git a/Makefile b/Makefile index c4fa678..d167900 100644 --- a/Makefile +++ b/Makefile @@ -28,9 +28,10 @@ dist-gz: gzip > $(PKGNAME)-$(TAGVER).tar.gz install-plugins: - install -d ${DESTDIR}/${PLUGIN_DIR} - install -D -m 644 plugins/imager/* ${DESTDIR}/${PLUGIN_DIR}/imager - install -D -m 644 plugins/backend/* ${DESTDIR}/${PLUGIN_DIR}/backend + install -d ${DESTDIR}/${PLUGIN_DIR}/imager + install -m 644 plugins/imager/* ${DESTDIR}/${PLUGIN_DIR}/imager + install -d ${DESTDIR}/${PLUGIN_DIR}/backend + install -m 644 plugins/backend/* ${DESTDIR}/${PLUGIN_DIR}/backend install: all install-plugins $(PYTHON) setup.py install --prefix=$(DESTDIR)/$(PREFIX) diff --git a/distfiles/micng.conf b/distfiles/micng.conf index 53d3a59..11f0d0f 100644 --- a/distfiles/micng.conf +++ b/distfiles/micng.conf @@ -1,14 +1,20 @@ [common] +; general settings [create] +; settings for create subcommand tmpdir= /var/tmp cachedir= /var/tmp/cache outdir= . -name=meego -pkgmgr=zypp -arch=i586 -#proxy=http://proxy.com +pkgmgr = zypp +arch = i586 + +; proxy = http://proxy.yourcompany.com:8080/ +; no_proxy = localhost,127.0.0.0/8,.yourcompany.com [convert] +; settings for convert subcommand [chroot] +; settings for chroot subcommand + diff --git a/micng/configmgr.py b/micng/configmgr.py index cbf5460..6be02f4 100644 --- a/micng/configmgr.py +++ b/micng/configmgr.py @@ -5,7 +5,6 @@ import sys import logging import micng.utils as utils -DEFAULT_NAME='meego' DEFAULT_OUTDIR='.' DEFAULT_TMPDIR='/var/tmp' DEFAULT_CACHEDIR='/var/cache' @@ -22,7 +21,6 @@ class ConfigMgr(object): self.siteconf = siteconf self.ksconf = ksconf - self.create['name'] = DEFAULT_NAME self.create["tmpdir"] = DEFAULT_TMPDIR self.create["cachedir"] = DEFAULT_CACHEDIR self.create["outdir"] = DEFAULT_OUTDIR diff --git a/micng/micng.conf b/micng/micng.conf deleted file mode 100644 index 53d3a59..0000000 --- a/micng/micng.conf +++ /dev/null @@ -1,14 +0,0 @@ -[common] - -[create] -tmpdir= /var/tmp -cachedir= /var/tmp/cache -outdir= . -name=meego -pkgmgr=zypp -arch=i586 -#proxy=http://proxy.com - -[convert] - -[chroot] diff --git a/micng/utils/__init__.py b/micng/utils/__init__.py index 49a7889..1e3cb68 100644 --- a/micng/utils/__init__.py +++ b/micng/utils/__init__.py @@ -3,4 +3,3 @@ import cmdln import kickstart import errors import fs_related -import argparse diff --git a/tests/meego-ivi-ia32-1.2.80.0.20110502.2.ks b/tests/meego-ivi-ia32-1.2.80.0.20110502.2.ks deleted file mode 100644 index 722a62e..0000000 --- a/tests/meego-ivi-ia32-1.2.80.0.20110502.2.ks +++ /dev/null @@ -1,69 +0,0 @@ -# -*-mic2-options-*- -f livecd -*-mic2-options-*- - -# -# Do not Edit! Generated by: -# kickstarter.py -# - -lang en_US.UTF-8 -keyboard us -timezone --utc America/Los_Angeles -part / --size 2200 --ondisk sda --fstype=ext3 -rootpw meego -xconfig --startxonboot -bootloader --timeout=0 --append="quiet" -desktop --autologinuser=meego --defaultdesktop=X-IVI --session="/usr/bin/startivi" -user --name meego --groups audio,video --password meego - -repo --name=oss --baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/MeeGo/builds/1.2.80/1.2.80.0.20110503.2/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego -repo --name=non-oss --baseurl=http://linux-ftp.jf.intel.com/pub/mirrors/MeeGo/builds/1.2.80/1.2.80.0.20110503.2/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego - -%packages --ignoremissing - -@MeeGo Core -@MeeGo Compliance -@IVI Desktop -@MeeGo X Window System -@MeeGo IVI Applications -@MeeGo Base Development -@X for IVI -@Chinese Support -@Japanese Support -@Korean Support - -kernel-adaptation-intel-automotive - -meego-ux-daemon -meegotouch-compositor --dsme --ngfd --mce --qmsystem -%end - -%post -# save a little bit of space at least... -rm -f /boot/initrd* - -# Prelink can reduce boot time -if [ -x /usr/sbin/prelink ]; then - /usr/sbin/prelink -aRqm -fi - -rm -f /var/lib/rpm/__db* -rpm --rebuilddb - -# Get rid of /etc/xdg/autostart/applauncherd.desktop line that causes IVI duicontrolpanel issues -# until fixed upstream. BMC#13570 -sed -ri '/OnlyShowIn=X-MEEGO-HS;/d' /etc/xdg/autostart/applauncherd.desktop - - -%end - -%post --nochroot -if [ -n "$IMG_NAME" ]; then - echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release -fi - - -%end -- 2.7.4