Attachment 154125 Details for Bug 239024 – scripts/upd-instroot add required files in stage2.img

[patch] scripts/upd-instroot add required files in stage2.img

scripts.upd-instroot.dogtail_files.diff (text/plain), 3.40 KB, created by Alexander Todorov on 2007-05-04 14:16:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Todorov

Created: 2007-05-04 14:16:28 UTC

Size: 3.40 KB

patch

obsolete

>--- upd-instroot.orig	2007-04-30 16:49:19.000000000 +0200
>+++ upd-instroot	2007-04-30 18:02:23.000000000 +0200
>@@ -234,7 +234,7 @@
> fi
> 
> # dogtail stuff...
>-PACKAGESGR="$PACKAGESGR gail at-spi libbonobo ORBit2"
>+PACKAGESGR="$PACKAGESGR gail at-spi libbonobo ORBit2 pyspi GConf2 dogtail libXevie libXtst gnome-python2-gconf"
> 
> # modular xorg...
> XORGLIBS="libICE libSM libX11 libXcursor libXext libXfixes libXft libXi libxkbfile libXmu libXpm libXrandr libXrender libXt libXxf86misc libXaw liblbxutil libXfont libfontenc libXau libXdmcp libXfont libXinerama"
>@@ -809,12 +809,20 @@
> usr/$LIBDIR/gtk-2.0/modules/libgail.so
> usr/libexec/bonobo-activation-server
> usr/libexec/at-spi-registryd
>+usr/libexec/gconfd-2
> usr/$LIBDIR/libORBit*
> usr/$LIBDIR/libbonobo*
> usr/$LIBDIR/libspi*
> usr/$LIBDIR/libcspi*
> usr/$LIBDIR/bonobo/servers/*
> usr/$LIBDIR/libXevie*
>+usr/$LIBDIR/libXtst*
>+usr/$LIBDIR/libgconf-2*
>+usr/$LIBDIR/GConf/2/libgconfbackend-xml.so
>+usr/$LIBDIR/python?.?/site-packages/gtk-2.0/atk.so
>+usr/$LIBDIR/python?.?/site-packages/gtk-2.0/gconf.so
>+usr/$LIBDIR/python?.?/site-packages/atspi.so
>+usr/lib/python?.?/site-packages/dogtail/*.py
> EOF
> 
> 
>@@ -951,6 +959,64 @@
> echo "Expanding graphical packages..."
> expandPackageSet "$RPMSGR" $DESTGR $KEEPFILEGR
> 
>+# more dogtail stuff
>+if [ -n "$NEEDGR" ]; then
>+    echo "Creating customized GConf2 settings for root"
>+    mkdir -p $DESTGR/.gconf/desktop/gnome/interface
>+    touch $DESTGR/.gconf/desktop/%gconf.xml
>+    touch $DESTGR/.gconf/desktop/gnome/%gconf.xml
>+    cat > $DESTGR/.gconf/desktop/gnome/interface/%gconf.xml <<EOF
>+<?xml version="1.0"?>
>+<gconf>
>+        <entry name="accessibility" mtime="1176200664" type="bool" value="true">
>+        </entry>
>+</gconf>
>+EOF
>+#todo: fix file permissions
>+
>+    # add dogtail <url> command to kickstart
>+    echo "Patching pykickstart ..."
>+    cd $DESTGR/usr/lib/python?.?/site-packages/pykickstart
>+    patch -p0 > /dev/null <<EOF
>+--- data.py.orig	2007-04-18 16:26:35.000000000 +0200
>++++ data.py	2007-04-18 16:26:51.000000000 +0200
>+@@ -30,6 +30,7 @@
>+         self.device = ""
>+         self.deviceprobe = ""
>+         self.displayMode = DISPLAY_MODE_GRAPHICAL
>++        self.dogtail = None
>+         self.driverdisk = ""
>+         self.firewall = {"enabled": True, "ports": [], "trusts": []}
>+         self.firstboot = FIRSTBOOT_SKIP
>+EOF
>+
>+    patch -p0 > /dev/null <<EOF
>+--- parser.py.orig	2007-04-18 14:43:10.000000000 +0200
>++++ parser.py	2007-04-18 14:59:51.000000000 +0200
>+@@ -233,6 +233,7 @@
>+                      "cmdline"      : self.doDisplayMode,
>+                      "device"       : self.doDevice,
>+                      "deviceprobe"  : self.doDeviceProbe,
>++                     "dogtail"      : self.doDogtail,
>+                      "driverdisk"   : self.doDriverDisk,
>+                      "firewall"     : self.doFirewall,
>+                      "firstboot"    : self.doFirstboot,
>+@@ -370,6 +371,12 @@
>+         elif self.currentCmd == "text":
>+             self.ksdata.displayMode = DISPLAY_MODE_TEXT
>+ 
>++    def doDogtail(self, args):
>++        if len(args) > 1:
>++            raise KickstartValueError, formatErrorMsg(self.lineno, msg=_("Command %s only takes one argument") % "dogtail")
>++
>++        self.ksdata.dogtail = args[0]
>++
>+     def doDriverDisk(self, args):
>+         self.ksdata.driverdisk = string.join(args)
>+EOF
>+    cd -
>+fi
>+
> echo "retrieving timezones"
> TZDIR=/tmp/glibc-timezone-$$
> mkdir -p $TZDIR/usr/share/zoneinfo

Actions: View | Diff

Attachments on bug 239024: 154122 | 154124 | 154125 | 154126 | 154127 | 154128