Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

Ingo Molnar committed 16 years ago

Commit 646b1db2 parents 0f2c3de 7e27d6e1019 files · +83287 −7720Browse files

Showing the changes to scripts/package (2 of 1019 files). Show all

Unified · Split

2 files

@@ -18,6 +18,8 @@ create_package() { · 17 unmodified lines
18	cp debian/copyright "$pdir/usr/share/doc/$pname/"	18	cp debian/copyright "$pdir/usr/share/doc/$pname/"
19	cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"	19	cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
20	gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"	20	gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
		21	sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \
		22	\| xargs -r0 md5sum > DEBIAN/md5sums"
21		23
22	# Fix ownership and permissions	24	# Fix ownership and permissions
23	chown -R root:root "$pdir"	25	chown -R root:root "$pdir"

@@ -39,7 +39,7 @@ if ! $PREBUILT; then · 38 unmodified lines
39	echo "Source: kernel-$__KERNELRELEASE.tar.gz"	39	echo "Source: kernel-$__KERNELRELEASE.tar.gz"
40	fi	40	fi
41		41
42	echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root"	42	echo "BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root"
43	echo "Provides: $PROVIDES"	43	echo "Provides: $PROVIDES"
44	echo "%define __spec_install_post /usr/lib/rpm/brp-compress \|\| :"	44	echo "%define __spec_install_post /usr/lib/rpm/brp-compress \|\| :"
45	echo "%define debug_package %{nil}"	45	echo "%define debug_package %{nil}"

Keyboard shortcuts