summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rwxr-xr-xscripts/upd-instroot5
2 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 2fbda8933..2ca96ff68 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ MINISLANG=minislang
STUBS=stubs
endif
-SUBDIRSHD = balkan isys collage $(MINISLANG) loader po text-help \
+SUBDIRSHD = balkan isys collage $(MINISLANG) loader po \
textw utils scripts bootdisk installclasses \
- keymaps fonts iw help pixmaps $(STUBS) iconvmodule
+ keymaps fonts iw pixmaps $(STUBS) iconvmodule
SUBDIRS = $(SUBDIRSHD)
ifeq (i386, $(ARCH))
@@ -100,6 +100,8 @@ create-snapshot:
@cd /tmp/anaconda ; rm -f isys/modutils/modutils.spec
@cd /tmp/anaconda ; rm -f pycheckrc-for-anaconda
@cd /tmp/anaconda ; rm -rf comps
+ @cd /tmp/anaconda ; rm -rf help
+ @cd /tmp/anaconda ; rm -rf text-help
@cd /tmp/anaconda ; sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(SNAPRELEASE)/g" < anaconda.spec.in > anaconda.spec
@mv /tmp/anaconda /tmp/anaconda-$(VERSION)
@cd /tmp ; tar --bzip2 -cSpf anaconda-$(VERSION).tar.bz2 anaconda-$(VERSION)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index f949fd71d..2d885f31b 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -95,7 +95,7 @@ PACKAGES="glibc glibc-common setup openssl python python2 newt libtermcap zlib
ash kon2 e2fsprogs util-linux raidtools popt mount procps rpm
XFree86 Xconfigurator anaconda anaconda-runtime kudzu-devel
kudzu db3 rpm-python2.2 bzip2 bzip2-libs dosfstools pciutils
- reiserfs-utils parted busybox-anaconda rpm-python"
+ reiserfs-utils parted busybox-anaconda rpm-python anaconda-help"
if [ $ARCH = i386 ]; then
PACKAGES="$PACKAGES kernel-pcmcia-cs lilo"
@@ -121,7 +121,8 @@ PACKAGESGR="anaconda XFree86-libs imlib libpng libpng10 libtiff libjpeg
XFree86 Xconfigurator gnome-python2 pygtk2 gdk-pixbuf
XFree86-KOI8-R XFree86-KOI8-R-75dpi-fonts pciutils pam
reiserfs-utils atk pango freetype gnome-python2-canvas
- libgnomecanvas libart_lgpl libzvt gnome-python2-zvt"
+ libgnomecanvas libart_lgpl libzvt gnome-python2-zvt
+ anaconda-images"
if [ -z "$NEEDGR" ]; then
PACKAGESGR="bash"