[Lsb-messages] /var/www/bzr/lsb/devel/repogen r214: Formally move to new Debian package generation.

Jeff Licquia licquia at linuxfoundation.org
Fri Dec 26 23:32:36 UTC 2014 

------------------------------------------------------------
revno: 214
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: repogen
timestamp: Fri 2014-12-26 18:32:36 -0500
message:
  Formally move to new Debian package generation.
removed:
  deb/Makefile
renamed:
  deb/Makefile-haskell => deb/Makefile
modified:
  Makefile
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2013-06-17 19:09:54 +0000
+++ b/Makefile	2014-12-26 23:32:36 +0000
@@ -7,7 +7,7 @@
 ifeq ($(BUILD_RELEASED),yes)
 	cd rpm; for lv in $(LSB_VERSIONS); do $(MAKE) LSB_VERSION=$$lv; done
 ifeq ($(BUILD_DEBIAN),yes)
-	cd deb; make -f Makefile-haskell
+	cd deb; make
 endif
 endif
 ifeq ($(BUILD_BETA),yes)
@@ -20,7 +20,7 @@
 snapshot: pkglists
 	cd rpm; $(MAKE) snapshot LSB_VERSION=$(SNAPSHOT_LSB_VERSION) COMMON_PATH=snapshots VERSION_PATH=snapshots APPBAT_PATH=snapshots DISTTEST_PATH=snapshots LSBDEV_PATH=snapshots APPTEST_PATH=snapshots
 ifeq ($(BUILD_DEBIAN),yes)
-	cd deb; $(MAKE) -f Makefile-haskell snapshot
+	cd deb; $(MAKE) snapshot
 endif
 
 pkglists: task-pkgs.tar.gz
@@ -47,7 +47,7 @@
 install-snapshot:
 	cd rpm; $(MAKE) install LSB_VERSION=$(SNAPSHOT_LSB_VERSION)
 ifeq ($(BUILD_DEBIAN),yes)
-	cd deb; $(MAKE) -f Makefile-haskell install-snapshot
+	cd deb; $(MAKE) install-snapshot
 endif
 
 .PHONY: default snapshot debcache debcache-snapshot clean install install-snapshot

=== renamed file 'deb/Makefile-haskell' => 'deb/Makefile'
=== removed file 'deb/Makefile'
--- a/deb/Makefile	2013-06-13 15:08:47 +0000
+++ b/deb/Makefile	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-# Makefile for RPM-based repositories (yum, urpmi, etc.) in bundling.
-# Copyright 2007 Free Standards Group.
-
-include ../Makefile.common
-
-DEB_ARCHS = $(shell echo $(ARCHS) | sed s/ia32/i386/ | sed s/x86_64/amd64/ | sed s/ppc32/powerpc/ | sed s/ppc64// | sed s/s390x//)
-
-APT_INDEXES = $(shell for arch in $(DEB_ARCHS); do echo debian/dists/$(REPO_NAME)/main/binary-$$arch/Packages.gz; echo debian/dists/$(REPO_NAME)/main/binary-$$arch/Packages.bz2; done)
-APT_RELEASES = $(shell for arch in $(DEB_ARCHS); do echo debian/dists/$(REPO_NAME)/main/binary-$$arch/Release; done)
-
-ifeq ($(GPG_SIGN),no)
-APT_DEPEND_TARGET = debian/dists/$(REPO_NAME)/Release
-else
-APT_DEPEND_TARGET = debian/dists/$(REPO_NAME)/Release.gpg
-endif
-
-REPO_TOP_FULL = $(FTP_ROOT)/$(FTP_LSB_PATH)/repositories/debian
-
-PKGLIST_COMMON = $(shell grep 'independent$$' ../pkglists | grep -v ' appbat ' | cut -d' ' -f1)
-PKGLIST_VERSION = $(shell grep '$(LSB_VERSION)[^[:space:]]*$$' ../pkglists | grep -v ' appbat ' | cut -d' ' -f1)
-
-# Special handling for snapshot and beta.
-ifeq ($(LSB_VERSION),$(SNAPSHOT_LSB_VERSION))
-PKGLIST_ALL = $(PKGLIST_VERSION) $(PKGLIST_COMMON)
-DEB_PKGS_COMMON = 
-else ifeq ($(LSB_VERSION),$(BETA_LSB_VERSION))
-PKGLIST_ALL = $(PKGLIST_VERSION) $(PKGLIST_COMMON)
-DEB_PKGS_COMMON = 
-else
-PKGLIST_ALL = $(PKGLIST_VERSION)
-DEB_PKGS_COMMON = debian/pkgs-common
-endif
-
-default: apt
-
-snapshot: apt
-
-all: pkgs apt
-
-debcache: $(DEB_PKG_CACHE)/pkgs-$(LSB_VERSION)
-
-debcache-common: $(DEB_PKG_CACHE)/pkgs-common
-
-debcache-both: debcache debcache-common
-
-debcache-snapshot: $(DEB_PKG_CACHE)/pkgs-snapshot
-
-$(DEB_PKG_CACHE):
-	mkdir -p $(DEB_PKG_CACHE)
-	for d in 3.0 3.1 3.2 4.0 4.1 common snapshot; do \
-	  mkdir -p $(DEB_PKG_CACHE)/pkgs-$$d; \
-	done
-
-$(DEB_PKG_CACHE)/pkgs-%: pkgcache/pkgs-%
-	cp -r $? $@.new
-	[ \! -d $@ ] || mv $@ $@.old
-	mv $@.new $@
-	[ \! -d $@.old ] || rm -rf $@.old
-
-pkgcache/pkgs-common:
-	mkdir -p $@
-	for pkg in $(PKGLIST_COMMON); do \
-	    find $(FTP_ROOT)/$(FTP_LSB_PATH) -type f -name $$pkg\*rpm -print | egrep -v '(s390x|ppc64|src).rpm' | grep $(COMMON_PATH) | egrep -v '(repositories|archive)' | (while read f; do echo "Converting $$f"; ./makedeb -o $@ $$f; done) ; \
-	done
-
-pkgcache/pkgs-$(LSB_VERSION):
-	mkdir -p $@
-	for pkg in $(PKGLIST_ALL); do \
-	    find $(FTP_ROOT)/$(FTP_LSB_PATH) -type f -name $$pkg\*rpm -print | egrep -v '(s390x|ppc64|src).rpm' | grep $(VERSION_PATH) | egrep -v '(repositories|archive)' | (while read f; do echo "Converting $$f"; ./makedeb -o $@ $$f; done) ; \
-	done
-
-debian/pkgs-common: $(DEB_PKG_CACHE)
-	mkdir -p $@
-	cp -r $(DEB_PKG_CACHE)/pkgs-common/* $@
-
-debian/pkgs-$(LSB_VERSION): $(DEB_PKG_CACHE) $(DEB_PKGS_COMMON)
-	mkdir -p $@
-	cp -r $(DEB_PKG_CACHE)/$(@F)/* $@
-ifneq ($(LSB_VERSION),$(SNAPSHOT_LSB_VERSION))
-	cd $@; for pkg in ../pkgs-common/*; do if [ \! -f `basename $$pkg` ]; then ln -s $$pkg .; fi; done
-endif
-
-apt-overrides:
-	touch $@
-	(for p in $(PKGLIST_COMMON) $(PKGLIST_VERSION); do echo "$$p alien extra"; done) >> $@
-
-debian/dists/$(REPO_NAME)/main/binary-%/Packages: debian/pkgs-$(LSB_VERSION) apt-overrides
-	mkdir -p $(@D)
-	(cd debian && dpkg-scanpackages -a$(*F) $$(basename $<) ../apt-overrides) > $@ 2>/dev/null || echo "dpkg-scanpackages failed" >&2
-
-%.gz: %
-	gzip < $< > $@
-
-%.bz2: %
-	bzip2 < $< > $@
-
-debian/dists/$(REPO_NAME)/main/binary-%/Release: Release.arch.in
-	mkdir -p $(@D)
-	sed s/@LSB_VERSION@/$(LSB_VERSION)/ < $< | \
-		sed s/@CURRENT_DEB_ARCH@/$(*F)/ > $@	
-
-debian/dists/$(REPO_NAME)/Release: Release.top.in $(APT_INDEXES) $(APT_RELEASES)
-	mkdir -p $(@D)
-	sed s/@LSB_VERSION@/$(LSB_VERSION)/ < Release.top.in | \
-		sed "s/@DEB_ARCHS@/$(DEB_ARCHS)/" | \
-		sed "s/@BUILD_DATE@/$(shell date -Ru)/" > $@
-	./gen_hashes debian/dists/$(REPO_NAME) >> $@
-
-debian/dists/$(REPO_NAME)/Release.gpg: debian/dists/$(REPO_NAME)/Release
-	gpg -sab -u $(APT_GPG_ID) --homedir $(GPG_HOMEDIR) -o $@ $<
-
-apt: $(APT_DEPEND_TARGET)
-
-install: install-apt
-
-install-apt: apt
-	-mkdir -p $(REPO_TOP_FULL)/dists
-	mkdir -p $(REPO_TOP_FULL)/junk
-	cp -r debian/dists/$(REPO_NAME) $(REPO_TOP_FULL)/dists/$(REPO_NAME)-new
-	cp -r debian/pkgs-$(LSB_VERSION) $(REPO_TOP_FULL)/pkgs-$(LSB_VERSION)-new
-	-mv $(REPO_TOP_FULL)/dists/$(REPO_NAME) $(REPO_TOP_FULL)/junk
-	mv $(REPO_TOP_FULL)/dists/$(REPO_NAME)-new $(REPO_TOP_FULL)/dists/$(REPO_NAME)
-	-mv $(REPO_TOP_FULL)/pkgs-$(LSB_VERSION) $(REPO_TOP_FULL)/junk
-	mv $(REPO_TOP_FULL)/pkgs-$(LSB_VERSION)-new $(REPO_TOP_FULL)/pkgs-$(LSB_VERSION)
-ifneq ($(LSB_VERSION),$(SNAPSHOT_LSB_VERSION))
-	cp -r debian/pkgs-common $(REPO_TOP_FULL)/pkgs-common-new
-	-mv $(REPO_TOP_FULL)/pkgs-common $(REPO_TOP_FULL)/junk
-	mv $(REPO_TOP_FULL)/pkgs-common-new $(REPO_TOP_FULL)/pkgs-common
-endif
-	-rm -rf $(REPO_TOP_FULL)/junk
-
-clean:
-	$(MAKE) -f Makefile-haskell realclean
-	rm -rf debian
-	rm -rf pkgcache
-	rm -f apt-overrides
-
-.PHONY: default all sign debcache debcache-common debcache-both apt \
-	install install-apt clean
-
-.PRECIOUS: debian/dists/$(REPO_NAME)/main/binary-%/Packages \
-	debian/dists/$(REPO_NAME)/main/binary-%/Packages.bz2 \
-	debian/dists/$(REPO_NAME)/main/binary-%/Packages.gz \
-	debian/dists/$(REPO_NAME)/main/binary-%/Release

More information about the lsb-messages mailing list