On 10/17/2012 05:56 PM, guillaume.gardet@opensuse.org wrote:

home:Guillaume_G:branches:openSUSE:Factory:ARM/JeOS.armv5 -> openSUSE:Factory:ARM/JeOS.armv5

https://build.opensuse.org/request/show/138533

Description: Update to be able to handle multiple configs. Added raspberry pi image but kiwi would need some update to handle armv5 oem images.

old: ---- root.tar.bz2

new: ---- Images.kiwi.in JeOS-raspberrypi.kiwi XFCE-raspberrypi.kiwi packagelist.inc pre_checkin.sh uboot-image-install uboot-image-setup uboot-setup.tgz

other changes: --------------

++++++ Images.kiwi.in (new) --- Images.kiwi.in +++ Images.kiwi.in @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8"?> + +#define QUOTED(x) #x +#define QUOTED_EXPAND(x) QUOTED(x) + +/* + * + */ + +#define VERSION Factory +#define SUFFIX ARM +#define IMAGENAME openSUSE-VERSION-SUFFIX-IMAGE_TYPE_STRING-FLAVOR_TYPE +#define IMAGENAME_STR QUOTED_EXPAND(IMAGENAME) + +#define PKG_TAG(x)<package name=QUOTED_EXPAND(x)/> +#define PKG_BOOT_TAG(x)<package name=QUOTED_EXPAND(x) bootinclude="true"/> + +/* + * Define the specification + */ + +#define SPECIFICATION openSUSE VERSION IMAGE_TYPE_STRING image for SUFFIX (FLAVOR_TYPE) boards + +/* + * Define the bootkernel (default is default) + */ + +#if IS_FLAVOR_raspberrypi +# define BOOTKERNEL raspberrypi +# define KERNEL_CMDLINE_STR "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=120,data=writeback rootwait ro" +# define EXTRA_PACKAGES PKG_BOOT_TAG(raspberry-firmware) \ + PKG_TAG(ntp) +#else +# define BOOTKERNEL default +# define KERNEL_CMDLINE_STR "" +# define EXTRA_PACKAGES +#endif + +<image schemaversion="5.5" name=IMAGENAME_STR> + <!-- + + ***************************************************************************** + ***************************************************************************** + + The *.kiwi files are autogenerated, please edit Images.kiwi.in instead! + + sh pre_checkin.sh + + re-generates the *.kiwi file! + + ***************************************************************************** + ***************************************************************************** + --> + <description type="system"> + <author>Marcus Schäfer</author> + <contact>ms@novell.com</contact> + <specification> + SPECIFICATION + </specification> + </description> +<preferences> +#if IS_FLAVOR_JeOS +<type image="tbz" primary="true"/> +#else +<type image="oem" filesystem="ext3" boot="oemboot/suse-12.2" bootloader="uboot" + kernelcmdline=KERNEL_CMDLINE_STR + editbootconfig="uboot-image-setup" editbootinstall="uboot-image-install"> +<oemconfig> +<oem-swapsize>500</oem-swapsize> +</oemconfig> +</type> +#endif + <version>1.12.1</version> + <packagemanager>zypper</packagemanager> + <locale>en_US</locale> + <keytable>us.map.gz</keytable> + <timezone>Europe/Berlin</timezone> + <hwclock>utc</hwclock> + <rpm-excludedocs>true</rpm-excludedocs> +<!--<bootloader-theme>openSUSE</bootloader-theme> --> +<!-- <bootsplash-theme>openSUSE</bootsplash-theme> --> + </preferences> + <users group="root"> + <user pwd="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/> + </users> + <repository type="rpm-md"> + <source path="obs://openSUSE:Factory:ARM/armv5el"/> + #if IS_FLAVOR_raspberrypi + <source path="obs://openSUSE:Factory:ARM:Contrib:RaspberryPi/armv5el"/>

Could we please keep JeOS description and packages in the same repo? So if you have a downstream raspberry pi kernel in Contrib:RaspberryPi, please also do the JeOS description in Contrib:RaspberryPi. However, the rest of the changes look fine. So how about we just remove the RbPI bits here (and readd them later when we get an upstream kernel), but simply link this JeOS description in the Contrib:RaspberryPi repository with a small patch to enable the rbpi bits?

+ #endif + </repository> + <!-- dont remove qemu binfmt helpers from initrd --> + <strip type="tools"> + <file name="qemu-arm-binfmt"/> + <file name="qemu-arm"/> + </strip> + <packages type="bootstrap"> +#if IS_FLAVOR_JeOS == 0 +// FIXME: Currently, we have no kernel-default for armv5

I don't think we will ever have one. If I understand the kernel folks correctly, single zImage is a goal only for armv7 platforms. Alex -- To unsubscribe, e-mail: opensuse-arm+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-arm+owner@opensuse.org