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.

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

fstab fix #22

Merged
merged 3 commits into from
Jul 18, 2014
Merged

fstab fix #22

merged 3 commits into from
Jul 18, 2014

Conversation

lbt
Copy link
Contributor

@lbt lbt commented Jun 23, 2014

No description provided.

lbt and others added 3 commits June 23, 2014 11:50
Signed-off-by: David Greaves <david.greaves@jollamobile.com>
Signed-off-by: David Greaves <david.greaves@jollamobile.com>
…enmod and report if there's a problem

Signed-off-by: David Greaves <david.greaves@jolla.com>
$(warning ********************* /boot appears to live on $(HYBRIS_BOOT_PART))
$(warning ********************* /data appears to live on $(HYBRIS_DATA_PART))

ifneq ($(words $(HYBRIS_BOOT_PART))$(words $(HYBRIS_DATA_PART)),11)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

non string comparison?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no - it's a string comparison. $(words foo) and $(words bar) must both be 1 which string concat to 11

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was awaiting quote-marks ^_^

@sledges
Copy link
Contributor

sledges commented Jun 23, 2014

when building mako, now it says:
hybris/hybris-boot/Android.mk:56: ********************* /boot appears to live on /dev/block/platform/msm_sdcc.1/by-name/boot /dev/block/platform/msm_sdcc.1/by-name/system

Because /boot is in fstab.mako and in recovery.fstab . uniq? :)

@lbt
Copy link
Contributor Author

lbt commented Jun 23, 2014

:( well sort -u does a uniq - but those 2 fields are not unique

@sledges
Copy link
Contributor

sledges commented Jun 24, 2014

Oops pardon, it think those were still left-overs of my deliberate ramblings :) will double check in the morning

@sledges
Copy link
Contributor

sledges commented Jul 18, 2014

@lbt, HADK testers proved this works (after cherry-picking). So merging. But e.g. motorola photon q (xt897) has not got recovery.fstab - and then perl script goes into infinite loop ( https://github.com/CyanogenMod/android_device_motorola_msm8960-common/tree/cm-10.1 , @flyser sourced it from https://raw.githubusercontent.com/SkrilaxCZ/android_device_moto_asanti_c/jellybean/recovery.fstab and then this perl script worked fine )

sledges added a commit that referenced this pull request Jul 18, 2014
@sledges sledges merged commit 03d0822 into mer-hybris:hybris-10.1 Jul 18, 2014
@sledges
Copy link
Contributor

sledges commented Nov 12, 2014

the infinite loop bug has finally a home: https://bugs.nemomobile.org/show_bug.cgi?id=777

NotKit pushed a commit to NotKit/hybris-boot that referenced this pull request Jan 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants