Skip to content

Commit

Permalink
Kill contrib/debian
Browse files Browse the repository at this point in the history
Closes: openzfs#16513
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
  • Loading branch information
nabijaczleweli committed Oct 2, 2024
1 parent d34d4f9 commit acfc155
Show file tree
Hide file tree
Showing 58 changed files with 3 additions and 1,154 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/qemu-4-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ echo "##[group]Autogen.sh"
echo "##[endgroup]"

echo "##[group]Build"
run make native-deb-kmod native-deb-utils
run make pkg-utils pkg-kmod
echo "##[endgroup]"

echo "##[group]Install"
Expand Down
20 changes: 2 additions & 18 deletions config/deb.am
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
PHONY += deb-kmod deb-dkms deb-utils deb deb-local native-deb-local \
native-deb-utils native-deb-kmod native-deb
PHONY += deb-kmod deb-dkms deb-utils deb deb-local

native-deb-local:
deb-local:
@(if test "${HAVE_DPKGBUILD}" = "no"; then \
echo -e "\n" \
"*** Required util ${DPKGBUILD} missing. Please install the\n" \
"*** package for your distribution which provides ${DPKGBUILD},\n" \
"*** re-run configure, and try again.\n"; \
exit 1; \
fi)

deb-local: native-deb-local
@(if test "${HAVE_ALIEN}" = "no"; then \
echo -e "\n" \
"*** Required util ${ALIEN} missing. Please install the\n" \
Expand Down Expand Up @@ -88,16 +85,3 @@ deb-utils: deb-local rpm-utils-initramfs
$$pkg8 $$pkg9 $$pkg10 $$pkg11;

deb: deb-kmod deb-dkms deb-utils

debian:
cp -r contrib/debian debian; chmod +x debian/rules;

native-deb-utils: native-deb-local debian
cp contrib/debian/control debian/control; \
$(DPKGBUILD) -b -rfakeroot -us -uc;

native-deb-kmod: native-deb-local debian
sh scripts/make_gitrev.sh; \
fakeroot debian/rules override_dh_binary-modules;

native-deb: native-deb-utils native-deb-kmod
1 change: 0 additions & 1 deletion config/zfs-build.m4
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@ AC_DEFUN([ZFS_AC_DPKG], [
AC_SUBST(HAVE_DPKGBUILD)
AC_SUBST(DPKGBUILD)
AC_SUBST(DPKGBUILD_VERSION)
AC_SUBST([CFGOPTS], ["$CFGOPTS"])
])

dnl #
Expand Down
3 changes: 0 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

AC_INIT(m4_esyscmd(awk '/^Name:/ {printf $2}' META),
m4_esyscmd(awk '/^Version:/ {printf $2}' META))
CFGOPTS="$*"
AC_LANG(C)
ZFS_AC_META
AC_CONFIG_AUX_DIR([config])
Expand Down Expand Up @@ -66,8 +65,6 @@ ZFS_AC_DEBUG_KMEM_TRACKING
ZFS_AC_DEBUG_INVARIANTS

AC_CONFIG_FILES([
contrib/debian/rules
contrib/debian/changelog
Makefile
include/Makefile
lib/libzfs/libzfs.pc
Expand Down
1 change: 0 additions & 1 deletion contrib/debian/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/debian/changelog.in

This file was deleted.

11 changes: 0 additions & 11 deletions contrib/debian/clean

This file was deleted.

Loading

0 comments on commit acfc155

Please sign in to comment.