Merge remote-tracking branch 'origin/next'

This commit is contained in:
Arne Fitzenreiter
2014-09-30 19:30:45 +02:00
2 changed files with 15 additions and 8 deletions

View File

@@ -10,11 +10,16 @@
#usr/include/parted/parted.h #usr/include/parted/parted.h
#usr/include/parted/timer.h #usr/include/parted/timer.h
#usr/include/parted/unit.h #usr/include/parted/unit.h
#usr/lib/libparted-fs-resize.a
#usr/lib/libparted-fs-resize.la
#usr/lib/libparted-fs-resize.so
usr/lib/libparted-fs-resize.so.0
usr/lib/libparted-fs-resize.so.0.0.0
#usr/lib/libparted.a #usr/lib/libparted.a
#usr/lib/libparted.la #usr/lib/libparted.la
#usr/lib/libparted.so #usr/lib/libparted.so
usr/lib/libparted.so.0 usr/lib/libparted.so.2
usr/lib/libparted.so.0.0.1 usr/lib/libparted.so.2.0.0
#usr/lib/pkgconfig/libparted.pc #usr/lib/pkgconfig/libparted.pc
usr/sbin/parted usr/sbin/parted
usr/sbin/partprobe usr/sbin/partprobe
@@ -38,6 +43,8 @@ usr/sbin/partprobe
#usr/share/locale/ru/LC_MESSAGES/parted.mo #usr/share/locale/ru/LC_MESSAGES/parted.mo
#usr/share/locale/rw/LC_MESSAGES/parted.mo #usr/share/locale/rw/LC_MESSAGES/parted.mo
#usr/share/locale/sk/LC_MESSAGES/parted.mo #usr/share/locale/sk/LC_MESSAGES/parted.mo
#usr/share/locale/sl/LC_MESSAGES/parted.mo
#usr/share/locale/sr/LC_MESSAGES/parted.mo
#usr/share/locale/sv/LC_MESSAGES/parted.mo #usr/share/locale/sv/LC_MESSAGES/parted.mo
#usr/share/locale/tr/LC_MESSAGES/parted.mo #usr/share/locale/tr/LC_MESSAGES/parted.mo
#usr/share/locale/uk/LC_MESSAGES/parted.mo #usr/share/locale/uk/LC_MESSAGES/parted.mo

View File

@@ -1,7 +1,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -24,16 +24,16 @@
include Config include Config
VER = 2.3 VER = 3.1
THISAPP = parted-$(VER) THISAPP = parted-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE) DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = parted PROG = parted
PAK_VER = 1 PAK_VER = 2
DEPS = "" DEPS = ""
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 30ceb6df7e8681891e865e2fe5a7903d $(DL_FILE)_MD5 = 5d89d64d94bcfefa9ce8f59f4b81bdcb
install : $(TARGET) install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install