ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

* checkinstall: don't include directories in the Debian `conffiles'

Browse Source 
file.  This caused the Nix Debian build to fail (because it installs
  a file /etc/profile.d/nix.sh).

svn path=/nixpkgs/trunk/; revision=15038
This commit is contained in:
Eelco Dolstra 2009-04-14 14:57:31 +00:00
parent ec2802e690
commit 6a18dcab44
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/package-management/checkinstall/default.nix
View File

@ -20,6 +20,9 @@ stdenv.mkDerivation {
# Implement the getxattr(), lgetxattr(), __open_2() and # Implement the getxattr(), lgetxattr(), __open_2() and
# __open64_2() functions. Needed for doing builds on Ubuntu 8.10. # __open64_2() functions. Needed for doing builds on Ubuntu 8.10.
./missing-functions.patch ./missing-functions.patch
# Don't include directories in the Debian `conffiles' file.
./etc-dirs.patch
]; ];
buildInputs = [gettext]; buildInputs = [gettext];

25
pkgs/tools/package-management/checkinstall/etc-dirs.patch Normal file
View File

@ -0,0 +1,25 @@
diff -rc checkinstall-orig/checkinstall checkinstall/checkinstall
*** checkinstall-orig/checkinstall 2009-03-27 17:07:26.000000000 +0100
--- checkinstall/checkinstall 2009-04-14 16:34:08.000000000 +0200
***************
*** 2607,2615 ****
chmod 755 $BUILD_DIR/DEBIAN/postrm
fi
! # Tag files in /etc to be conffiles
find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
! grep -v '^/etc$' > $BUILD_DIR/DEBIAN/conffiles
# The package will be saved here (ignores <epoch>: prefix):
DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"
--- 2607,2616 ----
chmod 755 $BUILD_DIR/DEBIAN/postrm
fi
! # Tag non-directory files in /etc to be conffiles
find $BUILD_DIR/etc 2> /dev/null | sed -e "s,$BUILD_DIR,," | \
! (while read fn; do test ! -d "$BUILD_DIR/$fn" && echo "$fn"; done) \
! > $BUILD_DIR/DEBIAN/conffiles
# The package will be saved here (ignores <epoch>: prefix):
DEBPKG="${DIRECTORIO_FUENTE}/${NAME}_`echo ${VERSION} | sed -e 's/^[0123456789]*://'`-${RELEASE}_${ARCHITECTURE}.deb"