admin/schroot/patches/01-openwrt.patch

   1 --- a/CMakeLists.txt
   2 +++ b/CMakeLists.txt
   3 @@ -210,8 +210,8 @@ endif(BUILD_PAM)
   4  set(BLOCKDEV_DEFAULT ON)
   5
   6  # LVM snapshot mount feature
   7 -find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
   8 -find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
   9 +#find_program(LVCREATE_EXECUTABLE lvcreate PATHS /sbin /usr/sbin /usr/local/sbin)
  10 +#find_program(LVREMOVE_EXECUTABLE lvremove PATHS /sbin /usr/sbin /usr/local/sbin)
  11  set(LVMSNAP_DEFAULT OFF)
  12  if (LVCREATE_EXECUTABLE AND LVREMOVE_EXECUTABLE)
  13    set (LVMSNAP_DEFAULT ON)
  14 @@ -224,7 +224,7 @@ if (lvm-snapshot)
  15  endif(lvm-snapshot)
  16
  17  # ZFS snapshot mount feature
  18 -find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
  19 +#find_program(ZFS_EXECUTABLE zfs PATHS /sbin /usr/sbin /usr/local/sbin)
  20  set(ZFSSNAP_DEFAULT OFF)
  21  if (ZFS_EXECUTABLE)
  22    set (ZFSSNAP_DEFAULT ON)
  23 @@ -237,7 +237,7 @@ if (zfs-snapshot)
  24  endif(zfs-snapshot)
  25
  26  # Btrfs snapshot mount feature
  27 -find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
  28 +#find_program(BTRFS_EXECUTABLE btrfs PATHS /sbin /usr/sbin /usr/local/sbin)
  29  set(BTRFSSNAP_DEFAULT OFF)
  30  if (BTRFS_EXECUTABLE)
  31    set (BTRFSSNAP_DEFAULT ON)
  32 @@ -310,15 +310,9 @@ include_directories(${PROJECT_BINARY_DIR
  33                      ${PROJECT_BINARY_DIR}
  34                      ${PROJECT_SOURCE_DIR})
  35
  36 -enable_testing()
  37 -
  38  add_subdirectory(sbuild)
  39  add_subdirectory(bin)
  40 -add_subdirectory(test)
  41 -add_subdirectory(doc)
  42  add_subdirectory(etc)
  43 -add_subdirectory(po)
  44 -add_subdirectory(man)
  45
  46  add_custom_target(check-news
  47    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
  48 --- a/bin/schroot-base/schroot-base-run.h
  49 +++ b/bin/schroot-base/schroot-base-run.h
  50 @@ -61,8 +61,8 @@ namespace schroot_base
  51          std::cout.imbue(std::locale());
  52          std::cerr.imbue(std::locale());
  53
  54 -        bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);
  55 -        textdomain (SBUILD_MESSAGE_CATALOGUE);
  56 +        //bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);
  57 +        //textdomain (SBUILD_MESSAGE_CATALOGUE);
  58
  59          typename options_type::ptr opts(new options_type);
  60          main_type kit(opts);
  61 --- a/sbuild/sbuild-feature.h
  62 +++ b/sbuild/sbuild-feature.h
  63 @@ -24,6 +24,7 @@
  64  #include <string>
  65
  66  #include <boost/format.hpp>
  67 +#include <libintl.h>
  68
  69  namespace sbuild
  70  {
  71 --- a/etc/setup.d/20copyfiles
  72 +++ b/etc/setup.d/20copyfiles
  73 @@ -39,9 +39,9 @@ copy_file()
  74          if [ -e "$2" ]; then
  75
  76              # Device and inode
  77 -            da=$(/usr/bin/stat --format="%d %i" "$1")
  78 +            da=$(/bin/stat --format="%d %i" "$1")
  79              # This one can fail since it might not exist yet
  80 -            db=$(/usr/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
  81 +            db=$(/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
  82
  83              if [ "$da" = "$db" ]; then
  84                  COPY="false"
  85 --- a/etc/setup.d/20nssdatabases
  86 +++ b/etc/setup.d/20nssdatabases
  87 @@ -29,7 +29,7 @@ set -e
  88  dup_nss()
  89  {
  90      info "Copying $1 database to $2"
  91 -    getent "$1" > "$2"
  92 +    cat "/etc/$1" > "$2"
  93  }
  94
  95  if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
  96 @@ -42,9 +42,9 @@ if [ $STAGE = "setup-start" ] || [ $STAG
  97                  fi
  98
  99                  # Device and inode
 100 -                dr=$(/usr/bin/stat --format="%d %i" "/etc/$db")
 101 +                dr=$(/bin/stat --format="%d %i" "/etc/$db")
 102                  # This one can fail since it might not exist yet
 103 -                dc=$(/usr/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
 104 +                dc=$(/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
 105
 106                  # If the database inside and outside the chroot is the
 107                  # same, it's very likely that dup_nss would blank the
 108 --- a/etc/profile-templates/all/all/nssdatabases
 109 +++ b/etc/profile-templates/all/all/nssdatabases
 110 @@ -3,5 +3,5 @@
 111  # <database name>
 112  passwd
 113  shadow
 114 -group
 115 -gshadow
 116 +#group
 117 +#gshadow
 118 --- a/etc/profile-templates/buildd/all/nssdatabases
 119 +++ b/etc/profile-templates/buildd/all/nssdatabases
 120 @@ -3,5 +3,5 @@
 121  # <database name>
 122  passwd
 123  shadow
 124 -group
 125 -gshadow
 126 +#group
 127 +#gshadow
 128 --- a/etc/profile-templates/default/all/nssdatabases
 129 +++ b/etc/profile-templates/default/all/nssdatabases
 130 @@ -1,4 +1,4 @@
 131  services
 132  protocols
 133 -networks
 134 +#networks
 135  hosts
 136 --- a/etc/profile-templates/desktop/all/nssdatabases
 137 +++ b/etc/profile-templates/desktop/all/nssdatabases
 138 @@ -1,4 +1,4 @@
 139  services
 140  protocols
 141 -networks
 142 +#networks
 143  hosts
 144 --- a/etc/profile-templates/default/linux/fstab
 145 +++ b/etc/profile-templates/default/linux/fstab
 146 @@ -7,7 +7,7 @@
 147  # to run additional services in the chroot.  However, note that this
 148  # may potentially cause undesirable behaviour on upgrades, such as
 149  # killing services on the host.
 150 -#/run           /run            none    rw,bind         0       0
 151 +/run           /run            none    rw,bind         0       0
 152  #/run/lock      /run/lock       none    rw,bind         0       0
 153 -#/dev/shm       /dev/shm        none    rw,bind         0       0
 154 -#/run/shm       /run/shm        none    rw,bind         0       0
 155 +/tmp/shm       /dev/shm        none    rw,bind         0       0
 156 +/tmp/shm       /run/shm        none    rw,bind         0       0
 157 --- a/etc/profile-templates/desktop/linux/fstab
 158 +++ b/etc/profile-templates/desktop/linux/fstab
 159 @@ -12,7 +12,7 @@
 160  # to run additional services in the chroot.  However, note that this
 161  # may potentially cause undesirable behaviour on upgrades, such as
 162  # killing services on the host.
 163 -#/run           /run            none    rw,bind         0       0
 164 +/run           /run            none    rw,bind         0       0
 165  #/run/lock      /run/lock       none    rw,bind         0       0
 166 -#/dev/shm       /dev/shm        none    rw,bind         0       0
 167 -#/run/shm       /run/shm        none    rw,bind         0       0
 168 +/tmp/shm       /dev/shm        none    rw,bind         0       0
 169 +/tmp/shm       /run/shm        none    rw,bind         0       0