diff options
| -rw-r--r-- | Makefile | 36 | ||||
| -rw-r--r-- | Makefile.inc | 1 | ||||
| -rw-r--r-- | anaconda.spec.in | 21 | ||||
| -rw-r--r-- | loader/Makefile | 17 | ||||
| -rw-r--r-- | stubs/Makefile | 4 |
5 files changed, 35 insertions, 44 deletions
@@ -52,7 +52,7 @@ clean: subdirs: for d in $(ALLSUBDIRS); do make TOPDIR=../$(TOPDIR) -C $$d; done -install-reconfig: all +install: all @if [ "$(RECFGDESTDIR)" = "" ]; then \ echo " "; \ echo "ERROR: A destdir is required"; \ @@ -62,6 +62,9 @@ install-reconfig: all mkdir -p $(RECFGDESTDIR)/usr/sbin mkdir -p $(RECFGDESTDIR)/etc/rc.d/init.d mkdir -p $(RECFGDESTDIR)/$(PYTHONLIBDIR) + mkdir -p $(RECFGDESTDIR)/$(RUNTIMEDIR) + + install -m 755 upd-instroot $(RECFGDESTDIR)/$(RUNTIMEDIR) cp -a reconfig.init $(RECFGDESTDIR)/etc/rc.d/init.d/reconfig cp -a anaconda $(RECFGDESTDIR)/usr/sbin/anaconda @@ -72,37 +75,6 @@ install-reconfig: all cp -a kudzu/kudzumodule.so $(RECFGDESTDIR)/$(PYTHONLIBDIR) for d in $(SUBDIRSRECFG); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(RECFGDESTDIR); pwd` -C $$d install; done -install-hd: all - @if [ "$(DESTDIR)" = "" ]; then \ - echo " "; \ - echo "ERROR: A destdir is required"; \ - exit 1; \ - fi - mkdir -p $(DESTDIR)/usr/bin - mkdir -p $(DESTDIR)/$(PYTHONLIBDIR) - - install anaconda $(DESTDIR)/usr/bin - install *.py $(DESTDIR)/$(PYTHONLIBDIR) - install *.so $(DESTDIR)/$(PYTHONLIBDIR) - for d in $(SUBDIRSHD); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; done - -install: all - @if [ "$(DESTDIR)" = "" ]; then \ - echo " "; \ - echo "ERROR: A destdir is required"; \ - exit 1; \ - fi - mkdir -p $(DESTDIR)/usr/bin - mkdir -p $(DESTDIR)/$(PYTHONLIBDIR) - install anaconda $(DESTDIR)/usr/bin - install raidstart-stub $(DESTDIR)/$(PYTHONLIBDIR) - install raidstop-stub $(DESTDIR)/$(PYTHONLIBDIR) - install $(PYFILES) $(DESTDIR)/$(PYTHONLIBDIR) - install lang-table $(DESTDIR)/$(PYTHONLIBDIR) - ./py-compile --basedir $(DESTDIR)/$(PYTHONLIBDIR) $(PYFILES) - install *.so $(DESTDIR)/$(PYTHONLIBDIR) - for d in $(SUBDIRS); do make TOPDIR=../$(TOPDIR) DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; done - archive: create-archive create-archive: diff --git a/Makefile.inc b/Makefile.inc index 042cd77da..85d399862 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,4 +3,5 @@ # PYTHONLIBDIR = /usr/lib/anaconda +RUNTIMEDIR = /usr/lib/anaconda-runtime ANACONDADATADIR = /usr/share/anaconda diff --git a/anaconda.spec.in b/anaconda.spec.in index a040dcc61..91a71264c 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -12,7 +12,19 @@ Requires: rpm-python BuildRoot: /var/tmp/anaconda-%{PACKAGE_VERSION} %description -The anaconda package contains the Red Hat Linux installer. +The anaconda package contains portions of the Red Hat Linux installer which +may be run be the user for reconfiguration and advanced installation +options. + +%package runtime +Summary: Portions of the Red Hat Linux installer only needed for fresh installations. +Group: Applications/System + +%description +The anaconda-runtime package contains parts of the Red Hat Linux install +which are needed for installing new systems. It is used to build Red Hat +Linux media sets, but the files it contains are not meant for us on +already installed systems. %prep @@ -23,7 +35,7 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -make RECFGDESTDIR=$RPM_BUILD_ROOT install-reconfig +make RECFGDESTDIR=$RPM_BUILD_ROOT install #strip $RPM_BUILD_ROOT/usr/sbin/ddcprobe strip $RPM_BUILD_ROOT/usr/lib/anaconda/*.so @@ -43,13 +55,16 @@ fi %defattr(-,root,root) %doc COPYING /usr/sbin/anaconda -#/usr/sbin/ddcprobe +/usr/sbin/ddcprobe /usr/share/anaconda/* /usr/share/locale/*/*/* /usr/lib/anaconda/* %config /etc/rc.d/init.d/reconfig +%files runtime +/usr/lib/anaconda-runtime + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog diff --git a/loader/Makefile b/loader/Makefile index 3ac9dca73..d742686c4 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.inc + VERSION = 6.2 DESTDIR = ../../trees/initrd @@ -105,14 +107,13 @@ dirs: done install: all -# mkdir -p $(DESTDIR)/sbin -# mkdir -p $(DESTDIR)/etc -# rm -f $(DESTDIR)/sbin/loader -# rm -f $(DESTDIR)/sbin/init -# install -s loader $(DESTDIR)/sbin/loader -# install -s init $(DESTDIR)/sbin/init -# install -m 755 ../kudzu/pcitable $(DESTDIR)/etc -# install -m 644 loader.tr $(DESTDIR)/etc + mkdir -p $(DESTDIR)/$(RUNTIMEDIR)/loader + for n in $(BINS); do \ + install -s -m 755 $$n $(DESTDIR)/$(RUNTIMEDIR)/loader; \ + done + install -m 644 loader.tr $(DESTDIR)/$(RUNTIMEDIR)/loader + install -m 644 module-info $(DESTDIR)/$(RUNTIMEDIR)/loader + install -m 644 ../kudzu/pcitable $(DESTDIR)/$(RUNTIMEDIR)/loader loader: loader.o $(OBJS) $(NETOBJS) $(CC) -g $(STATIC) -o $@ $^ -lpopt \ diff --git a/stubs/Makefile b/stubs/Makefile index dda010909..99ecbdca4 100644 --- a/stubs/Makefile +++ b/stubs/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.inc + all: libbz2.so.0 libbz2.so.0: bzip.c @@ -7,4 +9,4 @@ clean: rm -f *.so.* *.o install: - install libbz2.so.0 $(DESTDIR)/usr/lib + install libbz2.so.0 $(DESTDIR)/$(RUNTIMEDIR) |