This patch removes a bunch of crufty old stuff, including some subversion deritrus, the slackware tarball build support as well as the aborted attempt to make auto building debian packages --- common/Make.rules | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) Index: b/common/Make.rules =================================================================== --- a/common/Make.rules +++ b/common/Make.rules @@ -75,18 +75,7 @@ RPMARG=--define "_topdir $(BUILDDIR:/=)" $(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot $(BUILDDIR:/=)/BUILDROOT\") \ $(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\") -#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ -# if ! /usr/bin/svn info -r HEAD . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; then \ -# /usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \ -# fi ; \ -# fi) REPO_VERSION=$(shell ([ -x /usr/bin/bzr ] && /usr/bin/bzr version-info . 2> /dev/null || awk '{ print "revno: "$$2 }' common/.stamp_rev) | awk '/^revno:/ { print $$2 }' ) -REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \ - /usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \ - fi) -COMMON_REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \ - /usr/bin/svn info $(COMMONDIR) 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \ - fi) ifdef EXTERNAL_PACKAGE RPMARG+=--define "_sourcedir $(shell pwd)" @@ -95,7 +84,6 @@ endif ifndef SPECFILE SPECFILE = $(NAME).spec endif -RELEASE = $(shell lsb_release -is) $(shell lsb_release -rs) RELEASE_DIR = $(NAME)-$(VERSION) TARBALL = $(NAME)-$(VERSION)-${REPO_VERSION}.tar.gz TAR = /bin/tar czvp -h --exclude .svn --exclude .bzr --exclude .bzrignore --exclude ${TARBALL} --exclude ${RELEASE_DIR}/${RELEASE_DIR} $(shell test -f ${NAME}.exclude && echo "-X ${NAME}.exclude") @@ -236,43 +224,6 @@ install_manpages: $(MANPAGES) %.8.html: %.pod $(POD2HTML) --header --css apparmor.css --infile=$< --outfile=$@ -# ===================== -# Slackware poo -# ===================== -.PHONY: slack -slack: - rm -rf ${BUILDDIR} - mkdir -p ${BUILDDIR}/install - make install DESTDIR=${BUILDDIR} DISTRO=slackware - # comment line is there so grep always has something to match - ( echo "# install script pulled from ${SPECFILE}" ; rpm -q --specfile --define "_sourcedir ." ${RPMARG} --qf "%{POSTIN}\n" ${SPECFILE}) | grep -v "^(none)$$" >> ${BUILDDIR}/install/doinst.sh - ( cd ${BUILDDIR} && makepkg -l y -c y -p ${PWD}/${NAME}-${VERSION}-${RELEASE}.tgz ) - -# ===================== -# Debian poo -# ===================== -.PHONY: deb -deb: ${TARBALL} - rm -rf ${BUILDDIR} - mkdir -p ${BUILDDIR} - tar -xvzf ${TARBALL} -C ${BUILDDIR} - ( cd ${BUILDDIR}/${RELEASE_DIR} && sh -c "DEBFULLNAME='NOVELL, Inc' dh_make -e apparmor-general@forge.novell.com --library -f ~/svn/immunix/immunix/libimmunix/libimmunix-2.0.tar.gz << EOM \ -\ -EOM" ) - make ${NAME}-deb -C ${BUILDDIR}/${RELEASE_DIR} - # ( cd ${BUILDDIR}/${RELEASE_DIR} && dpkg-buildpackage -b -sd -rfakeroot) - -DEBIAN_DISTRO=stable - -DEB_CHANGELOG_OUTPUT="${NAME} (${VERSION}-${RELEASE}) ${DEBIAN_DISTRO}; urgency=low\n\ - \n * Automatically generated by the AppArmor Build System.\n\ - \n -- AppArmor Development Team $(shell date -R)" - - -.PHONY: debian/changelog -debian/changelog: - echo -e ${DEB_CHANGELOG_OUTPUT} > $@ - A2PS_ARGS=-Ec -g --line-numbers=1 ENSCRIPT_ARGS=-C -2jGr -f Courier6 -E %.c.ps: %.c