From: ms Date: Sat, 12 Jan 2008 12:56:56 +0000 (+0000) Subject: Made some version updates and so on... X-Git-Tag: v3.0-alpha1~1128 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090bba53def8d65ac01bf34141f140b94ca5755d;p=ipfire-3.x.git Made some version updates and so on... git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1141 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/lfs/bash b/lfs/bash index e64b61ee8..cabfb79aa 100644 --- a/lfs/bash +++ b/lfs/bash @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-fixes-6.patch $(PKG_NAME)-doc-$(VER).tar.gz +objects = $(DL_FILE) $(THISAPP)-fixes-7.patch $(PKG_NAME)-doc-$(VER).tar.gz install : $(TARGET) @@ -55,7 +55,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) ifeq "$(STAGE)" "toolchain" - cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-6.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch cd $(DIR_APP) && ./configure --prefix=$(TOOLS_DIR) --without-bash-malloc cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install @@ -73,7 +73,7 @@ ifeq "$(STAGE)" "base" cd $(DIR_APP) && tar -xvf $(DIR_DL)/$(PKG_NAME)-doc-$(VER).tar.gz cd $(DIR_APP) && sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/$(THISAPP)|" \ Makefile.in - cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-6.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-7.patch cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/bin \ --without-bash-malloc --with-installed-readline cd $(DIR_APP) && make -j $(PARALLELISM) diff --git a/lfs/collectd b/lfs/collectd index a2ff61bce..070416fd3 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -53,7 +53,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --localstatedir=/var \ + cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ --disable-{apache,apple_sensors,csv,ipvs,memcached,mysql,netlink,nginx,nut} \ --disable-{perl,serial,snmp,tape,vserver,wireless,xmms} \ --enable-{apcups,battery,cpu{,freq},df,disk,dns,email,entropy,exec,hddtemp} \ diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs index a4dab6457..1bb0c8233 100644 --- a/lfs/e2fsprogs +++ b/lfs/e2fsprogs @@ -25,7 +25,7 @@ include Config PKG_NAME = e2fsprogs -VER = 1.40.2 +VER = 1.40.4 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/gettext b/lfs/gettext index d9359a28a..a9f14259c 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -25,7 +25,7 @@ include Config PKG_NAME = gettext -VER = 0.16.1 +VER = 0.17 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/less b/lfs/less index 42e1fa277..68f889182 100644 --- a/lfs/less +++ b/lfs/less @@ -25,7 +25,7 @@ include Config PKG_NAME = less -VER = 409 +VER = 418 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/man-db b/lfs/man-db index ee4c89d64..75bb08318 100644 --- a/lfs/man-db +++ b/lfs/man-db @@ -25,7 +25,7 @@ include Config PKG_NAME = man-db -VER = 2.4.4 +VER = 2.5.0 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-fixes-1.patch +objects = $(DL_FILE) install : $(TARGET) @@ -53,17 +53,11 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && mv man/de{_DE.88591,} - cd $(DIR_APP) && mv man/es{_ES.88591,} - cd $(DIR_APP) && mv man/it{_IT.88591,} - cd $(DIR_APP) && mv man/ja{_JP.eucJP,} - cd $(DIR_APP) && sed -i 's,\*_\*,??,' man/Makefile.in cd $(DIR_APP) && sed -i -e '\%\t/usr/man%d' -e '\%\t/usr/local/man%d' src/man_db.conf.in cd $(DIR_APP) && echo -e "#define WEB_BROWSER \"exec /usr/bin/lynx\"" >> include/manconfig.h.in cd $(DIR_APP) && echo -e "#define COL \"/usr/bin/col\"" >> include/manconfig.h.in cd $(DIR_APP) && echo -e "#define VGRIND \"/usr/bin/vgrind\"" >> include/manconfig.h.in cd $(DIR_APP) && echo -e "#define GRAP \"/usr/bin/grap\"" >> include/manconfig.h.in - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-1.patch cd $(DIR_APP) && ./configure --prefix=/usr --enable-mb-groff --disable-setuid cd $(DIR_APP) && make #-j $(PARALLELISM) cd $(DIR_APP) && make install diff --git a/lfs/man-pages b/lfs/man-pages index f9abb94c4..6fc1ad640 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -25,7 +25,7 @@ include Config PKG_NAME = man-pages -VER = 2.67 +VER = 2.74 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 diff --git a/lfs/parted b/lfs/parted index 016832e8e..0537bc050 100644 --- a/lfs/parted +++ b/lfs/parted @@ -33,11 +33,13 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) +PYPARTED = py$(PKG_NAME)-1.8.9 + ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) $(PYPARTED).tar.bz2 install: $(TARGET) @@ -52,10 +54,18 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) $(PYPARTED) + @cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --without-readline --disable-nls \ --disable-Werror --disable-dependency-tracking --disable-debug --with-gnu-ld cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) + + ### pyparted + # + cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(PYPARTED).tar.bz2 + cd $(DIR_SRC)/$(PYPARTED) && make all install \ + libdir=/usr/lib/python2.5/site-packages + + @rm -rf $(DIR_APP) $(PYPARTED) @$(POSTBUILD) diff --git a/lfs/psmisc b/lfs/psmisc index 29af039e5..7a8b188d3 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -25,7 +25,7 @@ include Config PKG_NAME = psmisc -VER = 22.5 +VER = 22.6 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/python b/lfs/python index 2c69da6a6..29a39090d 100644 --- a/lfs/python +++ b/lfs/python @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) -MODULES = "$(ICONV)" +MODULES = $(ICONV) ############################################################################### # Top-level Rules diff --git a/lfs/readline b/lfs/readline index c392ffb63..9b898e6e1 100644 --- a/lfs/readline +++ b/lfs/readline @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-fixes-4.patch +objects = $(DL_FILE) $(THISAPP)-fixes-5.patch install : $(TARGET) @@ -55,7 +55,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-4.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-fixes-5.patch cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib diff --git a/lfs/texinfo b/lfs/texinfo index d069e503a..c8b7b8be6 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -25,7 +25,7 @@ include Config PKG_NAME = texinfo -VER = 4.9 +VER = 4.11 THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-multibyte-1.patch $(THISAPP)-tempfile_fix-1.patch +objects = $(DL_FILE) install : $(TARGET) @@ -61,8 +61,6 @@ ifeq "$(STAGE)" "toolchain" endif ifeq "$(STAGE)" "base" - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-multibyte-1.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-tempfile_fix-1.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make -j $(PARALLELISM) cd $(DIR_APP) && make install diff --git a/lfs/vim b/lfs/vim index 5730a7917..9d0e6bf2e 100644 --- a/lfs/vim +++ b/lfs/vim @@ -37,7 +37,7 @@ TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-fixes-3.patch $(THISAPP)-mandir-1.patch +objects = $(DL_FILE) $(THISAPP)-fixes-5.patch $(THISAPP)-mandir-1.patch install : $(TARGET) @@ -53,7 +53,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-3.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-fixes-5.patch cd $(DIR_APP) && patch -Np1 < $(DIR_PATCHES)/$(THISAPP)-mandir-1.patch cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte diff --git a/src/rootfiles/core/parted b/src/rootfiles/core/parted index 12185abdf..42a90fa62 100644 --- a/src/rootfiles/core/parted +++ b/src/rootfiles/core/parted @@ -18,6 +18,7 @@ usr/lib/libparted-1.8.so.8.0.0 #usr/lib/libparted.la usr/lib/libparted.so #usr/lib/pkgconfig/libparted.pc +usr/lib/python2.5/site-packages/partedmodule.so usr/sbin/parted usr/sbin/partprobe #usr/share/info/parted.info