Skip to content
Snippets Groups Projects
Commit a5a06fa0 authored by Ruben Rodriguez's avatar Ruben Rodriguez
Browse files

Merge branch 'master' into belenos

parents d9a1dba9 e18a2914
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 6 deletions
makepending
+ 2
− 6
View file @ a5a06fa0
...@@ -106,17 +106,13 @@ then ...@@ -106,17 +106,13 @@ then
# echo Current version in $DISTRO: $current 1>&2 # echo Current version in $DISTRO: $current 1>&2
# echo Upstream version in $UPSTREAM: $upstream 1>&2 # echo Upstream version in $UPSTREAM: $upstream 1>&2
[ $package = "grub2" -a $UPSTREAM = natty ] && continue
[ $package = "grub2" -a $UPSTREAM = oneiric ] && continue
[ $package = "grub2" -a $UPSTREAM = precise ] && continue
[ $package = "yelp" -a $UPSTREAM = natty ] && continue
echo Current version in $DISTRO: $current echo Current version in $DISTRO: $current
echo Upstream version in $UPSTREAM: $upstream echo Upstream version in $UPSTREAM: $upstream
[ $current = "EOL" ] && continue [ $current = "EOL" ] && continue
if echo $package |grep -q linux-ubuntu-modules if [ $package = "grub2" ]
then then
echo WARNING! linux-ubuntu-modules packages need to be manually compiled! echo WARNING! grub2 packages need to be manually compiled!
echo echo
continue continue
fi fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment