Re: compiling 2.6.12 with the debian patch

2005-08-24 Thread Horms
On Fri, Aug 19, 2005 at 11:00:47AM -0600, dann frazier wrote:
 On Fri, 2005-08-19 at 16:36 +0300, Teemu Ikonen wrote:
  Hi all,
  
  For a few recent versions of the Debian patch I've been getting the
  following when trying to compile the 2.6.12 kernel
  (linux-source-2.6.12-5) with
  make-kpkg --added-patches debian kernel_image:
  
  test -f applied_patches  rm -f applied_patches
  make: [stamp-debian] Error 1 (ignored)
  for patch in /usr/src/kernel-patches/all/2.6.12/apply/debian ; do   
   \
if test -x  $patch; then\
if $patch; then \
echo Patch $patch processed fine; \
echo $patch  applied_patches;   \
else \
 echo Patch $patch  failed.;  \
 echo Hit return to Continue;  \
 read ans;   \
fi;  \
fi;  \
  done
  E: Can't patch to nonexistent revision  (wait until 2006)
  Patch /usr/src/kernel-patches/all/2.6.12/apply/debian  failed.
  Hit return to Continue
 
 The linux-source tarball already contains the debian patches.  See 
 http://wiki.debian.net/?DebianKernelTree and
 http://wiki.debian.net/?DebianKernelSource for details.

This does seem to be a bug to me, as although the patches are already
applied, asking them to apply should just result in a noop, not the
script dying. I think that I have isolated the problem, and I will try
and get it fixed for the next release. The easiest work around, as Dann
suggested, is to just ommit debian from --added-patches for now.

-- 
Horms


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: compiling 2.6.12 with the debian patch

2005-08-24 Thread Horms
On Fri, Aug 19, 2005 at 11:00:47AM -0600, dann frazier wrote:
 On Fri, 2005-08-19 at 16:36 +0300, Teemu Ikonen wrote:
  Hi all,
  
  For a few recent versions of the Debian patch I've been getting the
  following when trying to compile the 2.6.12 kernel
  (linux-source-2.6.12-5) with
  make-kpkg --added-patches debian kernel_image:
  
  test -f applied_patches  rm -f applied_patches
  make: [stamp-debian] Error 1 (ignored)
  for patch in /usr/src/kernel-patches/all/2.6.12/apply/debian ; do   
   \
if test -x  $patch; then\
if $patch; then \
echo Patch $patch processed fine; \
echo $patch  applied_patches;   \
else \
 echo Patch $patch  failed.;  \
 echo Hit return to Continue;  \
 read ans;   \
fi;  \
fi;  \
  done
  E: Can't patch to nonexistent revision  (wait until 2006)
  Patch /usr/src/kernel-patches/all/2.6.12/apply/debian  failed.
  Hit return to Continue

FYI: Sven Hartge has opened a bug for this in the BTS, #324583

-- 
Horms


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Re: compiling 2.6.12 with the debian patch

2005-08-24 Thread dann frazier
On Wed, 2005-08-24 at 18:06 +0900, Horms wrote:
 This does seem to be a bug to me, as although the patches are already
 applied, asking them to apply should just result in a noop, not the
 script dying. 

Agreed.  It should either be smart enough to figure out what to do, or
print a reasonable error message when it has not been passed a
kernel-tree revision.

-- 
dann frazier [EMAIL PROTECTED]


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Processed: Re: compiling 2.6.12 with the debian patch

2005-08-24 Thread Debian Bug Tracking System
Processing commands for [EMAIL PROTECTED]:

 tag 324583 +pending
Bug#324583: linux-patch-debian-2.6.12: missing default version numbers in 
unpatch/apply script break make-kpkg
There were no tags set.
Tags added: pending

 tag 324583 +patch
Bug#324583: linux-patch-debian-2.6.12: missing default version numbers in 
unpatch/apply script break make-kpkg
Tags were: pending
Tags added: patch

 thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#324583: compiling 2.6.12 with the debian patch

2005-08-24 Thread Horms
tag 324583 +pending
tag 324583 +patch
thanks

Hi,

I have put the attched patch into SVN which should resolve this problem.
It should appear in the next relase, likely 2.6.12-6

Thanks


Index: debian/rules.real
===
--- debian/rules.real   (revision 4051)
+++ debian/rules.real   (working copy)
@@ -262,8 +262,8 @@
dh_installdirs $(DH_OPTIONS) $(pbase)/apply $(pbase)/debian 
$(pbase)/unpatch
dh_install $(DH_OPTIONS) debian/patches-debian/* $(pbase)/debian
 #  Install the debian patches
-   sed 's/@version@/$(release)/g' debian/bin/apply  $(pfull)/apply/debian
-   sed 's/@upstream@/$(version)/g' debian/bin/unpatch  
$(pfull)/unpatch/debian
+   sed 's/@version@/$(SOURCE_VERSION)/g' debian/bin/apply  
$(pfull)/apply/debian
+   sed 's/@upstream@/$(VERSION)/g' debian/bin/unpatch  
$(pfull)/unpatch/debian
chmod 755 $(pfull)/apply/debian $(pfull)/unpatch/debian
chmod 644 $(pfull)/debian/*.patch
bzip2 -9 $(pfull)/debian/*.patch


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



compiling 2.6.12 with the debian patch

2005-08-19 Thread Teemu Ikonen
Hi all,

For a few recent versions of the Debian patch I've been getting the
following when trying to compile the 2.6.12 kernel
(linux-source-2.6.12-5) with
make-kpkg --added-patches debian kernel_image:

test -f applied_patches  rm -f applied_patches
make: [stamp-debian] Error 1 (ignored)
for patch in /usr/src/kernel-patches/all/2.6.12/apply/debian ; do\
  if test -x  $patch; then\
  if $patch; then \
  echo Patch $patch processed fine; \
  echo $patch  applied_patches;   \
  else \
   echo Patch $patch  failed.;  \
   echo Hit return to Continue;  \
   read ans;   \
  fi;  \
  fi;  \
done
E: Can't patch to nonexistent revision  (wait until 2006)
Patch /usr/src/kernel-patches/all/2.6.12/apply/debian  failed.
Hit return to Continue


Am I just dense, or is there a bug somewhere? Without the debian
patch, compiling works fine.

Teemu



Re: compiling 2.6.12 with the debian patch

2005-08-19 Thread dann frazier
On Fri, 2005-08-19 at 16:36 +0300, Teemu Ikonen wrote:
 Hi all,
 
 For a few recent versions of the Debian patch I've been getting the
 following when trying to compile the 2.6.12 kernel
 (linux-source-2.6.12-5) with
 make-kpkg --added-patches debian kernel_image:
 
 test -f applied_patches  rm -f applied_patches
 make: [stamp-debian] Error 1 (ignored)
 for patch in /usr/src/kernel-patches/all/2.6.12/apply/debian ; do\
   if test -x  $patch; then\
   if $patch; then \
   echo Patch $patch processed fine; \
   echo $patch  applied_patches;   \
   else \
echo Patch $patch  failed.;  \
echo Hit return to Continue;  \
read ans;   \
   fi;  \
   fi;  \
 done
 E: Can't patch to nonexistent revision  (wait until 2006)
 Patch /usr/src/kernel-patches/all/2.6.12/apply/debian  failed.
 Hit return to Continue

The linux-source tarball already contains the debian patches.  See 
http://wiki.debian.net/?DebianKernelTree and
http://wiki.debian.net/?DebianKernelSource for details.



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]