diff options
| -rw-r--r-- | configurations.yaml | 97 | ||||
| -rw-r--r-- | custom/scripts/rpm.post | 4 | ||||
| -rw-r--r-- | kickstart.tmpl | 2 | ||||
| -rw-r--r-- | kickstarter.py | 1 | ||||
| -rw-r--r-- | repos.yaml | 30 |
5 files changed, 45 insertions, 89 deletions
diff --git a/configurations.yaml b/configurations.yaml index 61a3e6a..0466ded 100644 --- a/configurations.yaml +++ b/configurations.yaml @@ -13,7 +13,7 @@ Default: - rpm Groups: - MeeGo Core - - Minimal MeeGo X Window System + - MeeGo Compliance CORE: PartSize: 1000 @@ -21,121 +21,82 @@ CORE: BootloaderTimeout: 0 PostScripts: - cleanup + Groups: + - MeeGo X Window System + NoChrootScripts: + - buildname NETBOOK: PartSize: 1900 BootloaderAppend: "quiet" BootloaderTimeout: 0 PostScripts: - cleanup - - flash Groups: - X for Netbooks - Virtual Machine Support - Printing - Games - Kernel: kernel-netbook + - MeeGo Netbook Desktop + Kernel: kernel PostScripts: - prelink - ExtraPackages: - - gdb - - flash-plugin - - adobe-release + - cleanup + NoChrootScripts: + - buildname Architecture: ia32 Configurations: - Name: MeeGo Core Active: True - Baseline: "1.0.80" + Baseline: "1.1.80" Platform: CORE FileName: core-ia32-testing Kernel: kernel-netbook Architecture: ia32 Repos: - - meego-core-testing + - core-testing - Name: MeeGo Core N900 Active: True - Baseline: "1.0.80" + Baseline: "1.1.80" Platform: CORE FileName: core-armv7l-n900-testing Kernel: kernel-n900 Desktop: Architecture: armv7l Repos: - - meego-core-testing + - core-testing - Name: MeeGo Netbook/Nettop - PartSize: 2900 + PartSize: 3000 Active: True - Baseline: "1.0.80" + Baseline: "1.1.80" Platform: NETBOOK Desktop: meego - FileName: netbook-ia32-testing + FileName: netbook-ia32 Groups: - MeeGo Netbook Desktop + - Base Double Byte IME Support + - MeeGo Base Development Repos: - - meego-core-testing - - meego-netbook-testing - - adobe + - core + - netbook + ExtraPackages: + - chromium - Name: MeeGo Core Active: True - Baseline: "1.0.80" + Baseline: "1.1.80" Platform: CORE FileName: core-ia32 - Kernel: kernel-netbook + Kernel: kernel Architecture: ia32 Repos: - - meego-core-daily + - core - Name: MeeGo Core N900 Active: True - Baseline: "1.0.80" - Platform: CORE - FileName: core-armv7l-n900 - Kernel: kernel-n900 - Desktop: - Architecture: armv7l - Repos: - - meego-core-daily - - Name: MeeGo Netbook/Nettop - PartSize: 2900 - Active: True - Baseline: "1.0.80" - Platform: NETBOOK - Desktop: meego - FileName: netbook-ia32-default - Groups: - - MeeGo Netbook Desktop - Repos: - - meego-core-daily - - meego-netbook-daily - - adobe - - Name: MeeGo Core 1.0 - Active: True - Baseline: "1.0" - Platform: CORE - FileName: core-ia32 - Kernel: kernel-netbook - Architecture: ia32 - Repos: - - meego-core-1.0 - - Name: MeeGo Core 1.0 N900 - Active: True - Baseline: "1.0" + Baseline: "1.1.80" Platform: CORE FileName: core-armv7l-n900 - Kernel: kernel-n900 + Kernel: kernel-adaptation-n900 Desktop: Architecture: armv7l Repos: - - meego-core-1.0 - - Name: MeeGo Netbook/Nettop 1.0 - Active: True - Baseline: "1.0" - Platform: NETBOOK - Desktop: meego - FileName: netbook-ia32-default - Groups: - - MeeGo Netbook Desktop - Repos: - - meego-core-1.0 - - meego-netbook-1.0 - - meego-extra-1.0 - - adobe + - core diff --git a/custom/scripts/rpm.post b/custom/scripts/rpm.post index 1e4049e..6a07394 100644 --- a/custom/scripts/rpm.post +++ b/custom/scripts/rpm.post @@ -1,9 +1,7 @@ # work around for poor key import UI in PackageKit rm -f /var/lib/rpm/__db* rpm --rebuilddb -if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux ]; then - rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux -fi + if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-meego ]; then rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-meego fi diff --git a/kickstart.tmpl b/kickstart.tmpl index 12a4cfc..4c8ad58 100644 --- a/kickstart.tmpl +++ b/kickstart.tmpl @@ -21,7 +21,7 @@ user --name ${metadata.DefaultUser} --groups audio,video --password ${metadata. #set $save = "" #if $metadata.SaveRepos -#set $save = "--save" +#set $save = "--save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego" #end if #for $r in $metadata.Repos #for $rr in $repos diff --git a/kickstarter.py b/kickstarter.py index 6934d22..81c9ab9 100644 --- a/kickstarter.py +++ b/kickstarter.py @@ -90,6 +90,7 @@ class KSWriter(): r = {} r['Name'] = repo['Name'] r['Url'] = repo['Url'].replace("@ARCH@", meta['Architecture']) + r['Url'] = repo['Url'].replace("@RELEASE@", meta['Baseline']) new_repos.append(r) else: new_repos = repos @@ -1,21 +1,17 @@ Repositories: - - Name: meego-core-1.0 - Url: http://repo.meego.com/MeeGo/releases/1.0/core/repos/@ARCH@/packages - - Name: meego-extra-1.0 - Url: http://repo.meego.com/MeeGo/releases/1.0/extra/repos/@ARCH@/packages - - Name: meego-netbook-1.0 - Url: http://repo.meego.com/MeeGo/releases/1.0/netbook/repos/@ARCH@/packages - - Name: meego-core-testing + - Name: core-testing Url: http://download.meego.com/testing/core/repos/@ARCH@/packages - - Name: meego-netbook-testing + - Name: netbook-testing Url: http://download.meego.com/testing/netbook/repos/@ARCH@/packages - - Name: meego-handset-testing + - Name: handset-testing Url: http://download.meego.com/testing/handset/repos/@ARCH@/packages - - Name: meego-core-daily - Url: http://repo.meego.com/MeeGo/builds/trunk/daily/core/repos/@ARCH@/packages - - Name: meego-netbook-daily - Url: http://repo.meego.com/MeeGo/builds/trunk/daily/netbook/repos/@ARCH@/packages - - Name: meego-handset-daily - Url: http://repo.meego.com/MeeGo/builds/trunk/daily/handset/repos/@ARCH@/packages - - Name: adobe - Url: http://linuxdownload.adobe.com/linux/i386/ + - Name: core + Url: http://repo.meego.com/MeeGo/builds/@RELEASE@/@BUILD_ID@/core/repos/@ARCH@/packages + - Name: netbook + Url: http://repo.meego.com/MeeGo/builds/@RELEASE@/@BUILD_ID@/netbook/repos/@ARCH@/packages + - Name: handset + Url: http://repo.meego.com/MeeGo/builds/@RELEASE@/@BUILD_ID@/handset/repos/@ARCH@/packages + - Name: ivi + Url: http://repo.meego.com/MeeGo/builds/@RELEASE@/@BUILD_ID@/ivi/repos/@ARCH@/packages + - Name: non-oss + Url: http://repo.meego.com/MeeGo/builds/@RELEASE@/@BUILD_ID@/non-oss/repos/@ARCH@/packages |