Reordered pomona's directory.

diff --git a/lfs/pomona b/lfs/pomona
index aa3ef7a4de604f7fcbcd4361de9f081b0b313c3a..029e6f600e4a848b3323fefa14aa2fe7d5348235 100644 (file)
--- a/lfs/pomona
+++ b/lfs/pomona
@@ -50,8 +50,7 @@ $(TARGET) :
        #cd $(DIR_APP) && make -C po update-po
        cd $(DIR_APP) && make lang-names
        cd $(DIR_APP) && make install \
-               DESTDIR=$(INSTALLER_DIR) NAME=$(NAME) \
-               SNAME=$(SNAME) VERSION=$(VERSION) KVER=$(KVER)
+               NAME=$(NAME) SNAME=$(SNAME) VERSION=$(VERSION) KVER=$(KVER)
        cd $(DIR_APP) && make clean
 
        find $(INSTALLER_DIR)/usr/lib/pomona/ -name *.py | xargs /usr/bin/py-compile

diff --git a/src/pomona/Makefile b/src/pomona/Makefile
index 689cee327384cda34584c099ee4b182837828888..4c30f0605dc5c1ad5524d5b66aeeb0926401d5a5 100644 (file)
--- a/src/pomona/Makefile
+++ b/src/pomona/Makefile
@@ -20,9 +20,9 @@
 
 include Makefile.inc
 
-SUBDIRS = src po
+SUBDIRS = isys po
 
-all: subdirs
+all: lang-names subdirs
 
 lang-names: lang-table
        PYTHONPATH="./src/:." LANG=en_US.UTF-8 \
@@ -30,19 +30,25 @@ lang-names: lang-table
        mv lang-names.tmp lang-names
 
 install: all
-       @if [ "$(DESTDIR)" = "" ]; then \
-               echo " "; \
-               echo "ERROR: A destdir is required"; \
-               exit 1; \
-       fi
        for d in $(SUBDIRS); do \
                make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; \
                [ $$? = 0 ] || exit 1; \
        done
+       -mkdir -p $(PYTHONLIBDIR)
+       cp -f *.py lang-{table,names} $(PYTHONLIBDIR)
+       chmod 755 $(PYTHONLIBDIR)/installer.py
+       sed -e "s/VERSION/$(VERSION)/g" \
+               -e "s/SNAME/$(SNAME)/g" \
+               -e "s/PNAME/$(PNAME)/g" \
+               -e "s/NAME/$(NAME)/g" \
+               -e "s/KVER/$(KVER)/g" \
+               -i $(PYTHONLIBDIR)/constants.py
+       -mkdir -p $(DESTDIR)/sbin
+       install -m 755 $(PSNAME) $(DESTDIR)/sbin/$(PSNAME)
 
 clean:
+       rm -vf *.o *.so *.pyc *.pyo lang-names{,.tmp}
        for d in $(SUBDIRS); do make -C $$d clean; done
-       rm -rf lang-names{,.tmp}
 
 subdirs:
        for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1; done

diff --git a/src/pomona/Makefile.inc b/src/pomona/Makefile.inc
index 0a92ccb7b368727b27d5cf72fdf5ea3bd42af42d..86830fef2f15f033cf1ea069e49b016ca197d140 100644 (file)
--- a/src/pomona/Makefile.inc
+++ b/src/pomona/Makefile.inc
@@ -23,6 +23,8 @@
 PNAME = Pomona
 PSNAME = pomona
 
+DESTDIR=$(INSTALLER_DIR)
+
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644

diff --git a/src/pomona/src/autopart.py b/src/pomona/autopart.py
similarity index 100%
rename from src/pomona/src/autopart.py
rename to src/pomona/autopart.py

diff --git a/src/pomona/src/backend.py b/src/pomona/backend.py
similarity index 100%
rename from src/pomona/src/backend.py
rename to src/pomona/backend.py

diff --git a/src/pomona/src/bootloader.py b/src/pomona/bootloader.py
similarity index 100%
rename from src/pomona/src/bootloader.py
rename to src/pomona/bootloader.py

diff --git a/src/pomona/src/constants.py b/src/pomona/constants.py
similarity index 100%
rename from src/pomona/src/constants.py
rename to src/pomona/constants.py

diff --git a/src/pomona/src/dispatch.py b/src/pomona/dispatch.py
similarity index 100%
rename from src/pomona/src/dispatch.py
rename to src/pomona/dispatch.py

diff --git a/src/pomona/src/exception.py b/src/pomona/exception.py
similarity index 100%
rename from src/pomona/src/exception.py
rename to src/pomona/exception.py

diff --git a/src/pomona/src/flags.py b/src/pomona/flags.py
similarity index 100%
rename from src/pomona/src/flags.py
rename to src/pomona/flags.py

diff --git a/src/pomona/src/fsset.py b/src/pomona/fsset.py
similarity index 100%
rename from src/pomona/src/fsset.py
rename to src/pomona/fsset.py

diff --git a/src/pomona/src/image.py b/src/pomona/image.py
similarity index 100%
rename from src/pomona/src/image.py
rename to src/pomona/image.py

diff --git a/src/pomona/src/installclass.py b/src/pomona/installclass.py
similarity index 100%
rename from src/pomona/src/installclass.py
rename to src/pomona/installclass.py

diff --git a/src/pomona/src/installer.py b/src/pomona/installer.py
similarity index 100%
rename from src/pomona/src/installer.py
rename to src/pomona/installer.py

diff --git a/src/pomona/src/installmethod.py b/src/pomona/installmethod.py
similarity index 100%
rename from src/pomona/src/installmethod.py
rename to src/pomona/installmethod.py

diff --git a/src/pomona/src/instdata.py b/src/pomona/instdata.py
similarity index 100%
rename from src/pomona/src/instdata.py
rename to src/pomona/instdata.py

diff --git a/src/pomona/src/inutil.py b/src/pomona/inutil.py
similarity index 100%
rename from src/pomona/src/inutil.py
rename to src/pomona/inutil.py

diff --git a/src/pomona/src/Makefile b/src/pomona/isys/Makefile
similarity index 64%
rename from src/pomona/src/Makefile
rename to src/pomona/isys/Makefile
index c3faed50972cb485ebc32d2dd4fd7196dedb4c2d..ba0fc5bc1b28961f21183dc0ed4307ae7a2ba5b5 100644 (file)
--- a/src/pomona/src/Makefile
+++ b/src/pomona/isys/Makefile
@@ -20,30 +20,41 @@
 
 include ../Makefile.inc
 
-SUBDIRS = isys
+CFLAGS +=  -I$(PYTHONINCLUDE) -I/usr/include -I.. -I.
 
-all: subdirs
+OBJECTS = devices.o imount.o smp.o linkdetect.o \
+       lang.o isofs.o vio.o eddsupport.o str.o \
+       wireless.o ethtool.o
 
-install: all
-       -mkdir -p $(PYTHONLIBDIR)
-       cp -f *.py ../lang-{table,names} $(PYTHONLIBDIR)
-       chmod 755 $(PYTHONLIBDIR)/installer.py
-       for d in $(SUBDIRS); do make -C $$d install; [ $$? = 0 ] || exit 1; done
-       
-       sed -e "s/VERSION/$(VERSION)/g" \
-                       -e "s/SNAME/$(SNAME)/g" \
-                       -e "s/PNAME/$(PNAME)/g" \
-                       -e "s/NAME/$(NAME)/g" \
-                       -e "s/KVER/$(KVER)/g" \
-                       -i $(PYTHONLIBDIR)/constants.py
-
-       -mkdir -p $(DESTDIR)/sbin
-       #ln -svf ../usr/lib/$(PSNAME)/installer.py $(DESTDIR)/sbin/$(PSNAME)
-       install -m 755 $(PSNAME) $(DESTDIR)/sbin/$(PSNAME)
+SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS))
+SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c
+LOADLIBES = -lpci -lpopt -lext2fs -lz -lpci -lblkid
+PYMODULES = _isys.so
+
+all: depend $(PYMODULES) libisys.a
+
+%.lo: %.c
+       $(CC) -c $(CFLAGS) -fPIC -o $@ $<
+
+_isys.so: isys.lo $(SOBJECTS)
+       $(CC) -shared -g -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) $(LDFLAGS)
+
+libisys.a: libisys.a($(OBJECTS))
+
+filtertest: filtertest.o libisys.a
 
 clean:
-       rm -f *.o *.so *.pyc *.pyo
-       for d in $(SUBDIRS); do make -C $$d clean; [ $$? = 0 ] || exit 1; done
+       rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS)
+       rm -f $(OBJECTS)
+       rm -f depend
+
+install: all
+       install -s $(PYMODULES) $(PYTHONLIBDIR)
+       install -m 644 isys.py $(PYTHONLIBDIR)
+
+depend:
+       $(CPP) -M $(CFLAGS) $(SOURCES) > depend
 
-subdirs:
-       for d in $(SUBDIRS); do make -C $$d everything; [ $$? = 0 ] || exit 1; done
+ifeq (depend,$(wildcard depend))
+include depend
+endif

diff --git a/src/pomona/src/isys/devices.c b/src/pomona/isys/devices.c
similarity index 100%
rename from src/pomona/src/isys/devices.c
rename to src/pomona/isys/devices.c

diff --git a/src/pomona/src/isys/devices.h b/src/pomona/isys/devices.h
similarity index 100%
rename from src/pomona/src/isys/devices.h
rename to src/pomona/isys/devices.h

diff --git a/src/pomona/src/isys/eddsupport.c b/src/pomona/isys/eddsupport.c
similarity index 100%
rename from src/pomona/src/isys/eddsupport.c
rename to src/pomona/isys/eddsupport.c

diff --git a/src/pomona/src/isys/eddsupport.h b/src/pomona/isys/eddsupport.h
similarity index 100%
rename from src/pomona/src/isys/eddsupport.h
rename to src/pomona/isys/eddsupport.h

diff --git a/src/pomona/src/isys/ethtool.c b/src/pomona/isys/ethtool.c
similarity index 100%
rename from src/pomona/src/isys/ethtool.c
rename to src/pomona/isys/ethtool.c

diff --git a/src/pomona/src/isys/imount.c b/src/pomona/isys/imount.c
similarity index 100%
rename from src/pomona/src/isys/imount.c
rename to src/pomona/isys/imount.c

diff --git a/src/pomona/src/isys/imount.h b/src/pomona/isys/imount.h
similarity index 100%
rename from src/pomona/src/isys/imount.h
rename to src/pomona/isys/imount.h

diff --git a/src/pomona/src/isys/isofs.c b/src/pomona/isys/isofs.c
similarity index 100%
rename from src/pomona/src/isys/isofs.c
rename to src/pomona/isys/isofs.c

diff --git a/src/pomona/src/isys/isys.c b/src/pomona/isys/isys.c
similarity index 100%
rename from src/pomona/src/isys/isys.c
rename to src/pomona/isys/isys.c

diff --git a/src/pomona/src/isys/isys.h b/src/pomona/isys/isys.h
similarity index 100%
rename from src/pomona/src/isys/isys.h
rename to src/pomona/isys/isys.h

diff --git a/src/pomona/src/isys/isys.py b/src/pomona/isys/isys.py
similarity index 100%
rename from src/pomona/src/isys/isys.py
rename to src/pomona/isys/isys.py

diff --git a/src/pomona/src/isys/lang.c b/src/pomona/isys/lang.c
similarity index 100%
rename from src/pomona/src/isys/lang.c
rename to src/pomona/isys/lang.c

diff --git a/src/pomona/src/isys/lang.h b/src/pomona/isys/lang.h
similarity index 100%
rename from src/pomona/src/isys/lang.h
rename to src/pomona/isys/lang.h

diff --git a/src/pomona/src/isys/linkdetect.c b/src/pomona/isys/linkdetect.c
similarity index 100%
rename from src/pomona/src/isys/linkdetect.c
rename to src/pomona/isys/linkdetect.c

diff --git a/src/pomona/src/isys/net.h b/src/pomona/isys/net.h
similarity index 100%
rename from src/pomona/src/isys/net.h
rename to src/pomona/isys/net.h

diff --git a/src/pomona/src/isys/smp.c b/src/pomona/isys/smp.c
similarity index 100%
rename from src/pomona/src/isys/smp.c
rename to src/pomona/isys/smp.c

diff --git a/src/pomona/src/isys/smp.h b/src/pomona/isys/smp.h
similarity index 100%
rename from src/pomona/src/isys/smp.h
rename to src/pomona/isys/smp.h

diff --git a/src/pomona/src/isys/str.c b/src/pomona/isys/str.c
similarity index 100%
rename from src/pomona/src/isys/str.c
rename to src/pomona/isys/str.c

diff --git a/src/pomona/src/isys/str.h b/src/pomona/isys/str.h
similarity index 100%
rename from src/pomona/src/isys/str.h
rename to src/pomona/isys/str.h

diff --git a/src/pomona/src/isys/stubs.h b/src/pomona/isys/stubs.h
similarity index 100%
rename from src/pomona/src/isys/stubs.h
rename to src/pomona/isys/stubs.h

diff --git a/src/pomona/src/isys/vio.c b/src/pomona/isys/vio.c
similarity index 100%
rename from src/pomona/src/isys/vio.c
rename to src/pomona/isys/vio.c

diff --git a/src/pomona/src/isys/wireless.c b/src/pomona/isys/wireless.c
similarity index 100%
rename from src/pomona/src/isys/wireless.c
rename to src/pomona/isys/wireless.c

diff --git a/src/pomona/src/isys/wireless.h b/src/pomona/isys/wireless.h
similarity index 100%
rename from src/pomona/src/isys/wireless.h
rename to src/pomona/isys/wireless.h

diff --git a/src/pomona/src/keyboard.py b/src/pomona/keyboard.py
similarity index 100%
rename from src/pomona/src/keyboard.py
rename to src/pomona/keyboard.py

diff --git a/src/pomona/src/keyboard_models.py b/src/pomona/keyboard_models.py
similarity index 100%
rename from src/pomona/src/keyboard_models.py
rename to src/pomona/keyboard_models.py

diff --git a/src/pomona/src/language.py b/src/pomona/language.py
similarity index 100%
rename from src/pomona/src/language.py
rename to src/pomona/language.py

diff --git a/src/pomona/src/minihal.py b/src/pomona/minihal.py
similarity index 100%
rename from src/pomona/src/minihal.py
rename to src/pomona/minihal.py

diff --git a/src/pomona/src/packages.py b/src/pomona/packages.py
similarity index 100%
rename from src/pomona/src/packages.py
rename to src/pomona/packages.py

diff --git a/src/pomona/src/pakfireinstall.py b/src/pomona/pakfireinstall.py
similarity index 100%
rename from src/pomona/src/pakfireinstall.py
rename to src/pomona/pakfireinstall.py

diff --git a/src/pomona/src/partErrors.py b/src/pomona/partErrors.py
similarity index 100%
rename from src/pomona/src/partErrors.py
rename to src/pomona/partErrors.py

diff --git a/src/pomona/src/partIntfHelpers.py b/src/pomona/partIntfHelpers.py
similarity index 100%
rename from src/pomona/src/partIntfHelpers.py
rename to src/pomona/partIntfHelpers.py

diff --git a/src/pomona/src/partRequests.py b/src/pomona/partRequests.py
similarity index 100%
rename from src/pomona/src/partRequests.py
rename to src/pomona/partRequests.py

diff --git a/src/pomona/src/partedUtils.py b/src/pomona/partedUtils.py
similarity index 100%
rename from src/pomona/src/partedUtils.py
rename to src/pomona/partedUtils.py

diff --git a/src/pomona/src/partitioning.py b/src/pomona/partitioning.py
similarity index 100%
rename from src/pomona/src/partitioning.py
rename to src/pomona/partitioning.py

diff --git a/src/pomona/src/partitions.py b/src/pomona/partitions.py
similarity index 100%
rename from src/pomona/src/partitions.py
rename to src/pomona/partitions.py

diff --git a/src/pomona/src/pomona b/src/pomona/pomona
similarity index 100%
rename from src/pomona/src/pomona
rename to src/pomona/pomona

diff --git a/src/pomona/src/pomona_log.py b/src/pomona/pomona_log.py
similarity index 100%
rename from src/pomona/src/pomona_log.py
rename to src/pomona/pomona_log.py

diff --git a/src/pomona/src/isys/Makefile b/src/pomona/src/isys/Makefile
deleted file mode 100644 (file)
index da70afe..0000000
--- a/src/pomona/src/isys/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-include ../../Makefile.inc
-
-CFLAGS +=  -I$(PYTHONINCLUDE) -I$(DESTDIR)/usr/include -I.. -I.
-
-OBJECTS = devices.o imount.o smp.o linkdetect.o \
-       lang.o isofs.o vio.o eddsupport.o str.o \
-       wireless.o ethtool.o
-
-SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS))
-SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c
-LOADLIBES = -lpci -lpopt -lext2fs -lz -lpci -lblkid
-PYMODULES = _isys.so
-
-ifeq (.depend,$(wildcard .depend))
-TARGET=all
-else
-TARGET=depend all
-endif
-
-everything: $(TARGET)
-
-all: $(PYMODULES) libisys.a
-
-%.lo: %.c
-       $(CC) -c $(CFLAGS) -fPIC -o $@ $<
-
-_isys.so: isys.lo $(SOBJECTS)
-       $(CC) -shared -g -fPIC -o $@ isys.lo $(SOBJECTS) $(LOADLIBES) $(LDFLAGS)
-
-libisys.a: libisys.a($(OBJECTS))
-
-filtertest: filtertest.o libisys.a
-
-clean:
-       rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS)
-       rm -f $(OBJECTS)
-       rm -f .depend
-
-install: all
-       install -s $(PYMODULES) $(PYTHONLIBDIR)
-       install -m 644 isys.py $(PYTHONLIBDIR)
-
-depend:
-       $(CPP) -M $(CFLAGS) $(SOURCES) > .depend
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif

diff --git a/src/pomona/src/timezone.py b/src/pomona/timezone.py
similarity index 100%
rename from src/pomona/src/timezone.py
rename to src/pomona/timezone.py

diff --git a/src/pomona/src/tui.py b/src/pomona/tui.py
similarity index 100%
rename from src/pomona/src/tui.py
rename to src/pomona/tui.py

diff --git a/src/pomona/src/tui_bootloader.py b/src/pomona/tui_bootloader.py
similarity index 100%
rename from src/pomona/src/tui_bootloader.py
rename to src/pomona/tui_bootloader.py

diff --git a/src/pomona/src/tui_complete.py b/src/pomona/tui_complete.py
similarity index 100%
rename from src/pomona/src/tui_complete.py
rename to src/pomona/tui_complete.py

diff --git a/src/pomona/src/tui_confirm.py b/src/pomona/tui_confirm.py
similarity index 100%
rename from src/pomona/src/tui_confirm.py
rename to src/pomona/tui_confirm.py

diff --git a/src/pomona/src/tui_keyboard.py b/src/pomona/tui_keyboard.py
similarity index 100%
rename from src/pomona/src/tui_keyboard.py
rename to src/pomona/tui_keyboard.py

diff --git a/src/pomona/src/tui_language.py b/src/pomona/tui_language.py
similarity index 100%
rename from src/pomona/src/tui_language.py
rename to src/pomona/tui_language.py

diff --git a/src/pomona/src/tui_partition.py b/src/pomona/tui_partition.py
similarity index 100%
rename from src/pomona/src/tui_partition.py
rename to src/pomona/tui_partition.py

diff --git a/src/pomona/src/tui_partmethod.py b/src/pomona/tui_partmethod.py
similarity index 100%
rename from src/pomona/src/tui_partmethod.py
rename to src/pomona/tui_partmethod.py

diff --git a/src/pomona/src/tui_progress.py b/src/pomona/tui_progress.py
similarity index 100%
rename from src/pomona/src/tui_progress.py
rename to src/pomona/tui_progress.py

diff --git a/src/pomona/src/tui_timezone.py b/src/pomona/tui_timezone.py
similarity index 100%
rename from src/pomona/src/tui_timezone.py
rename to src/pomona/tui_timezone.py

diff --git a/src/pomona/src/tui_userauth.py b/src/pomona/tui_userauth.py
similarity index 100%
rename from src/pomona/src/tui_userauth.py
rename to src/pomona/tui_userauth.py

diff --git a/src/pomona/src/tui_welcome.py b/src/pomona/tui_welcome.py
similarity index 100%
rename from src/pomona/src/tui_welcome.py
rename to src/pomona/tui_welcome.py

diff --git a/src/pomona/src/users.py b/src/pomona/users.py
similarity index 100%
rename from src/pomona/src/users.py
rename to src/pomona/users.py

diff --git a/src/pomona/src/zonetab.py b/src/pomona/zonetab.py
similarity index 100%
rename from src/pomona/src/zonetab.py
rename to src/pomona/zonetab.py