diff --git a/admin/schroot/Makefile b/admin/schroot/Makefile index 967efdc077..be5cb45123 100644 --- a/admin/schroot/Makefile +++ b/admin/schroot/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=reschroot PKG_VERSION:=1.6.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeberg.org/shelter/reschroot/archive/release @@ -27,6 +27,9 @@ define Package/schroot TITLE:=Securely enter a chroot and run a command or login shell. DEPENDS:=$(ICONV_DEPENDS) \ +boost +boost-filesystem +boost-iostreams +boost-program_options +boost-regex \ + +!BUSYBOX_CONFIG_REALPATH:coreutils-realpath \ + +!BUSYBOX_CONFIG_FEATURE_STAT_FORMAT:coreutils-stat \ + +!BUSYBOX_CONFIG_TAC:coreutils-tac \ +SCHROOT_BTRFS:btrfs-progs \ +SCHROOT_LOOPBACK:losetup \ +SCHROOT_LVM:lvm2 \ diff --git a/admin/schroot/patches/01-openwrt.patch b/admin/schroot/patches/01-openwrt.patch index f26e290c32..d9082671f6 100644 --- a/admin/schroot/patches/01-openwrt.patch +++ b/admin/schroot/patches/01-openwrt.patch @@ -75,10 +75,10 @@ # Device and inode - da=$(/usr/bin/stat --format="%d %i" "$1") -+ da=$(/bin/stat --format="%d %i" "$1") ++ da=$(stat -c "%d %i" "$1") # This one can fail since it might not exist yet - db=$(/usr/bin/stat --format="%d %i" "$2" 2>/dev/null || :) -+ db=$(/bin/stat --format="%d %i" "$2" 2>/dev/null || :) ++ db=$(stat -c "%d %i" "$2" 2>/dev/null || :) if [ "$da" = "$db" ]; then COPY="false" @@ -98,10 +98,10 @@ # Device and inode - dr=$(/usr/bin/stat --format="%d %i" "/etc/$db") -+ dr=$(/bin/stat --format="%d %i" "/etc/$db") ++ dr=$(stat -c "%d %i" "/etc/$db") # This one can fail since it might not exist yet - dc=$(/usr/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :) -+ dc=$(/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :) ++ dc=$(stat -c "%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :) # If the database inside and outside the chroot is the # same, it's very likely that dup_nss would blank the