wok rev 24142

linux-aufs: git checkout problem ?
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Nov 15 08:46:59 2021 +0000 (2021-11-15)
parents da48d3800edf
children 55bd63e6aac6
files linux-aufs/receipt linux64-aufs/receipt
line diff
     1.1 --- a/linux-aufs/receipt	Sun Nov 14 20:30:13 2021 +0000
     1.2 +++ b/linux-aufs/receipt	Mon Nov 15 08:46:59 2021 +0000
     1.3 @@ -26,9 +26,12 @@
     1.4  compile_rules()
     1.5  {
     1.6  	# Must match kernel version
     1.7 -	[ -d fs ] && rm -rf *
     1.8 -	kver=$(. $WOK/linux/receipt ; echo $VERSION)
     1.9 -	git checkout origin/aufs${kver%.*}
    1.10 +	#[ -d fs ] && rm -rf *
    1.11 +
    1.12 +	if [ ! -d fs ]; then
    1.13 +		kver=$(. $WOK/linux/receipt ; echo $VERSION)
    1.14 +		git checkout origin/aufs${kver%.*}
    1.15 +	fi
    1.16  
    1.17  	sed -i \
    1.18  		-e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \
    1.19 @@ -40,7 +43,7 @@
    1.20  		-e 's|CONFIG_AUFS_BDEV_LOOP =.*|CONFIG_AUFS_BDEV_LOOP = y|' \
    1.21  		-e 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
    1.22  		-e 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' config.mk
    1.23 -		
    1.24 +
    1.25  	# The sed fixes are from gentoo portage build.
    1.26  	sed -i "s:aufs.ko usr/include/uapi/linux/aufs_type.h:aufs.ko:g" Makefile
    1.27  	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
    1.28 @@ -48,7 +51,7 @@
    1.29  	
    1.30  	sed -i 's/d_u.d_child/d_child/' fs/aufs/dcsub.c fs/aufs/hnotify.c
    1.31  	sed -i 's/ d_alias/ d_u.d_alias/' fs/aufs/hnotify.c fs/aufs/export.c
    1.32 -	
    1.33 +
    1.34  	make ARCH=i386 KDIR=/usr/src/linux
    1.35  	xz -f fs/aufs/aufs.ko
    1.36  }
     2.1 --- a/linux64-aufs/receipt	Sun Nov 14 20:30:13 2021 +0000
     2.2 +++ b/linux64-aufs/receipt	Mon Nov 15 08:46:59 2021 +0000
     2.3 @@ -18,9 +18,24 @@
     2.4  
     2.5  AUFS_NOT_RAMFS="uclibc-cross-compiler-x86_64 is not compatible with aufs+tmpfs 8("
     2.6  
     2.7 +current_version()
     2.8 +{
     2.9 +	wget -O - https://sourceforge.net/p/aufs/aufs3-standalone/ci/${BRANCH#*linux-}/tree/ 2> /dev/null | \
    2.10 +	sed '/History/!d;s|.*href="|https://sourceforge.net|;s|".*||' | xargs wget -O - 2> /dev/null | \
    2.11 +	sed '/markdown_content/!d;s|</p>||;s|.* ||;q'
    2.12 +}
    2.13 +
    2.14  # Rules to configure and make the package.
    2.15  compile_rules()
    2.16  {
    2.17 +	# Must match kernel version
    2.18 +	#[ -d fs ] && rm -rf *
    2.19 +
    2.20 +	if [ ! -d fs ]; then
    2.21 +		kver=$(. $WOK/linux/receipt ; echo $VERSION)
    2.22 +		git checkout origin/aufs${kver%.*}
    2.23 +	fi
    2.24 +
    2.25  	sed -i \
    2.26  		-e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \
    2.27  		-e 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \