[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 1/3] Move isys and booty into the pyanaconda/ directory, adjust paths to match.



This is required so the source layout and package layout have a similar enough
structure to make our test setup work.  Without this move, you can't run
"make check" or checkbot without getting error messages about no such module
pyanaconda.booty.
---
 Makefile.am                                    |    2 +-
 configure.ac                                   |    4 ++--
 loader/Makefile.am                             |    2 +-
 loader/cdinstall.c                             |    8 ++++----
 loader/dirbrowser.c                            |    2 +-
 loader/driverdisk.c                            |    8 ++++----
 loader/driverselect.c                          |    2 +-
 loader/fwloader.c                              |    2 +-
 loader/getparts.c                              |    2 +-
 loader/hardware.c                              |    4 ++--
 loader/hdinstall.c                             |    8 ++++----
 loader/kbd.c                                   |    6 +++---
 loader/kickstart.c                             |    6 +++---
 loader/lang.c                                  |   10 +++++-----
 loader/loader.c                                |   14 +++++++-------
 loader/loader.h                                |    2 +-
 loader/loadermisc.c                            |    2 +-
 loader/mediacheck.c                            |    2 +-
 loader/method.c                                |    8 ++++----
 loader/modules.c                               |    2 +-
 loader/net.c                                   |    8 ++++----
 loader/net.h                                   |    2 +-
 loader/nfsinstall.c                            |    6 +++---
 loader/rpmextract.c                            |    2 +-
 loader/selinux.c                               |    2 +-
 loader/telnet.c                                |    2 +-
 loader/telnetd.c                               |    2 +-
 loader/urlinstall.c                            |    4 ++--
 loader/urls.c                                  |    2 +-
 loader/windows.c                               |    2 +-
 pyanaconda/Makefile.am                         |    2 +-
 {booty => pyanaconda/booty}/Makefile.am        |    0
 {booty => pyanaconda/booty}/__init__.py        |    0
 {booty => pyanaconda/booty}/alpha.py           |    0
 {booty => pyanaconda/booty}/bootloaderInfo.py  |    0
 {booty => pyanaconda/booty}/checkbootloader.py |    0
 {booty => pyanaconda/booty}/ia64.py            |    0
 {booty => pyanaconda/booty}/lilo.py            |    0
 {booty => pyanaconda/booty}/ppc.py             |    0
 {booty => pyanaconda/booty}/s390.py            |    0
 {booty => pyanaconda/booty}/sparc.py           |    0
 {booty => pyanaconda/booty}/util.py            |    0
 {booty => pyanaconda/booty}/x86.py             |    0
 {isys => pyanaconda/isys}/.gitignore           |    0
 {isys => pyanaconda/isys}/Makefile.am          |    0
 {isys => pyanaconda/isys}/__init__.py          |    8 +++++++-
 {isys => pyanaconda/isys}/auditd.c             |    0
 {isys => pyanaconda/isys}/auditd.h             |    0
 {isys => pyanaconda/isys}/cpio.c               |    0
 {isys => pyanaconda/isys}/cpio.h               |    0
 {isys => pyanaconda/isys}/devices.c            |    0
 {isys => pyanaconda/isys}/devices.h            |    0
 {isys => pyanaconda/isys}/eddsupport.c         |    0
 {isys => pyanaconda/isys}/eddsupport.h         |    0
 {isys => pyanaconda/isys}/ethtool.c            |    0
 {isys => pyanaconda/isys}/ethtool.h            |    0
 {isys => pyanaconda/isys}/iface.c              |    0
 {isys => pyanaconda/isys}/iface.h              |    0
 {isys => pyanaconda/isys}/imount.c             |    0
 {isys => pyanaconda/isys}/imount.h             |    0
 {isys => pyanaconda/isys}/isofs.c              |    0
 {isys => pyanaconda/isys}/isys.c               |    0
 {isys => pyanaconda/isys}/isys.h               |    0
 {isys => pyanaconda/isys}/lang.c               |    0
 {isys => pyanaconda/isys}/lang.h               |    0
 {isys => pyanaconda/isys}/linkdetect.c         |    0
 {isys => pyanaconda/isys}/log.c                |    0
 {isys => pyanaconda/isys}/log.h                |    0
 {isys => pyanaconda/isys}/mem.c                |    0
 {isys => pyanaconda/isys}/mem.h                |    0
 {isys => pyanaconda/isys}/stubs.h              |    0
 {isys => pyanaconda/isys}/uncpio.c             |    0
 {isys => pyanaconda/isys}/vio.c                |    0
 tests/Makefile.am                              |    3 ++-
 tests/kickstart_test/Makefile.am               |    3 ++-
 tests/storage_test/devicelibs_test/Makefile.am |    3 ++-
 utils/mapshdr.c                                |    2 +-
 utils/modlist.c                                |    2 +-
 utils/readmap.c                                |    2 +-
 79 files changed, 81 insertions(+), 72 deletions(-)
 rename {booty => pyanaconda/booty}/Makefile.am (100%)
 rename {booty => pyanaconda/booty}/__init__.py (100%)
 rename {booty => pyanaconda/booty}/alpha.py (100%)
 rename {booty => pyanaconda/booty}/bootloaderInfo.py (100%)
 rename {booty => pyanaconda/booty}/checkbootloader.py (100%)
 rename {booty => pyanaconda/booty}/ia64.py (100%)
 rename {booty => pyanaconda/booty}/lilo.py (100%)
 rename {booty => pyanaconda/booty}/ppc.py (100%)
 rename {booty => pyanaconda/booty}/s390.py (100%)
 rename {booty => pyanaconda/booty}/sparc.py (100%)
 rename {booty => pyanaconda/booty}/util.py (100%)
 rename {booty => pyanaconda/booty}/x86.py (100%)
 rename {isys => pyanaconda/isys}/.gitignore (100%)
 rename {isys => pyanaconda/isys}/Makefile.am (100%)
 rename {isys => pyanaconda/isys}/__init__.py (98%)
 rename {isys => pyanaconda/isys}/auditd.c (100%)
 rename {isys => pyanaconda/isys}/auditd.h (100%)
 rename {isys => pyanaconda/isys}/cpio.c (100%)
 rename {isys => pyanaconda/isys}/cpio.h (100%)
 rename {isys => pyanaconda/isys}/devices.c (100%)
 rename {isys => pyanaconda/isys}/devices.h (100%)
 rename {isys => pyanaconda/isys}/eddsupport.c (100%)
 rename {isys => pyanaconda/isys}/eddsupport.h (100%)
 rename {isys => pyanaconda/isys}/ethtool.c (100%)
 rename {isys => pyanaconda/isys}/ethtool.h (100%)
 rename {isys => pyanaconda/isys}/iface.c (100%)
 rename {isys => pyanaconda/isys}/iface.h (100%)
 rename {isys => pyanaconda/isys}/imount.c (100%)
 rename {isys => pyanaconda/isys}/imount.h (100%)
 rename {isys => pyanaconda/isys}/isofs.c (100%)
 rename {isys => pyanaconda/isys}/isys.c (100%)
 rename {isys => pyanaconda/isys}/isys.h (100%)
 rename {isys => pyanaconda/isys}/lang.c (100%)
 rename {isys => pyanaconda/isys}/lang.h (100%)
 rename {isys => pyanaconda/isys}/linkdetect.c (100%)
 rename {isys => pyanaconda/isys}/log.c (100%)
 rename {isys => pyanaconda/isys}/log.h (100%)
 rename {isys => pyanaconda/isys}/mem.c (100%)
 rename {isys => pyanaconda/isys}/mem.h (100%)
 rename {isys => pyanaconda/isys}/stubs.h (100%)
 rename {isys => pyanaconda/isys}/uncpio.c (100%)
 rename {isys => pyanaconda/isys}/vio.c (100%)

diff --git a/Makefile.am b/Makefile.am
index d4f1fd3..05aa5c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = isys loader gptsync booty pyanaconda data \
+SUBDIRS = pyanaconda loader gptsync data \
 	  tests utils scripts docs po
 
 EXTRA_DIST = config.rpath COPYING \
diff --git a/configure.ac b/configure.ac
index 34fc1c9..1e1c453 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,13 +254,11 @@ AC_CONFIG_FILES([Makefile
                  data/bootdisk/sparc/Makefile
                  data/bootdisk/s390x/Makefile
                  data/bootdisk/x86_64/Makefile
-                 booty/Makefile
                  data/command-stubs/Makefile
                  docs/Makefile
                  data/fonts/Makefile
                  gptsync/Makefile
                  pyanaconda/installclasses/Makefile
-                 isys/Makefile
                  pyanaconda/iw/Makefile
                  data/liveinst/Makefile
                  data/liveinst/console.apps/Makefile
@@ -282,6 +280,8 @@ AC_CONFIG_FILES([Makefile
                  po/Makefile.in
                  scripts/Makefile
                  pyanaconda/Makefile
+                 pyanaconda/booty/Makefile
+                 pyanaconda/isys/Makefile
                  pyanaconda/storage/Makefile
                  pyanaconda/storage/devicelibs/Makefile
                  pyanaconda/storage/formats/Makefile
diff --git a/loader/Makefile.am b/loader/Makefile.am
index 6910952..ec65d97 100644
--- a/loader/Makefile.am
+++ b/loader/Makefile.am
@@ -47,7 +47,7 @@ loader_CFLAGS      = $(COMMON_CFLAGS) $(GLIB_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
 loader_LDADD       = $(NEWT_LIBS) $(GLIB_LIBS) $(LIBNL_LIBS) \
                      $(LIBNM_GLIB_LIBS) $(CHECKISOMD5_LIBS) \
                      $(LIBCURL_LIBS) $(LIBARCHIVE_LIBS) $(RPM_LIBS) \
-                     $(ISCSI_LIBS) $(top_srcdir)/isys/libisys.la -lm
+                     $(ISCSI_LIBS) $(top_srcdir)/pyanaconda/isys/libisys.la -lm
 loader_SOURCES     = loader.c copy.c moduleinfo.c loadermisc.c \
                      modules.c windows.c lang.c kbd.c driverdisk.c \
                      selinux.c mediacheck.c kickstart.c driverselect.c \
diff --git a/loader/cdinstall.c b/loader/cdinstall.c
index a896406..bde1bff 100644
--- a/loader/cdinstall.c
+++ b/loader/cdinstall.c
@@ -56,10 +56,10 @@
 #include "mediacheck.h"
 #include "windows.h"
 
-#include "../isys/imount.h"
-#include "../isys/isys.h"
-#include "../isys/log.h"
-#include "../isys/mem.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/log.h"
+#include "../pyanaconda/isys/mem.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/dirbrowser.c b/loader/dirbrowser.c
index 9199850..3783ea3 100644
--- a/loader/dirbrowser.c
+++ b/loader/dirbrowser.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #ifndef STANDALONE
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "loader.h"
 #include "loadermisc.h"
diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 1072f46..0545668 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -55,10 +55,10 @@
 
 #include "rpmextract.h"
 
-#include "../isys/isys.h"
-#include "../isys/imount.h"
-#include "../isys/eddsupport.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/eddsupport.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/driverselect.c b/loader/driverselect.c
index 85b777b..a2332d7 100644
--- a/loader/driverselect.c
+++ b/loader/driverselect.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "modules.h"
 #include "moduleinfo.h"
diff --git a/loader/fwloader.c b/loader/fwloader.c
index 5ad1d8e..e6ed4c7 100644
--- a/loader/fwloader.c
+++ b/loader/fwloader.c
@@ -41,7 +41,7 @@
 #include <asm/types.h>
 #include <linux/netlink.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "loader.h"
 #include "fwloader.h"
diff --git a/loader/getparts.c b/loader/getparts.c
index c60dc83..c4544d7 100644
--- a/loader/getparts.c
+++ b/loader/getparts.c
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 /* see if this is a partition name or not */
 static int isPartitionName(char *pname) {
diff --git a/loader/hardware.c b/loader/hardware.c
index ad20ed5..272846b 100644
--- a/loader/hardware.c
+++ b/loader/hardware.c
@@ -39,8 +39,8 @@
 /* FIXME: for turning off dma */
 #include <sys/ioctl.h>
 #include <linux/hdreg.h>
-#include "../isys/isys.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/hdinstall.c b/loader/hdinstall.c
index cf5b79c..5712de0 100644
--- a/loader/hdinstall.c
+++ b/loader/hdinstall.c
@@ -46,10 +46,10 @@
 #include "cdinstall.h"
 #include "windows.h"
 
-#include "../isys/imount.h"
-#include "../isys/isys.h"
-#include "../isys/eddsupport.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/eddsupport.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/kbd.c b/loader/kbd.c
index b94f920..c943be6 100644
--- a/loader/kbd.c
+++ b/loader/kbd.c
@@ -34,9 +34,9 @@
 #include "lang.h"
 #include "windows.h"
 
-#include "../isys/stubs.h"
-#include "../isys/lang.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/stubs.h"
+#include "../pyanaconda/isys/lang.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/kickstart.c b/loader/kickstart.c
index 26c4aab..4c3dc26 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -50,9 +50,9 @@
 #include "cdinstall.h"
 #include "hdinstall.h"
 
-#include "../isys/imount.h"
-#include "../isys/isys.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/lang.c b/loader/lang.c
index 31749fc..0bb351e 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -40,11 +40,11 @@
 #include "loadermisc.h"
 #include "windows.h"
 
-#include "../isys/stubs.h"
-#include "../isys/cpio.h"
-#include "../isys/lang.h"
-#include "../isys/isys.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/stubs.h"
+#include "../pyanaconda/isys/cpio.h"
+#include "../pyanaconda/isys/lang.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/loader.c b/loader/loader.c
index edbb67b..bd03ce1 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -93,13 +93,13 @@
 #include <selinux/selinux.h>
 #include "selinux.h"
 
-#include "../isys/imount.h"
-#include "../isys/isys.h"
-#include "../isys/stubs.h"
-#include "../isys/lang.h"
-#include "../isys/eddsupport.h"
-#include "../isys/log.h"
-#include "../isys/mem.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/stubs.h"
+#include "../pyanaconda/isys/lang.h"
+#include "../pyanaconda/isys/eddsupport.h"
+#include "../pyanaconda/isys/log.h"
+#include "../pyanaconda/isys/mem.h"
 
 /* maximum number of extra arguments that can be passed to the second stage */
 #define MAX_EXTRA_ARGS 128
diff --git a/loader/loader.h b/loader/loader.h
index bb38098..8fd958d 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -117,7 +117,7 @@ char * getProductPath(void);
 char * getProductArch(void);
 
 #include "moduleinfo.h"
-#include "../isys/devices.h"
+#include "../pyanaconda/isys/devices.h"
 /* JKFIXME: I don't like all of the _set attribs, but without them,
  * we can't tell if it was explicitly set by kickstart/cmdline or 
  * if we just got it going through the install.   */
diff --git a/loader/loadermisc.c b/loader/loadermisc.c
index bf857b4..d0ff3d4 100644
--- a/loader/loadermisc.c
+++ b/loader/loadermisc.c
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 #include "windows.h"
 
 int copyFileFd(int infd, char * dest, progressCB pbcb,
diff --git a/loader/mediacheck.c b/loader/mediacheck.c
index 4bec1c8..c4c1aa0 100644
--- a/loader/mediacheck.c
+++ b/loader/mediacheck.c
@@ -30,7 +30,7 @@
 #include <newt.h>
 #include <libcheckisomd5.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "lang.h"
 #include "windows.h"
diff --git a/loader/method.c b/loader/method.c
index 3ca669f..e3c5cdf 100644
--- a/loader/method.c
+++ b/loader/method.c
@@ -45,10 +45,10 @@
 #include "mediacheck.h"
 #include "method.h"
 
-#include "../isys/imount.h"
-#include "../isys/isys.h"
-#include "../isys/cpio.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/cpio.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "devt.h"
 
diff --git a/loader/modules.c b/loader/modules.c
index b408092..9635be6 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -41,7 +41,7 @@
 #include <glib/gprintf.h>
 #include <assert.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "loader.h"
 #include "modules.h"
diff --git a/loader/net.c b/loader/net.c
index 9b89f55..424159b 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -41,10 +41,10 @@
 #include <nm-client.h>
 #include <nm-device-wifi.h>
 
-#include "../isys/isys.h"
-#include "../isys/ethtool.h"
-#include "../isys/iface.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/isys.h"
+#include "../pyanaconda/isys/ethtool.h"
+#include "../pyanaconda/isys/iface.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "lang.h"
 #include "loader.h"
diff --git a/loader/net.h b/loader/net.h
index 8245084..8cf12a0 100644
--- a/loader/net.h
+++ b/loader/net.h
@@ -21,7 +21,7 @@
 #define H_LOADER_NET
 
 #include <newt.h>
-#include "../isys/iface.h"
+#include "../pyanaconda/isys/iface.h"
 #include "loader.h"
 
 #define DHCP_METHOD_STR   _("Dynamic IP configuration (DHCP)")
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index d1a0a51..62052ee 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -51,9 +51,9 @@
 #include "cdinstall.h"
 #include "windows.h"
 
-#include "../isys/imount.h"
-#include "../isys/iface.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/imount.h"
+#include "../pyanaconda/isys/iface.h"
+#include "../pyanaconda/isys/log.h"
 
 /* boot flags */
 extern uint64_t flags;
diff --git a/loader/rpmextract.c b/loader/rpmextract.c
index 72501c6..de803b8 100644
--- a/loader/rpmextract.c
+++ b/loader/rpmextract.c
@@ -39,7 +39,7 @@
 #include "loader.h"
 #include "rpmextract.h"
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 /*
  * internal structure to pass to libarchive callbacks
diff --git a/loader/selinux.c b/loader/selinux.c
index 66bfe4d..0d17cb0 100644
--- a/loader/selinux.c
+++ b/loader/selinux.c
@@ -32,7 +32,7 @@
 
 #include "loader.h"
 #include "loadermisc.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 int loadpolicy() {
     int pid, status;
diff --git a/loader/telnet.c b/loader/telnet.c
index 3c123ae..9f9a0f5 100644
--- a/loader/telnet.c
+++ b/loader/telnet.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "telnet.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #define IAC "\xff"
 #define DONT "\xfe"
diff --git a/loader/telnetd.c b/loader/telnetd.c
index 219df78..e4730bb 100644
--- a/loader/telnetd.c
+++ b/loader/telnetd.c
@@ -36,7 +36,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "lang.h"
 #include "loader.h"
diff --git a/loader/urlinstall.c b/loader/urlinstall.c
index 54d1398..a56e958 100644
--- a/loader/urlinstall.c
+++ b/loader/urlinstall.c
@@ -31,8 +31,8 @@
 #include <errno.h>
 #include <glib.h>
 
-#include "../isys/iface.h"
-#include "../isys/log.h"
+#include "../pyanaconda/isys/iface.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "copy.h"
 #include "kickstart.h"
diff --git a/loader/urls.c b/loader/urls.c
index c64703c..f0a086f 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -39,7 +39,7 @@
 #include <errno.h>
 #include <curl/curl.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "lang.h"
 #include "loader.h"
diff --git a/loader/windows.c b/loader/windows.c
index 51b00db..ccfb391 100644
--- a/loader/windows.c
+++ b/loader/windows.c
@@ -31,7 +31,7 @@
 #include <stdarg.h>
 #include <math.h>
 
-#include "../isys/log.h"
+#include "../pyanaconda/isys/log.h"
 
 #include "windows.h"
 
diff --git a/pyanaconda/Makefile.am b/pyanaconda/Makefile.am
index 0b9df77..707adcd 100644
--- a/pyanaconda/Makefile.am
+++ b/pyanaconda/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak redhat com>
 
-SUBDIRS = installclasses iw textw storage 
+SUBDIRS = booty installclasses isys iw textw storage 
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/booty/Makefile.am b/pyanaconda/booty/Makefile.am
similarity index 100%
rename from booty/Makefile.am
rename to pyanaconda/booty/Makefile.am
diff --git a/booty/__init__.py b/pyanaconda/booty/__init__.py
similarity index 100%
rename from booty/__init__.py
rename to pyanaconda/booty/__init__.py
diff --git a/booty/alpha.py b/pyanaconda/booty/alpha.py
similarity index 100%
rename from booty/alpha.py
rename to pyanaconda/booty/alpha.py
diff --git a/booty/bootloaderInfo.py b/pyanaconda/booty/bootloaderInfo.py
similarity index 100%
rename from booty/bootloaderInfo.py
rename to pyanaconda/booty/bootloaderInfo.py
diff --git a/booty/checkbootloader.py b/pyanaconda/booty/checkbootloader.py
similarity index 100%
rename from booty/checkbootloader.py
rename to pyanaconda/booty/checkbootloader.py
diff --git a/booty/ia64.py b/pyanaconda/booty/ia64.py
similarity index 100%
rename from booty/ia64.py
rename to pyanaconda/booty/ia64.py
diff --git a/booty/lilo.py b/pyanaconda/booty/lilo.py
similarity index 100%
rename from booty/lilo.py
rename to pyanaconda/booty/lilo.py
diff --git a/booty/ppc.py b/pyanaconda/booty/ppc.py
similarity index 100%
rename from booty/ppc.py
rename to pyanaconda/booty/ppc.py
diff --git a/booty/s390.py b/pyanaconda/booty/s390.py
similarity index 100%
rename from booty/s390.py
rename to pyanaconda/booty/s390.py
diff --git a/booty/sparc.py b/pyanaconda/booty/sparc.py
similarity index 100%
rename from booty/sparc.py
rename to pyanaconda/booty/sparc.py
diff --git a/booty/util.py b/pyanaconda/booty/util.py
similarity index 100%
rename from booty/util.py
rename to pyanaconda/booty/util.py
diff --git a/booty/x86.py b/pyanaconda/booty/x86.py
similarity index 100%
rename from booty/x86.py
rename to pyanaconda/booty/x86.py
diff --git a/isys/.gitignore b/pyanaconda/isys/.gitignore
similarity index 100%
rename from isys/.gitignore
rename to pyanaconda/isys/.gitignore
diff --git a/isys/Makefile.am b/pyanaconda/isys/Makefile.am
similarity index 100%
rename from isys/Makefile.am
rename to pyanaconda/isys/Makefile.am
diff --git a/isys/__init__.py b/pyanaconda/isys/__init__.py
similarity index 98%
rename from isys/__init__.py
rename to pyanaconda/isys/__init__.py
index b043a5b..470c52d 100755
--- a/isys/__init__.py
+++ b/pyanaconda/isys/__init__.py
@@ -22,7 +22,13 @@
 #            Jeremy Katz <katzj redhat com>
 #
 
-from pyanaconda import _isys
+try:
+    from pyanaconda import _isys
+except ImportError:
+    # We're running in some sort of testing mode, in which case we can fix
+    # up PYTHONPATH and just do this basic import.
+    import _isys
+
 import string
 import os
 import os.path
diff --git a/isys/auditd.c b/pyanaconda/isys/auditd.c
similarity index 100%
rename from isys/auditd.c
rename to pyanaconda/isys/auditd.c
diff --git a/isys/auditd.h b/pyanaconda/isys/auditd.h
similarity index 100%
rename from isys/auditd.h
rename to pyanaconda/isys/auditd.h
diff --git a/isys/cpio.c b/pyanaconda/isys/cpio.c
similarity index 100%
rename from isys/cpio.c
rename to pyanaconda/isys/cpio.c
diff --git a/isys/cpio.h b/pyanaconda/isys/cpio.h
similarity index 100%
rename from isys/cpio.h
rename to pyanaconda/isys/cpio.h
diff --git a/isys/devices.c b/pyanaconda/isys/devices.c
similarity index 100%
rename from isys/devices.c
rename to pyanaconda/isys/devices.c
diff --git a/isys/devices.h b/pyanaconda/isys/devices.h
similarity index 100%
rename from isys/devices.h
rename to pyanaconda/isys/devices.h
diff --git a/isys/eddsupport.c b/pyanaconda/isys/eddsupport.c
similarity index 100%
rename from isys/eddsupport.c
rename to pyanaconda/isys/eddsupport.c
diff --git a/isys/eddsupport.h b/pyanaconda/isys/eddsupport.h
similarity index 100%
rename from isys/eddsupport.h
rename to pyanaconda/isys/eddsupport.h
diff --git a/isys/ethtool.c b/pyanaconda/isys/ethtool.c
similarity index 100%
rename from isys/ethtool.c
rename to pyanaconda/isys/ethtool.c
diff --git a/isys/ethtool.h b/pyanaconda/isys/ethtool.h
similarity index 100%
rename from isys/ethtool.h
rename to pyanaconda/isys/ethtool.h
diff --git a/isys/iface.c b/pyanaconda/isys/iface.c
similarity index 100%
rename from isys/iface.c
rename to pyanaconda/isys/iface.c
diff --git a/isys/iface.h b/pyanaconda/isys/iface.h
similarity index 100%
rename from isys/iface.h
rename to pyanaconda/isys/iface.h
diff --git a/isys/imount.c b/pyanaconda/isys/imount.c
similarity index 100%
rename from isys/imount.c
rename to pyanaconda/isys/imount.c
diff --git a/isys/imount.h b/pyanaconda/isys/imount.h
similarity index 100%
rename from isys/imount.h
rename to pyanaconda/isys/imount.h
diff --git a/isys/isofs.c b/pyanaconda/isys/isofs.c
similarity index 100%
rename from isys/isofs.c
rename to pyanaconda/isys/isofs.c
diff --git a/isys/isys.c b/pyanaconda/isys/isys.c
similarity index 100%
rename from isys/isys.c
rename to pyanaconda/isys/isys.c
diff --git a/isys/isys.h b/pyanaconda/isys/isys.h
similarity index 100%
rename from isys/isys.h
rename to pyanaconda/isys/isys.h
diff --git a/isys/lang.c b/pyanaconda/isys/lang.c
similarity index 100%
rename from isys/lang.c
rename to pyanaconda/isys/lang.c
diff --git a/isys/lang.h b/pyanaconda/isys/lang.h
similarity index 100%
rename from isys/lang.h
rename to pyanaconda/isys/lang.h
diff --git a/isys/linkdetect.c b/pyanaconda/isys/linkdetect.c
similarity index 100%
rename from isys/linkdetect.c
rename to pyanaconda/isys/linkdetect.c
diff --git a/isys/log.c b/pyanaconda/isys/log.c
similarity index 100%
rename from isys/log.c
rename to pyanaconda/isys/log.c
diff --git a/isys/log.h b/pyanaconda/isys/log.h
similarity index 100%
rename from isys/log.h
rename to pyanaconda/isys/log.h
diff --git a/isys/mem.c b/pyanaconda/isys/mem.c
similarity index 100%
rename from isys/mem.c
rename to pyanaconda/isys/mem.c
diff --git a/isys/mem.h b/pyanaconda/isys/mem.h
similarity index 100%
rename from isys/mem.h
rename to pyanaconda/isys/mem.h
diff --git a/isys/stubs.h b/pyanaconda/isys/stubs.h
similarity index 100%
rename from isys/stubs.h
rename to pyanaconda/isys/stubs.h
diff --git a/isys/uncpio.c b/pyanaconda/isys/uncpio.c
similarity index 100%
rename from isys/uncpio.c
rename to pyanaconda/isys/uncpio.c
diff --git a/isys/vio.c b/pyanaconda/isys/vio.c
similarity index 100%
rename from isys/vio.c
rename to pyanaconda/isys/vio.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 147c551..9a938c9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS = mock kickstart_test storage_test regex
 
 MAINTAINERCLEANFILES = Makefile.in
 
-TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/isys:$(top_builddir)/pyanaconda
+ANACDIR = $(top_builddir)/pyanaconda
+TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR)/isys:$(ANACDIR)
 
 TESTS = fw_test.py
diff --git a/tests/kickstart_test/Makefile.am b/tests/kickstart_test/Makefile.am
index 5f5d626..1f7ec6a 100644
--- a/tests/kickstart_test/Makefile.am
+++ b/tests/kickstart_test/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = *.py
 
 MAINTAINERCLEANFILES = Makefile.in
 
-TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir)
+ANACDIR = $(top_builddir)/pyanaconda
+TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir)
 
 TESTS = commands_test.py
diff --git a/tests/storage_test/devicelibs_test/Makefile.am b/tests/storage_test/devicelibs_test/Makefile.am
index bb8efcf..c0fce10 100644
--- a/tests/storage_test/devicelibs_test/Makefile.am
+++ b/tests/storage_test/devicelibs_test/Makefile.am
@@ -21,7 +21,8 @@ EXTRA_DIST = *.py
 
 MAINTAINERCLEANFILES = Makefile.in
 
-TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(top_builddir)/isys/.libs:$(top_builddir)/pyanaconda:$(top_builddir)
+ANACDIR = $(top_builddir)/pyanaconda
+TESTS_ENVIRONMENT = PATH=/sbin:/usr/sbin:$$PATH PYTHONPATH=$(top_builddir)/tests:$(ANACDIR)/isys/.libs:$(ANACDIR):$(top_builddir)
 
 TESTS = crypto_test.py \
 	lvm_test.py \
diff --git a/utils/mapshdr.c b/utils/mapshdr.c
index f2209c7..2792ee7 100644
--- a/utils/mapshdr.c
+++ b/utils/mapshdr.c
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "../isys/lang.h"
+#include "../pyanaconda/isys/lang.h"
 
 int main(int argc, char ** argv) {
     struct kmapHeader h;
diff --git a/utils/modlist.c b/utils/modlist.c
index 7aff567..2107ffd 100644
--- a/utils/modlist.c
+++ b/utils/modlist.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "../isys/isys.h"
+#include "../pyanaconda/isys/isys.h"
 #include "moduleinfo.h"
 
 int main(int argc, char ** argv) {
diff --git a/utils/readmap.c b/utils/readmap.c
index 7d65636..035158c 100644
--- a/utils/readmap.c
+++ b/utils/readmap.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "../isys/lang.h"
+#include "../pyanaconda/isys/lang.h"
 
 int main(int argc, char ** argv) {
     int console;
-- 
1.7.0.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]