Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

schroot: update to version 1.6.13, reboot of the schroot tool

Browse source 
conceived and developed for many years by Roger Leigh

Signed-off-by: Javier Marcet <javier@marcet.info>
This commit is contained in:
Javier Marcet 2022-08-27 17:14:38 +02:00 committed by Rosen Penev
parent d957a2293b
commit 38716ddfeb
3 changed files with 73 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
admin/schroot/Makefile
View file

@ -1,23 +1,25 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=schroot PKG_NAME:=reschroot
PKG_VERSION:=1.6.10 PKG_VERSION:=1.6.13
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/s/schroot PKG_SOURCE_URL:=https://codeberg.org/shelter/reschroot/archive/release
PKG_HASH:=3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b PKG_HASH:=c05d6a1bb0210d401e6522eee2c465e0b43c6c98f7101d671f9e9ef88b3accf5
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info> PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=GPL-3.0-only PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1 CMAKE_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf CMAKE_BINARY_SUBDIR:=build
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/nls.mk
define Package/schroot define Package/schroot
SECTION:=admin SECTION:=admin
@ -30,7 +32,7 @@ define Package/schroot
+SCHROOT_LVM:lvm2 \ +SCHROOT_LVM:lvm2 \
+SCHROOT_UUID:libuuid \ +SCHROOT_UUID:libuuid \
$(INTL_DEPENDS) $(INTL_DEPENDS)
URL:=https://salsa.debian.org/debian/schroot URL:=https://codeberg.org/shelter/reschroot
endef endef
define Package/schroot/description define Package/schroot/description
@ -51,20 +53,21 @@ PKG_CONFIG_DEPENDS := \
CONFIG_SCHROOT_LVM \ CONFIG_SCHROOT_LVM \
CONFIG_SCHROOT_UUID CONFIG_SCHROOT_UUID
CONFIGURE_ARGS += \ CMAKE_OPTIONS += \
$(if $(CONFIG_SCHROOT_BTRFS),--enable,--disable)-btrfs-snapshot \ -Dbtrfs-snapshot=$(if $(CONFIG_SCHROOT_BTRFS),ON,OFF) \
$(if $(CONFIG_SCHROOT_LOOPBACK),--enable,--disable)-loopback \ -Dloopback=$(if $(CONFIG_SCHROOT_LOOPBACK),ON,OFF) \
$(if $(CONFIG_SCHROOT_LVM),--enable,--disable)-lvm-snapshot \ -Dlvm-snapshot=$(if $(CONFIG_SCHROOT_LVM),ON,OFF) \
$(if $(CONFIG_SCHROOT_UUID),--enable,--disable)-uuid \ -Duuid=$(if $(CONFIG_SCHROOT_UUID),ON,OFF) \
--enable-block-device \ -Dblock-device=ON \
--enable-union \ -Dunion=ON \
--disable-dchroot \ -Ddhcroot=OFF \
--disable-dchroot-dsa \ -Ddchroot-dsa=OFF \
--disable-csbuild \ -Ddebug=OFF \
--disable-debug \ -Ddoxygen=OFF \
--disable-pam \ -Dpam=OFF \
--disable-doxygen \ -Dtest=OFF \
--disable-rpath -Duuid=OFF \
-Dzfs-snapshot=OFF
define Package/schroot/install define Package/schroot/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
@ -73,7 +76,8 @@ define Package/schroot/install
$(CP) -R $(PKG_INSTALL_DIR)/etc/schroot/* $(1)/etc/schroot $(CP) -R $(PKG_INSTALL_DIR)/etc/schroot/* $(1)/etc/schroot
$(INSTALL_DIR) $(1)/usr/lib/schroot $(INSTALL_DIR) $(1)/usr/lib/schroot
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libsbuild.* $(1)/usr/lib/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libsbuild.* $(1)/usr/lib/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/schroot/* $(1)/usr/lib/schroot/ $(INSTALL_DIR) $(1)/usr/libexec/schroot
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/schroot/schroot-* $(1)/usr/libexec/schroot/
$(INSTALL_DIR) $(1)/usr/share/schroot $(INSTALL_DIR) $(1)/usr/share/schroot
$(CP) -R $(PKG_INSTALL_DIR)/usr/share/schroot/* $(1)/usr/share/schroot/ $(CP) -R $(PKG_INSTALL_DIR)/usr/share/schroot/* $(1)/usr/share/schroot/
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d

2
admin/schroot/files/schroot.init
View file

@ -4,7 +4,7 @@ START=94
start() { start() {
[ -d /var/lib/schroot ] || { [ -d /var/lib/schroot ] || {
mkdir -p /var/lib/schroot/mount /var/lib/schroot/session /var/lib/schroot/unpack /var/lib/schroot/union/overlay /var/lib/schroot/union/underlay mkdir -p /var/lib/schroot/session /var/lib/schroot/unpack /var/lib/schroot/union/overlay /var/lib/schroot/union/underlay
chmod 0700 /var/lib/schroot chmod 0700 /var/lib/schroot
} }
} }

130
admin/schroot/patches/01-openwrt.patch
View file

@ -1,96 +1,50 @@
--- a/configure.ac --- a/CMakeLists.txt
+++ b/configure.ac +++ b/CMakeLists.txt
@@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then @@ -210,8 +210,8 @@ endif(BUILD_PAM)
HAVE_DOXYGEN="no" set(BLOCKDEV_DEFAULT ON)
fi
HAVE_LVM="yes"
-AC_PATH_PROG([LVCREATE], [lvcreate], [], [$PATH:/sbin:/usr/sbin])
-AC_PATH_PROG([LVREMOVE], [lvremove], [], [$PATH:/sbin:/usr/sbin])
-if test -z "$LVCREATE" || test -z "$LVREMOVE"; then
- HAVE_LVM="no"
-fi
HAVE_BTRFS="yes"
-AC_PATH_PROG([BTRFS], [btrfs], [], [$PATH:/sbin:/usr/sbin])
-AC_PATH_PROG([BTRFSCTL], [btrfsctl], [], [$PATH:/sbin:/usr/sbin])
-if test -z "$BTRFS" || test -z "$BTRFSCTL"; then
- HAVE_BTRFS="no"
-fi
HAVE_LOOPBACK="yes"
-AC_PATH_PROG([LOSETUP], [losetup], [], [$PATH:/sbin:/usr/sbin])
-if test -z "$LOSETUP"; then
- HAVE_LOOPBACK="no"
-fi
# LVM snapshot mount feature
-find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
-find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
+#find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
+#find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
set(LVMSNAP_DEFAULT OFF)
if (LVCREATE_EXECUTABLE AND LVREMOVE_EXECUTABLE)
set (LVMSNAP_DEFAULT ON)
@@ -224,7 +224,7 @@ if (lvm-snapshot)
endif(lvm-snapshot)
# Check for host platform # ZFS snapshot mount feature
@@ -336,7 +322,6 @@ PKG_CHECK_MODULES([UUID], [uuid], -find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
[HAVE_UUID=yes], +#find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
[HAVE_UUID=no]) set(ZFSSNAP_DEFAULT OFF)
if (ZFS_EXECUTABLE)
set (ZFSSNAP_DEFAULT ON)
@@ -237,7 +237,7 @@ if (zfs-snapshot)
endif(zfs-snapshot)
-AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes]) # Btrfs snapshot mount feature
AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"]) -find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
+#find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
set(BTRFSSNAP_DEFAULT OFF)
if (BTRFS_EXECUTABLE)
set (BTRFSSNAP_DEFAULT ON)
@@ -310,15 +310,9 @@ include_directories(${PROJECT_BINARY_DIR
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR})
SCHROOT_CFLAGS="$UUID_CFLAGS" -enable_testing()
@@ -688,42 +673,25 @@ if test "$BOOST_PROGRAM_OPTIONS_VALIDATI -
fi add_subdirectory(sbuild)
add_subdirectory(bin)
-add_subdirectory(test)
-add_subdirectory(doc)
add_subdirectory(etc)
-add_subdirectory(po)
-add_subdirectory(man)
dnl Note the use of quadrigraphs to quote [ and ] in regexes. add_custom_target(check-news
-AH_TEMPLATE(HAVE_REGEX_REGEX, [Set if the <regex> header file includes std::regex]) COMMAND if grep -q "Welcome to ${CMAKE_PROJECT_NAME} ${GIT_RELEASE_VERSION}" "${PROJECT_SOURCE_DIR}/NEWS" \; then echo "NEWS current version ${GIT_RELEASE_VERSION}" \; else echo "NEWS current version does not match release version ${GIT_RELEASE_VERSION}" \; exit 1 \; fi
AH_TEMPLATE(HAVE_BOOST_REGEX, [Set if the <boost/regex.hpp> header file includes boost::regex])
-AC_MSG_CHECKING([for std::regex])
-define([testprog], [AC_LANG_PROGRAM([#include <regex>],
- [std::regex foo("^foo@<:@bar@:>@$");
- std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);
- std::regex check("^@<:@^:/,.@:>@@<:@^:/,@:>@*$", std::regex::extended);])])
-AC_RUN_IFELSE(testprog,
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_REGEX_REGEX, 1)],
- [dnl Check if std::regex is present but broken.
-define([testprog], [AC_LANG_PROGRAM([#include <regex>],
- [std::regex foo("^foo@<:@bar@:>@$");
- std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);])])
+AC_MSG_CHECKING([for boost::regex in -lboost_regex])
+saved_LIBS="${LIBS}"
+LIBS="${saved_LIBS} -lboost_regex"
+define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
+ [boost::regex("^foo@<:@bar@:>@$");
+ boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
AC_LINK_IFELSE(testprog,
- [AC_MSG_RESULT([broken])],
- [AC_MSG_RESULT([no])])
- AC_MSG_CHECKING([for boost::regex in -lboost_regex])
- saved_LIBS="${LIBS}"
- LIBS="${saved_LIBS} -lboost_regex"
- define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
- [boost::regex("^foo@<:@bar@:>@$");
- boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
- AC_LINK_IFELSE(testprog,
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_BOOST_REGEX, 1)
- BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
- [LIBS="${saved_LIBS} -lboost_regex-mt"
- AC_LINK_IFELSE(testprog,
- [AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_BOOST_REGEX, 1)
- BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
- [AC_MSG_RESULT([no])
- AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
- LIBS="${saved_LIBS}"
-])
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_BOOST_REGEX, 1)
+ BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
+ [LIBS="${saved_LIBS} -lboost_regex-mt"
+ AC_LINK_IFELSE(testprog,
+ [AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_BOOST_REGEX, 1)
+ BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
+ [AC_MSG_RESULT([no])
+ AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
+LIBS="${saved_LIBS}"
AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
saved_LIBS="${LIBS}"
--- a/bin/schroot-base/schroot-base-run.h --- a/bin/schroot-base/schroot-base-run.h
+++ b/bin/schroot-base/schroot-base-run.h +++ b/bin/schroot-base/schroot-base-run.h
@@ -61,8 +61,8 @@ namespace schroot_base @@ -61,8 +61,8 @@ namespace schroot_base