diff options
author | John Rigby <john.rigby@linaro.org> | 2010-08-11 12:28:18 -0600 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2010-09-16 13:07:45 -0600 |
commit | 69670a91babe8e604e558ce16824d232700ac22d (patch) | |
tree | 6ae1e7a4448179e4c8bbe19c8d5e18b21de082bd | |
parent | 5002204436711ca58664998455bab167c2af1bed (diff) |
LINARO: select debian.linaro packaging
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r-- | debian/commit-templates/newrelease | 2 | ||||
-rw-r--r-- | debian/debian.env | 2 | ||||
-rw-r--r-- | debian/rules.d/0-common-vars.mk | 2 | ||||
-rw-r--r-- | debian/rules.d/1-maintainer.mk | 2 | ||||
-rw-r--r-- | debian/rules.d/2-binary-arch.mk | 2 | ||||
-rwxr-xr-x | debian/scripts/misc/insert-changes.pl | 2 | ||||
-rwxr-xr-x | debian/scripts/misc/insert-ubuntu-changes | 2 | ||||
-rwxr-xr-x | debian/scripts/misc/kernelconfig | 2 | ||||
-rwxr-xr-x | debian/scripts/module-inclusion | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/debian/commit-templates/newrelease b/debian/commit-templates/newrelease index 5f8931c40cd..9f3d99e251d 100644 --- a/debian/commit-templates/newrelease +++ b/debian/commit-templates/newrelease @@ -1,3 +1,3 @@ -UBUNTU: Start new release +LINARO: Start new release Ignore: yes diff --git a/debian/debian.env b/debian/debian.env index be31a0c2701..3b58772a143 100644 --- a/debian/debian.env +++ b/debian/debian.env @@ -1 +1 @@ -DEBIAN=debian.master +DEBIAN=debian.linaro diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index e03fa1434ee..f274c14a18d 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -101,7 +101,7 @@ abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch) prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch) commonconfdir := $(CURDIR)/$(DEBIAN)/config archconfdir := $(CURDIR)/$(DEBIAN)/config/$(arch) -sharedconfdir := $(CURDIR)/debian.master/config +sharedconfdir := $(CURDIR)/debian.linaro/config builddir := $(CURDIR)/debian/build stampdir := $(CURDIR)/debian/stamps diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 7ad68dda467..c4e4581c35d 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -112,7 +112,7 @@ endif printchanges: @baseCommit=$$(git log --pretty=format:'%H %s' | \ - awk '/UBUNTU: '".*Ubuntu-$(release)-$(prev_revision)"'$$/ { print $$1; exit }'); \ + awk '/LINARO: '".*Linaro-$(release)-$(prev_revision)"'$$/ { print $$1; exit }'); \ git log "$$baseCommit"..HEAD | \ perl -w -f $(DROOT)/scripts/misc/git-ubuntu-log $(ubuntu_log_opts) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1d264969e99..53665a0c1b6 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -20,7 +20,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc install -d $(builddir)/build-$* touch $(builddir)/build-$*/ubuntu-build [ "$(do_full_source)" != 'true' ] && true || \ - rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$* + rsync -a --exclude debian --exclude debian.master --exclude debian.linaro --exclude $(DEBIAN) * $(builddir)/build-$* cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(release)$(extraversion)"/' > $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f $(build_cd) $(kmake) $(build_O) silentoldconfig prepare scripts diff --git a/debian/scripts/misc/insert-changes.pl b/debian/scripts/misc/insert-changes.pl index c820597a9fc..1c18234727f 100755 --- a/debian/scripts/misc/insert-changes.pl +++ b/debian/scripts/misc/insert-changes.pl @@ -4,7 +4,7 @@ my $debian; $droot = $ARGV[0] if (defined $ARGV[0]); $droot = 'debian' if (!defined $droot); $debian = $ARGV[1] if (defined $ARGV[1]); -$debian = 'debian.master' if (!defined $debian); +$debian = 'debian.linaro' if (!defined $debian); system("make -s -f $droot/rules printchanges > $debian/changes"); diff --git a/debian/scripts/misc/insert-ubuntu-changes b/debian/scripts/misc/insert-ubuntu-changes index 9ede7f3950d..61b1faec687 100755 --- a/debian/scripts/misc/insert-ubuntu-changes +++ b/debian/scripts/misc/insert-ubuntu-changes @@ -10,7 +10,7 @@ $start =~ s/.*\.//; my @changes = (); my $output = 0; -open(CHG, "<debian.master/changelog") || +open(CHG, "<debian.linaro/changelog") || open(CHG, "<debian/changelog") || die "$0: debian/changelog: open failed - $!\n"; while (<CHG>) { diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig index c0bc4847e49..cf6e12d477b 100755 --- a/debian/scripts/misc/kernelconfig +++ b/debian/scripts/misc/kernelconfig @@ -22,7 +22,7 @@ case "$mode" in esac kerneldir="`pwd`" confdir="$kerneldir/${DEBIAN}/config" -sharedconfdir="$kerneldir/debian.master/config" +sharedconfdir="$kerneldir/debian.linaro/config" variant="$2" . $DEBIAN/etc/kernelconfig diff --git a/debian/scripts/module-inclusion b/debian/scripts/module-inclusion index ec3ce5e0cd5..bfe23fa1b15 100755 --- a/debian/scripts/module-inclusion +++ b/debian/scripts/module-inclusion @@ -5,7 +5,7 @@ # The includsion list format must be a bash regular expression. # # usage: $0 ROOT INCLUSION_LIST -# example: $0 debian/build/build-virtual debian.master/control.d/virtual.inclusion-list +# example: $0 debian/build/build-virtual debian.linaro/control.d/virtual.inclusion-list ROOT=$1 ILIST=$2 |