On 2012-10-29 15:07, Alexander Graf wrote:
On 29.10.2012, at 15:03, <joop.boonen@boonen.org> wrote:
home:worldcitizen:branches:openSUSE:12.2:ARM:Contrib:Tegra/JeOS-ac100 -> openSUSE:12.2:ARM:Contrib:Tegra/JeOS-ac100
https://build.opensuse.org/request/show/139668
Description: testing via uboot-image-install also added all improvements suggested by agraf
++++++ Images.kiwi.in --- Images.kiwi.in +++ Images.kiwi.in @@ -54,6 +54,10 @@ # define BOOTKERNEL exynos # define KERNEL_CMDLINE_STR "console=ttySAC2,115200n8" # define EXTRA_PACKAGES PKG_BOOT_TAG(u-boot-origen) +#elif IS_FLAVOR_ac100 +# define BOOTKERNEL tegra-ac100 +# define KERNEL_CMDLINE_STR "" +# define EXTRA_PACKAGES abootimg
This needs special escaping. Check out the way it's done for origen just above :)
If found it, it's: # define EXTRA_PACKAGES PKG_TAG(abootimg)
#else # define BOOTKERNEL default # define KERNEL_CMDLINE_STR "" @@ -85,8 +89,6 @@ <preferences> #if IS_FLAVOR_rootfs <type image="tbz" primary="true"/> -#elif IS_FLAVOR_ac100 - <type image="tbz" primary="true"/> #else <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline=KERNEL_CMDLINE_STR @@ -112,6 +114,11 @@ <repository type="rpm-md"> <source path="obs://openSUSE:12.2:ARM/standard"/> </repository> +#if IS_FLAVOR_ac100 + <repository type="rpm-md"> + <source path="obs://openSUSE:12.2:ARM:Contrib:Tegra/standard"/> + </repository> +#endif <!-- dont remove qemu binfmt helpers from initrd --> <strip type="tools"> <file name="qemu-arm-binfmt"/>
++++++ JeOS-ac100.kiwi --- JeOS-ac100.kiwi +++ JeOS-ac100.kiwi @@ -17,7 +17,11 @@ </specification> </description> <preferences> - <type image="tbz" primary="true"/> + <type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" kernelcmdline="" editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> + <oemconfig> + <oem-swapsize>500</oem-swapsize> + </oemconfig> + </type> <version>1.12.1</version> <packagemanager>zypper</packagemanager> <locale>en_US</locale> @@ -42,57 +46,56 @@ <file name="qemu-arm-binfmt"/> <file name="qemu-arm"/> </strip> - <packages type="bootstrap"> - <package name="kernel-tegra-ac100" bootinclude="true"/> - <package name="abootimg"/> - <package name="aaa_base"/> - <package name="aaa_base-extras"/> - <package name="branding-openSUSE"/> - <package name="cracklib-dict-full"/> - <package name="dhcpcd"/> - <package name="elfutils"/> - <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="hwinfo"/> - <package name="ifplugd"/> - <package name="insserv"/> - <package name="iputils"/> - <package name="kbd"/> - <package name="kernel-firmware"/> - <package name="less"/> - <package name="lvm2"/> - <package name="mkinitrd"/> - <package name="module-init-tools"/> - <package name="ncurses-utils"/> - <package name="netcfg"/> - <!-- we need to keep our time in sync, because there is no RTC --> - <package name="ntp"/> - <package name="openssh"/> - <package name="openSUSE-release"/> - <package name="pkg-config"/> - <package name="polkit"/> - <package name="procps"/> - <package name="pwdutils"/> - <package name="plymouth"/> - <package name="qemu-linux-user-arm" bootinclude="true"/> - <package name="rpcbind"/> - <package name="rpm"/> - <package name="rsyslog"/> - <package name="sysconfig"/> - <package name="systemd-sysvinit"/> - <package name="timezone"/> - <package name="u-boot-tools"/> - <package name="vim"/> - <package name="wireless-tools"/> - <package name="wpa_supplicant"/> - <package name="openSUSE-build-key"/> - <package name="yast2-firstboot"/> - <!-- additional yast modules needed by firstboot --> - <package name="yast2-users"/> - <package name="zypper"/> - <!-- custom hook scripts for uboot --> - <archive name="uboot-setup.tgz" bootinclude="true"/> - </packages> + <packages type="bootstrap"><package name="kernel-tegra-ac100" bootinclude="true"/> +abootimg
See? Looks bogus, no?
It indeed does. I have 2 questions. Which file should be the standard template that I should commit here, or will pre_checkin.sh generate a new JeOS-ac100.kiwi file anyway? How/when is the script pre_checkin.sh run on the OBS server?
+<package name="aaa_base"/>
--8<--- -->8---
Alex
<!--
*****************************************************************************
***************************************************************************** @@ -13,7 +13,7 @@ <author>Marcus Schäfer</author> <contact>ms@novell.com</contact> <specification> - openSUSE 12.2 XFCE image for ARM (ac100) boards + openSUSE 12.2 XFCE image for ARM (rootfs) boards </specification> </description> <preferences>
To REVIEW against the previous version: osc request show --diff 139668
To ACCEPT the request: osc request accept 139668 --message="reviewed ok."
To DECLINE the request: osc request decline 139668 --message="declined for reason xyz (see ... for background / policy / ...)."
To REVOKE the request: osc request revoke 139668 --message="retracted because ..., sorry / thx / see better version ..." -- Hermes messaging (http://hermes.opensuse.org) openSUSE Build Service (https://build.opensuse.org/) Collaboration: http://en.opensuse.org/Build_Service/Collaboration
I've revoked the request as it lousy. Regards, Joop. -- To unsubscribe, e-mail: opensuse-arm+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-arm+owner@opensuse.org