diff --git a/debian/changelog b/debian/changelog index f9b26f9..8931f3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +live-build (3.0~a57-1ubuntu33k42) bionic; urgency=medium + + [ 谢炜 ] + * disable download of component Release + * save installer.udeb cache when use custom udeb list + + -- Xie Wei Thu, 28 Feb 2019 08:58:38 +0800 + live-build (3.0~a57-1ubuntu33k41) bionic; urgency=medium [ 谢炜 ] diff --git a/debian/patches/0074-save-installer.udeb-cache-when-use-custom-udeb-list.patch b/debian/patches/0074-save-installer.udeb-cache-when-use-custom-udeb-list.patch new file mode 100644 index 0000000..8a5dd84 --- /dev/null +++ b/debian/patches/0074-save-installer.udeb-cache-when-use-custom-udeb-list.patch @@ -0,0 +1,30 @@ +From: =?utf-8?b?6LCi54Kc?= +Date: Thu, 28 Feb 2019 08:58:01 +0800 +Subject: save installer.udeb cache when use custom udeb list + +--- + scripts/build/lb_binary_debian-installer | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer +index b0072ea..6fd8270 100755 +--- a/scripts/build/lb_binary_debian-installer ++++ b/scripts/build/lb_binary_debian-installer +@@ -706,12 +706,12 @@ then + fi + fi + done +- +- # Caching udebs +- rm -rf ../cache/packages.binary_debian-installer.udeb +- mkdir -p ../cache/packages.binary_debian-installer.udeb +- cp *.udeb ../cache/packages.binary_debian-installer.udeb + fi ++ ++ # Caching udebs ++ rm -rf ../cache/packages.binary_debian-installer.udeb ++ mkdir -p ../cache/packages.binary_debian-installer.udeb ++ cp *.udeb ../cache/packages.binary_debian-installer.udeb + + # Including local udebs + if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb diff --git a/debian/patches/series b/debian/patches/series index 10e06d3..da35507 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -71,3 +71,4 @@ strip-pool-for-di.patch 0071-add-release-cosmic-and-disco.patch 0072-add-release-of-kylinos-cm-community.patch 0073-dont-download-component-Release.patch +0074-save-installer.udeb-cache-when-use-custom-udeb-list.patch