Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

helpers: Add support to build loop image #247

Merged
merged 2 commits into from Nov 11, 2019
Merged

helpers: Add support to build loop image #247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce4c1c9
helpers: Clear out extra store repositories from ks when building ima…
mkosola Nov 4, 2019
49604e4
helpers: Build mic loop image based on patterns content.
mkosola Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 19 additions & 6 deletions helpers/build_packages.sh
View file
Open in desktop
Expand Up @@ -346,14 +346,27 @@ if [ "$BUILDIMAGE" = "1" ]; then
"$ANDROID_ROOT/hybris/droid-configs/installroot/usr/share/kickstarts/$ks" \
> "$ks"
fi
# Clear out extra store repositories from kickstart if exist
sed -i "/store-repository.jolla.com/d" "$ks"
[ -n "$RELEASE" ] || die 'Please set the desired RELEASE variable in ~/.hadk.env to build an image for'
hybris/droid-configs/droid-configs-device/helpers/process_patterns.sh
sudo mic create fs --arch=$PORT_ARCH \
--tokenmap=ARCH:$PORT_ARCH,RELEASE:$RELEASE,EXTRA_NAME:"$EXTRA_NAME" \
--record-pkgs=name,url \
--outdir=sfe-$DEVICE-$RELEASE"$EXTRA_NAME" \
--pack-to=sfe-$DEVICE-$RELEASE"$EXTRA_NAME".tar.bz2 \
"$ANDROID_ROOT"/Jolla-@RELEASE@-$DEVICE-@ARCH@.ks
# Check if we need to build loop or fs image
pattern_lookup=$(ls "$ANDROID_ROOT"/hybris/droid-configs/patterns/jolla-hw-adaptation-{$DEVICE,$HABUILD_DEVICE}.yaml 2>/dev/null)
if grep -q "^- droid-hal-{$DEVICE,$HABUILD_DEVICE}-kernel-modules" $pattern_lookup &>/dev/null; then
sudo mic create fs --arch=$PORT_ARCH \
--tokenmap=ARCH:$PORT_ARCH,RELEASE:$RELEASE,EXTRA_NAME:"$EXTRA_NAME" \
--record-pkgs=name,url \
--outdir=sfe-$DEVICE-$RELEASE"$EXTRA_NAME" \
--pack-to=sfe-$DEVICE-$RELEASE"$EXTRA_NAME".tar.bz2 \
"$ANDROID_ROOT"/Jolla-@RELEASE@-$DEVICE-@ARCH@.ks
else
sudo mic create loop --arch=$PORT_ARCH \
--tokenmap=ARCH:$PORT_ARCH,RELEASE:$RELEASE,EXTRA_NAME:"$EXTRA_NAME" \
--record-pkgs=name,url \
--outdir=sfe-$DEVICE-$RELEASE"$EXTRA_NAME" \
--copy-kernel \
"$ANDROID_ROOT"/Jolla-@RELEASE@-$DEVICE-@ARCH@.ks
fi
fi

if [ "$BUILDPKG" = "1" ]; then
Expand Down