With James kernel rpm, it seemed like a next step to make a ZD image. The following were found to be necessary: >From bb527d3f0a5f22d93a9ebcba17f43fcf8c7b4d47 Mon Sep 17 00:00:00 2001 From: root <root@localhost.localdomain> Date: Sun, 7 Jun 2015 06:08:42 -0400 Subject: [PATCH] first build on fc22
--- modules/base/kspkglist.10.core.inc | 2 -- modules/base/kspost.50.zip_bootfiles.nochroot.inc | 1 + modules/gnome/kspkglist.50.gnome.inc | 1 - modules/mate/kspkglist.50.mate.inc | 1 - modules/sd_card_image/image.50.makefs.sh | 2 +- modules/sugar/kspkglist.50.sugar.inc | 3 +-- modules/sugar/kspost.75.install_bundles.inc | 2 +- 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc index ef16a65..17057a5 100644 --- a/modules/base/kspkglist.10.core.inc +++ b/modules/base/kspkglist.10.core.inc @@ -35,8 +35,6 @@ olpc-kbdshim xorg-x11-server-Xorg xorg-x11-drv-fbdev xorg-x11-drv-evdev -xorg-x11-drv-keyboard -xorg-x11-drv-mouse xorg-x11-utils xorg-x11-xinit xorg-x11-xauth diff --git a/modules/base/kspost.50.zip_bootfiles.nochroot.inc b/modules/base/kspost.50.zip_bootfiles.nochroot.inc index ad10e8a..c5abfb5 100644 --- a/modules/base/kspost.50.zip_bootfiles.nochroot.inc +++ b/modules/base/kspost.50.zip_bootfiles.nochroot.inc @@ -29,6 +29,7 @@ remove_original() { local name=$1 cd $INSTALL_ROOT/boot + [ -e "$name" ] || return if [ -L "$name" ]; then diff --git a/modules/gnome/kspkglist.50.gnome.inc b/modules/gnome/kspkglist.50.gnome.inc index 1398dc8..ed63923 100644 --- a/modules/gnome/kspkglist.50.gnome.inc +++ b/modules/gnome/kspkglist.50.gnome.inc @@ -31,7 +31,6 @@ gimp # audio & video audacity totem -totem-mozplugin # more desktop stuff file-roller diff --git a/modules/mate/kspkglist.50.mate.inc b/modules/mate/kspkglist.50.mate.inc index 8e4fd0c..56c3d04 100644 --- a/modules/mate/kspkglist.50.mate.inc +++ b/modules/mate/kspkglist.50.mate.inc @@ -31,7 +31,6 @@ gimp # audio & video audacity totem -totem-mozplugin # more desktop stuff file-roller diff --git a/modules/sd_card_image/image.50.makefs.sh b/modules/sd_card_image/image.50.makefs.sh index 0fd57c6..5b1c954 100644 --- a/modules/sd_card_image/image.50.makefs.sh +++ b/modules/sd_card_image/image.50.makefs.sh @@ -63,7 +63,7 @@ make_image() dd if=/dev/zero of=$img bs=$BLOCK_SIZE count=0 seek=$(($image_size / $BLOCK_SIZE)) - /sbin/sfdisk -S 32 -H 32 --force -uS $img <<EOF + /sbin/sfdisk --force -uS $img <<EOF 8192,131072,83,* $ROOT_PARTITION_START_BLOCK,,, EOF diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc index aaefe06..9438808 100644 --- a/modules/sugar/kspkglist.50.sugar.inc +++ b/modules/sugar/kspkglist.50.sugar.inc @@ -43,7 +43,6 @@ mobile-broadband-provider-info # Browse gnash-plugin -totem-mozplugin # Record, Measure, and Jukebox gstreamer-python @@ -54,7 +53,7 @@ python-simplejson # dependencies for Epub support in Read python-BeautifulSoup -olpc-library +#olpc-library # for Tuxmath activity SDL_Pango diff --git a/modules/sugar/kspost.75.install_bundles.inc b/modules/sugar/kspost.75.install_bundles.inc index 367a93e..7932adf 100644 --- a/modules/sugar/kspost.75.install_bundles.inc +++ b/modules/sugar/kspost.75.install_bundles.inc @@ -10,6 +10,6 @@ for i in /build_shared/sugar-bundles/*; do fi done shopt -u nullglob -/bin/su -c "/bin/olpc-library-update" - olpc > /dev/null +#/bin/su -c "/bin/olpc-library-update" - olpc > /dev/null chown -R olpc:olpc /home/olpc/{Activities,Library} -- 2.4.2 And I put the kernel in a local repo: Kernel is at http://dev.laptop.org/~quozl/kernel-4.1.0_rc6_xo1.5-20150604.1436.olpc.3e60eda.i686.rpm My os.ini file was [global] suggested_oob_version=7.0 fedora_release=22 fedora_arch=i386 olpc_version_major=15 olpc_version_minor=1 olpc_version_release=0 target_platform=XO-1.5 langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de,hy customization_tag=XS customization_info="xsce_build" [base] [xo1_5] [sd_card_image] [usb_update] [repos] fedora=fedora,fedora-updates,fedora-updates-testing olpc_publicrpms_1=1,f20 olpc_publicrpms_2=1,f20-xo1.5 custom_repo_13=1,f22-xo1.5,http://10.4.75.11/fedora/22/ #add_excludes_to=fedora,fedora-updates,fedora-updates-testing [yumcfg] addrepo_1=1,olpc-f20,http://rpmdropbox.laptop.org/f20/ addrepo_2=1,olpc-f20-xo1.5,http://rpmdropbox.laptop.org/f20-xo1.5/ #add_excludes_to=fedora,fedora-updates,fedora-updates-testing [x11] [mate] [sugar] favorites_view_add= org.laptop.Terminal, org.laptop.Log, org.laptop.WebActivity, favorites_view_del= org.laptop.sugar.ReadActivity, org.laptop.TamTamEdit, org.laptop.TamTamSynthLab protected_activities= org.laptop.WebActivity, org.laptop.Terminal, org.laptop.Log, org.laptop.AbiWordActivity, org.laptop.sugar.ReadActivity, org.laptop.ImageViewerActivity, org.laptop.RecordActivity [sugar_welcome_activity] [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/Minimal/14.1.0 [buildnr_from_file] path=latestbuild I put the image on a 16GB SD and it booted. Lots of problems. But basic function. The libertas firmware v8 was not enough to get wifi up and running.
_______________________________________________ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel