webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 19:15:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-03-04 18:29:25 +01:00
parent 8a70735635 95607af0fe
commit cdce14908d
3 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
config/rootfiles/packages/pakfire3
View File

@@ -34,6 +34,8 @@ usr/lib/pakfire/macros/build.macro
usr/lib/pakfire/macros/cflags.macro
usr/lib/pakfire/macros/constants.macro
usr/lib/pakfire/macros/package-default.macro
usr/lib/pakfire/macros/perl.macro
usr/lib/pakfire/macros/python.macro
usr/lib/pakfire/macros/quality-agent.macro
usr/lib/pakfire/macros/systemd.macro
usr/lib/pakfire/macros/templates.macro
@@ -50,21 +52,15 @@ usr/lib/python2.7/site-packages/pakfire/__version__.py
usr/lib/python2.7/site-packages/pakfire/_lzma.so
usr/lib/python2.7/site-packages/pakfire/_pakfire.so
usr/lib/python2.7/site-packages/pakfire/actions.py
usr/lib/python2.7/site-packages/pakfire/api.py
usr/lib/python2.7/site-packages/pakfire/base.py
usr/lib/python2.7/site-packages/pakfire/builder.py
usr/lib/python2.7/site-packages/pakfire/cgroup.py
usr/lib/python2.7/site-packages/pakfire/chroot.py
usr/lib/python2.7/site-packages/pakfire/cli.py
usr/lib/python2.7/site-packages/pakfire/client
usr/lib/python2.7/site-packages/pakfire/client/__init__.py
usr/lib/python2.7/site-packages/pakfire/client/base.py
usr/lib/python2.7/site-packages/pakfire/client/builder.py
usr/lib/python2.7/site-packages/pakfire/client/test.py
usr/lib/python2.7/site-packages/pakfire/client/transport.py
usr/lib/python2.7/site-packages/pakfire/client.py
usr/lib/python2.7/site-packages/pakfire/compress.py
usr/lib/python2.7/site-packages/pakfire/config.py
usr/lib/python2.7/site-packages/pakfire/constants.py
usr/lib/python2.7/site-packages/pakfire/daemon.py
usr/lib/python2.7/site-packages/pakfire/distro.py
usr/lib/python2.7/site-packages/pakfire/downloader.py
usr/lib/python2.7/site-packages/pakfire/errors.py
@@ -82,6 +78,7 @@ usr/lib/python2.7/site-packages/pakfire/packages/lexer.py
usr/lib/python2.7/site-packages/pakfire/packages/make.py
usr/lib/python2.7/site-packages/pakfire/packages/packager.py
usr/lib/python2.7/site-packages/pakfire/packages/solv.py
usr/lib/python2.7/site-packages/pakfire/packages/tar.py
usr/lib/python2.7/site-packages/pakfire/repository
usr/lib/python2.7/site-packages/pakfire/repository/__init__.py
usr/lib/python2.7/site-packages/pakfire/repository/base.py
@@ -94,8 +91,10 @@ usr/lib/python2.7/site-packages/pakfire/repository/remote.py
usr/lib/python2.7/site-packages/pakfire/repository/system.py
usr/lib/python2.7/site-packages/pakfire/satsolver.py
usr/lib/python2.7/site-packages/pakfire/server.py
usr/lib/python2.7/site-packages/pakfire/shell.py
usr/lib/python2.7/site-packages/pakfire/system.py
usr/lib/python2.7/site-packages/pakfire/transaction.py
usr/lib/python2.7/site-packages/pakfire/transport.py
usr/lib/python2.7/site-packages/pakfire/util.py
usr/lib/quality-agent
usr/lib/quality-agent/001-include-files
@@ -112,7 +111,6 @@ usr/lib/quality-agent/050-libs-x86_64
usr/lib/quality-agent/050-nx
usr/lib/quality-agent/050-relro
usr/lib/quality-agent/050-rpaths
usr/lib/quality-agent/090-python-hardlinks
usr/lib/quality-agent/095-directory-layout
usr/lib/quality-agent/qa-include
var/ipfire/backup/addons/includes/pakfire3

7
lfs/pakfire3
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.9.23
VER = 0.9.25
THISAPP = pakfire-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = http://source.ipfire.org/releases/pakfire/
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pakfire3
PAK_VER = 2
PAK_VER = 4
DEPS = "libsolv pycurl pygpgme python-progressbar python-xattr sqlite urlgrabber"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 10e6dd51c917faa8bd2e7435495de211
$(DL_FILE)_MD5 = 8932670f3ac7c7ab1892b719a078de31
install : $(TARGET)
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire3-changes-for-ipfire2.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
rm -vf /usr/bin/pakfire3

24
src/patches/pakfire-database-Add-inst_size-column-when-creating-new-data.patch Normal file
View File

@@ -0,0 +1,24 @@
From 0d6d6fd2b89c609a6f8daff225c6c98b54a041cc Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 4 Mar 2013 17:18:52 +0100
Subject: [PATCH] database: Add inst_size column when creating new databases.
---
python/pakfire/repository/database.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py
index fc8a1a9..d8751e9 100644
--- a/python/pakfire/repository/database.py
+++ b/python/pakfire/repository/database.py
@@ -190,6 +190,7 @@ class DatabaseLocal(Database):
groups TEXT,
filename TEXT,
size INTEGER,
+ inst_size INTEGER,
hash1 TEXT,
provides TEXT,
requires TEXT,
--
1.7.11.7