[PATCH 1/2] Use keyboard bits from system-config-keyboard now

[Jeremy Katz]

system-config-keyboard has the keyboard bits now, so let's use
those rather than the ones from rhpl
---
 anaconda           |    2 +-
 anaconda.spec.in   |    2 +-
 instdata.py        |    2 +-
 scripts/getkeymaps |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anaconda b/anaconda
index aef0c95..03dbe5c 100755
--- a/anaconda
+++ b/anaconda
@@ -774,7 +774,7 @@ if __name__ == "__main__":

import instdata

-    import rhpl.keyboard as keyboard
+    import system_config_keyboard.keyboard as keyboard

log.info("anaconda called with cmdline = %s" %(sys.argv,))
     log.info("Display mode = %s" %(opts.display_mode,))
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 81adcd6..964e495 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -115,7 +115,7 @@ Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
 %ifnarch s390 s390x ppc64
-Requires: system-config-keyboard
+Requires: system-config-keyboard >= 1.3.0
 %endif
 Requires: hal, dbus-python
 Requires: cracklib-python
diff --git a/instdata.py b/instdata.py
index 488616b..6700528 100644
--- a/instdata.py
+++ b/instdata.py
@@ -40,7 +40,7 @@ import shlex
 from flags import *
 from constants import *
 from simpleconfig import SimpleConfigFile
-import rhpl.keyboard as keyboard
+import system_config_keyboard.keyboard as keyboard

from pykickstart.version import versionToString, DEVEL

diff --git a/scripts/getkeymaps b/scripts/getkeymaps
index 2e003a7..8436900 100755
--- a/scripts/getkeymaps
+++ b/scripts/getkeymaps
@@ -51,7 +51,7 @@ else
     PATTERN=i386
 fi

-MAPS=$(python -c "import rhpl.keyboard_models ; rhpl.keyboard_models.get_supported_models()")
+MAPS=$(python -c "import system_config_keyboard.keyboard_models ; system_config_keyboard.keyboard_models.get_supported_models()")

for map in $MAPS ; do 
  eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*.gz" | while read n; do

[PATCH 2/2] And finish off the removal of rhpl

[Jeremy Katz]

Finish off removing the symlinking and requirements for rhpl in
anaconda.
---
 anaconda             |    2 +-
 anaconda.spec.in     |    3 ---
 scripts/upd-instroot |    3 +--
 yuminstall.py        |    3 +--
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/anaconda b/anaconda
index 03dbe5c..a189b38 100755
--- a/anaconda
+++ b/anaconda
@@ -139,7 +139,7 @@ def setupPythonUpdates():
     except:
    pass

-    for pypkg in ("block", "rhpl", "yum", "rpmUtils", "urlgrabber", "pykickstart", "parted"):
+    for pypkg in ("block", "yum", "rpmUtils", "urlgrabber", "pykickstart", "parted"):
    # get the libdir.  *sigh*
    if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
    	     os.X_OK):
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 964e495..281d262 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -30,7 +30,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define rpmpythonver 4.2-0.61
 %define slangver 2.0.6-2
 %define yumver 2.9.2
-%define rhplver 0.170
 %define partedver 1.8.1
 %define pypartedver 2.0.0
 %define syscfgdatever 1.9.0
@@ -67,7 +66,6 @@ BuildRequires: popt-devel
 BuildRequires: pykickstart >= %{pykickstartver}
 BuildRequires: python-devel
 BuildRequires: python-urlgrabber
-BuildRequires: rhpl
 BuildRequires: rpm-python >= %{rpmpythonver}
 BuildRequires: slang-devel >= %{slangver}
 BuildRequires: xmlto
@@ -84,7 +82,6 @@ BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver}
 Requires: policycoreutils
 Requires: rpm-python >= %{rpmpythonver}
 Requires: comps-extras
-Requires: rhpl >= %{rhplver}
 Requires: parted >= %{partedver}
 Requires: pyparted >= %{pypartedver}
 Requires: yum >= %{yumver}
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8b97d74..f4827cd 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -181,7 +181,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
     pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator
     python-libs python-pyblock python-sqlite
     python-urlgrabber pyxf86config readline redhat-artwork
-    reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted
+    reiserfs-utils rpm rpm-libs rpm-python sed selinux-policy-targeted
     setup slang smc-meera-fonts specspo sqlite synaptics system-config-date
     system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers
     tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tigervnc-server
@@ -612,7 +612,6 @@ usr/share/locale/*/LC_MESSAGES/gtk20.mo
 usr/share/locale/*/LC_MESSAGES/libc.mo
 usr/share/locale/*/LC_MESSAGES/parted.mo
 usr/share/locale/*/LC_MESSAGES/redhat-dist.mo
-usr/share/locale/*/LC_MESSAGES/rhpl.mo
 usr/share/locale/*/LC_MESSAGES/system-config-date.mo
 usr/share/locale/*/LC_MESSAGES/system-config-keyboard.mo
 usr/share/locale/*/LC_MESSAGES/zenity.mo
diff --git a/yuminstall.py b/yuminstall.py
index b13e443..5d071dc 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1270,8 +1270,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
     # installed (they could have been removed in kickstart).  So we'll force
     # it.
     def selectAnacondaNeeds(self):
-        for pkg in ['authconfig', 'chkconfig', 'mkinitrd', 'rhpl',
-                    'system-config-firewall-tui']:
+        for pkg in ['authconfig', 'chkconfig', 'mkinitrd', 'system-config-firewall-tui']:
             self.selectPackage(pkg)

def doPostSelection(self, anaconda):

[Bill Nottingham]

Jeremy Katz ([e-mail]) said:
> system-config-keyboard has the keyboard bits now, so let's use
> those rather than the ones from rhpl

What if we want to kill system-config-keyboard? It doesn't really
serve a purpose outside from setting the initial system config.
(See also: language, rootpassword, etc.)

Bill

[Jeremy Katz]

On Tuesday, July 28 2009, Bill Nottingham said:
> Jeremy Katz ([e-mail]) said:
> > system-config-keyboard has the keyboard bits now, so let's use
> > those rather than the ones from rhpl
>
> What if we want to kill system-config-keyboard? It doesn't really
> serve a purpose outside from setting the initial system config.
> (See also: language, rootpassword, etc.)

It's also used in firstboot.  And we're already using the *widgets* from
system-config-keyboard, so using the model lists from there too is
entirely reasonable...

Jeremy

[Bill Nottingham]

Jeremy Katz ([e-mail]) said:
> On Tuesday, July 28 2009, Bill Nottingham said:
> > Jeremy Katz ([e-mail]) said:
> > > system-config-keyboard has the keyboard bits now, so let's use
> > > those rather than the ones from rhpl
> >
> > What if we want to kill system-config-keyboard? It doesn't really
> > serve a purpose outside from setting the initial system config.
> > (See also: language, rootpassword, etc.)
>
> It's also used in firstboot.  And we're already using the *widgets* from
> system-config-keyboard, so using the model lists from there too is
> entirely reasonable...

Maybe the answer is just to depackage the standalone tools. (as opposed
to the widgetry/firstboot bits)

Bill

[Jeremy Katz]

On Tuesday, July 28 2009, Bill Nottingham said:
> Jeremy Katz ([e-mail]) said:
> > On Tuesday, July 28 2009, Bill Nottingham said:
> > > Jeremy Katz ([e-mail]) said:
> > > > system-config-keyboard has the keyboard bits now, so let's use
> > > > those rather than the ones from rhpl
> > >
> > > What if we want to kill system-config-keyboard? It doesn't really
> > > serve a purpose outside from setting the initial system config.
> > > (See also: language, rootpassword, etc.)
> >
> > It's also used in firstboot.  And we're already using the *widgets* from
> > system-config-keyboard, so using the model lists from there too is
> > entirely reasonable...
>
> Maybe the answer is just to depackage the standalone tools. (as opposed
> to the widgetry/firstboot bits)

We probably really need to see how we can use the (now existing, though
desktop enviroment specific) tools/frontends at install time rather than
having our own slightly different UI.

But non-trivial to do as embeddability isn't necessarily their raison
d'être unlike the s-c bits where we built them that way to begin with
(largely by starting with what had been in anaconda and pulling it
out to be separate).

As Chris said on IRC -- around and around and around it goes....

Jeremy

[Bill Nottingham]

Jeremy Katz ([e-mail]) said:
> > Maybe the answer is just to depackage the standalone tools. (as opposed
> > to the widgetry/firstboot bits)
>
> We probably really need to see how we can use the (now existing, though
> desktop enviroment specific) tools/frontends at install time rather than
> having our own slightly different UI.

Perhaps. Given that the language & keyboard choosers are part of the display
manager, that's probably said than done.

My main concern is that we have (IMO, ugly) tools in the menu post-install,
that overlap with the installed system. So, just fixing the tools so
they're only a library used by anaconda works for me. (And doesn't need
discussed on this list, come to think about it...)

Bill

[Jeremy Katz]

On Tuesday, July 28 2009, Bill Nottingham said:
> My main concern is that we have (IMO, ugly) tools in the menu post-install,
> that overlap with the installed system. So, just fixing the tools so
> they're only a library used by anaconda works for me. (And doesn't need
> discussed on this list, come to think about it...)

Indeed.  No argument here.  And removing the /usr/bin bits as well as
the desktop files is definitely an easy way to kill the menu items

Jeremy

[Chris Lumens]

> system-config-keyboard has the keyboard bits now, so let's use
> those rather than the ones from rhpl

Looks okay to me.

- Chris